77 aws_ecs_patterns as ecs_patterns ,
88 aws_logs as logs ,
99 aws_cloudformation as cloudformation ,
10- aws_cloudwatch as cloudwatch ,
10+ aws_cloudwatch as cw ,
1111 aws_applicationautoscaling as aas ,
1212)
1313
@@ -68,7 +68,7 @@ def __init__(self, scope: core.Construct, id: str, **kwargs) -> None:
6868 self .celery_default_worker_service .task_definition .task_role
6969 )
7070
71- self .default_celery_queue_cloudwatch_metric = cloudwatch .Metric (
71+ self .default_celery_queue_cw_metric = cw .Metric (
7272 namespace = scope .full_app_name , metric_name = "default"
7373 )
7474
@@ -78,19 +78,19 @@ def __init__(self, scope: core.Construct, id: str, **kwargs) -> None:
7878
7979 self .celery_default_queue_asg .scale_on_metric (
8080 "CeleryDefaultQueueAutoscaling" ,
81- metric = self .default_celery_queue_cloudwatch_metric ,
81+ metric = self .default_celery_queue_cw_metric ,
8282 scaling_steps = [
8383 aas .ScalingInterval (change = 1 , lower = 0 ),
8484 aas .ScalingInterval (change = - 1 , lower = 1 ),
8585 ],
8686 adjustment_type = aas .AdjustmentType .CHANGE_IN_CAPACITY ,
8787 )
8888
89- self .celery_default_cloudwatch_monitor_task = ecs .FargateTaskDefinition (
90- self , "CeleryDefaultCloudWatchMonitoringTask "
89+ self .celery_default_cw_monitor_task = ecs .FargateTaskDefinition (
90+ self , "CeleryDefaultCWMonitoringTask "
9191 )
9292
93- self .celery_default_cloudwatch_monitor_task .add_container (
93+ self .celery_default_cw_monitor_task .add_container (
9494 "CeleryDefaultCWMonitoringTaskContainer" ,
9595 image = scope .image ,
9696 logging = ecs .LogDrivers .aws_logs (
@@ -109,7 +109,7 @@ def __init__(self, scope: core.Construct, id: str, **kwargs) -> None:
109109 targets = [
110110 events_targets .EcsTask (
111111 cluster = scope .cluster ,
112- task_definition = self .celery_default_cloudwatch_monitor_task ,
112+ task_definition = self .celery_default_cw_monitor_task ,
113113 subnet_selection = ec2 .SubnetSelection (
114114 subnet_type = ec2 .SubnetType .PUBLIC
115115 ),
@@ -122,14 +122,6 @@ def __init__(self, scope: core.Construct, id: str, **kwargs) -> None:
122122 ],
123123 )
124124
125- # self.celery_default_cloudwatch_monitoring_task.add_container(
126- # "CeleryDefaultCloudWatchMonitoringContainer",
127- # image=scope.image,
128- # logging=ecs.LogDrivers.aws_logs(
129- # stream_prefix="CeleryDefaultCloudWatchMonitoringContainerLogs",
130- # log_retention=logs.RetentionDays.ONE_DAY,
131- # ),
132- # environment=scope.variables.regular_variables,
133- # secrets=scope.variables.secret_variables,
134- # command=["python3", "manage.py", "put_celery_cloudwatch_metrics"],
135- # )
125+ self .default_celery_queue_cw_metric .grant_put_metric_data (
126+ self .celery_default_cw_monitor_task .task_role
127+ )
0 commit comments