Skip to content
This repository was archived by the owner on Mar 27, 2023. It is now read-only.

Commit 6ee8a74

Browse files
briancaffeybriancaffey
committed
debugging scheled fargate task
1 parent 760fb02 commit 6ee8a74

File tree

3 files changed

+53
-62
lines changed

3 files changed

+53
-62
lines changed

‎awscdk/awscdk/awscdk.egg-info/requires.txt‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
1-
aws-cdk.core==1.41.0
2-
aws-cdk.aws_cloudformation==1.41.0
3-
aws-cdk.aws_autoscaling==1.41.0
4-
aws-cdk.aws_applicationautoscaling==1.41.0
5-
aws-cdk.aws_certificatemanager==1.41.0
6-
aws-cdk.aws_cloudwatch==1.41.0
7-
aws-cdk.aws_logs==1.41.0
8-
aws-cdk.aws_secretsmanager==1.41.0
9-
aws-cdk.aws_route53==1.41.0
10-
aws-cdk.aws_s3==1.41.0
11-
aws_cdk.aws_s3_deployment==1.41.0
12-
aws-cdk.aws_cloudfront==1.41.0
13-
aws-cdk.aws_route53_targets==1.41.0
14-
aws-cdk.aws_ecr==1.41.0
15-
aws-cdk.aws_ec2==1.41.0
16-
aws-cdk.aws_rds==1.41.0
17-
aws-cdk.aws_ssm==1.41.0
18-
aws-cdk.aws_elasticache==1.41.0
19-
aws-cdk.aws_elasticloadbalancingv2==1.41.0
20-
aws-cdk.aws_ecs==1.41.0
21-
aws-cdk.aws_ecs_patterns==1.41.0
22-
aws-cdk.aws_autoscaling==1.41.0
23-
aws-cdk.aws_sqs==1.41.0
1+
aws-cdk.core==1.42.0
2+
aws-cdk.aws_cloudformation==1.42.0
3+
aws-cdk.aws_autoscaling==1.42.0
4+
aws-cdk.aws_applicationautoscaling==1.42.0
5+
aws-cdk.aws_certificatemanager==1.42.0
6+
aws-cdk.aws_cloudwatch==1.42.0
7+
aws-cdk.aws_logs==1.42.0
8+
aws-cdk.aws_events==1.42.0
9+
aws-cdk.aws_events_targets==1.42.0
10+
aws-cdk.aws_secretsmanager==1.42.0
11+
aws-cdk.aws_route53==1.42.0
12+
aws-cdk.aws_s3==1.42.0
13+
aws_cdk.aws_s3_deployment==1.42.0
14+
aws-cdk.aws_cloudfront==1.42.0
15+
aws-cdk.aws_route53_targets==1.42.0
16+
aws-cdk.aws_ecr==1.42.0
17+
aws-cdk.aws_ec2==1.42.0
18+
aws-cdk.aws_rds==1.42.0
19+
aws-cdk.aws_ssm==1.42.0
20+
aws-cdk.aws_elasticache==1.42.0
21+
aws-cdk.aws_elasticloadbalancingv2==1.42.0
22+
aws-cdk.aws_ecs==1.42.0
23+
aws-cdk.aws_ecs_patterns==1.42.0
24+
aws-cdk.aws_autoscaling==1.42.0
25+
aws-cdk.aws_sqs==1.42.0

‎awscdk/awscdk/celery_default.py‎

Lines changed: 26 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
core,
33
aws_ec2 as ec2,
44
aws_ecs as ecs,
5+
aws_events as events,
6+
aws_events_targets as events_targets,
57
aws_ecs_patterns as ecs_patterns,
68
aws_logs as logs,
79
aws_cloudformation as cloudformation,
810
aws_cloudwatch as cloudwatch,
9-
aws_applicationautoscaling as app_autoscaling,
11+
aws_applicationautoscaling as aas,
1012
)
1113

1214

@@ -74,42 +76,27 @@ def __init__(self, scope: core.Construct, id: str, **kwargs) -> None:
7476
min_capacity=0, max_capacity=2
7577
)
7678

