7
7
aws_ecs_patterns as ecs_patterns ,
8
8
aws_logs as logs ,
9
9
aws_cloudformation as cloudformation ,
10
- aws_cloudwatch as cloudwatch ,
10
+ aws_cloudwatch as cw ,
11
11
aws_applicationautoscaling as aas ,
12
12
)
13
13
@@ -68,7 +68,7 @@ def __init__(self, scope: core.Construct, id: str, **kwargs) -> None:
68
68
self .celery_default_worker_service .task_definition .task_role
69
69
)
70
70
71
- self .default_celery_queue_cloudwatch_metric = cloudwatch .Metric (
71
+ self .default_celery_queue_cw_metric = cw .Metric (
72
72
namespace = scope .full_app_name , metric_name = "default"
73
73
)
74
74
@@ -78,19 +78,19 @@ def __init__(self, scope: core.Construct, id: str, **kwargs) -> None:
78
78
79
79
self .celery_default_queue_asg .scale_on_metric (
80
80
"CeleryDefaultQueueAutoscaling" ,
81
- metric = self .default_celery_queue_cloudwatch_metric ,
81
+ metric = self .default_celery_queue_cw_metric ,
82
82
scaling_steps = [
83
83
aas .ScalingInterval (change = 1 , lower = 0 ),
84
84
aas .ScalingInterval (change = - 1 , lower = 1 ),
85
85
],
86
86
adjustment_type = aas .AdjustmentType .CHANGE_IN_CAPACITY ,
87
87
)
88
88
89
- self .celery_default_cloudwatch_monitor_task = ecs .FargateTaskDefinition (
90
- self , "CeleryDefaultCloudWatchMonitoringTask "
89
+ self .celery_default_cw_monitor_task = ecs .FargateTaskDefinition (
90
+ self , "CeleryDefaultCWMonitoringTask "
91
91
)
92
92
93
- self .celery_default_cloudwatch_monitor_task .add_container (
93
+ self .celery_default_cw_monitor_task .add_container (
94
94
"CeleryDefaultCWMonitoringTaskContainer" ,
95
95
image = scope .image ,
96
96
logging = ecs .LogDrivers .aws_logs (
@@ -109,7 +109,7 @@ def __init__(self, scope: core.Construct, id: str, **kwargs) -> None:
109
109
targets = [
110
110
events_targets .EcsTask (
111
111
cluster = scope .cluster ,
112
- task_definition = self .celery_default_cloudwatch_monitor_task ,
112
+ task_definition = self .celery_default_cw_monitor_task ,
113
113
subnet_selection = ec2 .SubnetSelection (
114
114
subnet_type = ec2 .SubnetType .PUBLIC
115
115
),
@@ -122,14 +122,6 @@ def __init__(self, scope: core.Construct, id: str, **kwargs) -> None:
122
122
],
123
123
)
124
124
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