77-
self.celery_default_queue_asg.scale_on_metric(
78-
"CeleryDefaultQueueAutoscaling",
79-
metric=self.default_celery_queue_cloudwatch_metric,
80-
scaling_steps=[
81-
app_autoscaling.ScalingInterval(change=1, lower=0),
82-
app_autoscaling.ScalingInterval(change=-1, lower=1),
83-
],
84-
adjustment_type=app_autoscaling.AdjustmentType.CHANGE_IN_CAPACITY,
85-
)
86-
self.celery_default_cloudwatch_monitoring_task = ecs.FargateTaskDefinition(
87-
self, "CeleryDefaultCloudWatchMonitoringTask"
88-
)
79+
# self.celery_default_queue_asg.scale_on_metric(
80+
# "CeleryDefaultQueueAutoscaling",
81+
# metric=self.default_celery_queue_cloudwatch_metric,
82+
# scaling_steps=[
83+
# app_autoscaling.ScalingInterval(change=1, lower=0),
84+
# app_autoscaling.ScalingInterval(change=-1, lower=1),
85+
# ],
86+
# adjustment_type=app_autoscaling.AdjustmentType.CHANGE_IN_CAPACITY,
87+
# )
88+
# self.celery_default_cloudwatch_monitoring_task = ecs.FargateTaskDefinition(
89+
# self, "CeleryDefaultCloudWatchMonitoringTask"
90+
# )
8991

90-
self.celery_default_cloudwatch_monitoring_task.add_container(
91-
"CeleryDefaultCloudWatchMonitoringContainer",
92-
image=scope.image,
93-
logging=ecs.LogDrivers.aws_logs(
94-
stream_prefix="CeleryDefaultCloudWatchMonitoringContainerLogs",
95-
log_retention=logs.RetentionDays.ONE_DAY,
96-
),
97-
environment=scope.variables.regular_variables,
98-
secrets=scope.variables.secret_variables,
99-
command=["python3", "manage.py", "put_celery_cloudwatch_metrics"],
100-
)
101-
self.celery_default_cloudwatch_monitoring_scheduled_task = ecs_patterns.ScheduledFargateTask(
102-
self,
103-
"CeleryDefaultFargateScheduledTask",
104-
scheduled_fargate_task_definition_options=ecs_patterns.ScheduledFargateTaskDefinitionOptions(
105-
task_definition=self.celery_default_cloudwatch_monitoring_task,
106-
),
107-
schedule=app_autoscaling.Schedule.cron(minute="0/5"),
108-
cluster=scope.cluster,
109-
subnet_selection=ec2.SubnetSelection(
110-
subnet_type=ec2.SubnetType.PUBLIC
111-
),
112-
)
113-
self.default_celery_queue_cloudwatch_metric.grant_put_metric_data(
114-
self.celery_default_cloudwatch_monitoring_scheduled_task.task_definition.task_role
115-
)
92+
# self.celery_default_cloudwatch_monitoring_task.add_container(
93+
# "CeleryDefaultCloudWatchMonitoringContainer",
94+
# image=scope.image,
95+
# logging=ecs.LogDrivers.aws_logs(
96+
# stream_prefix="CeleryDefaultCloudWatchMonitoringContainerLogs",
97+
# log_retention=logs.RetentionDays.ONE_DAY,
98+
# ),
99+
# environment=scope.variables.regular_variables,
100+
# secrets=scope.variables.secret_variables,
101+
# command=["python3", "manage.py", "put_celery_cloudwatch_metrics"],
102+
# )

‎awscdk/setup.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
"aws-cdk.aws_certificatemanager==1.42.0",
2323
"aws-cdk.aws_cloudwatch==1.42.0",
2424
"aws-cdk.aws_logs==1.42.0",
25+
"aws-cdk.aws_events==1.42.0",
26+
"aws-cdk.aws_events_targets==1.42.0",
2527
"aws-cdk.aws_secretsmanager==1.42.0",
2628
"aws-cdk.aws_route53==1.42.0",
2729
"aws-cdk.aws_s3==1.42.0",

0 commit comments

Comments
 (0)