Page MenuHomePhorge
Files F32156473

D15497.1765035937.diff
No OneTemporary
Actions

Size
6 KB
Referenced Files
None
Subscribers
None

D15497.1765035937.diff
View Options

diff --git a/services/terraform/remote/alarms_backup.tf b/services/terraform/remote/alarms_backup.tf
--- a/services/terraform/remote/alarms_backup.tf
+++ b/services/terraform/remote/alarms_backup.tf
@@ -22,7 +22,7 @@
name = "Backup${each.value.name}ErrorCount"
pattern = "{ $.level = \"ERROR\" && $.fields.errorType = \"${each.value.pattern}\" }"
- log_group_name = "/ecs/backup-service-task-def"
+ log_group_name = local.is_staging ? "/ecs/backup-service-fargate-task-def" : "/ecs/backup-service-task-def"
metric_transformation {
name = "Backup${each.value.name}ErrorCount"
@@ -59,7 +59,7 @@
alarm_description = "Alarm when Backup service memory utilization exceeds 90%"
dimensions = {
ClusterName = aws_ecs_cluster.comm_services.name
- ServiceName = aws_ecs_service.backup_service.name
+ ServiceName = local.is_staging ? aws_ecs_service.backup_service_fargate[0].name : aws_ecs_service.backup_service.name
}
alarm_actions = [aws_sns_topic.backup_error_topic.arn]
}
@@ -76,7 +76,7 @@
alarm_description = "Alarm when Backup service CPU utilization exceeds 90%"
dimensions = {
ClusterName = aws_ecs_cluster.comm_services.name
- ServiceName = aws_ecs_service.backup_service.name
+ ServiceName = local.is_staging ? aws_ecs_service.backup_service_fargate[0].name : aws_ecs_service.backup_service.name
}
alarm_actions = [aws_sns_topic.backup_error_topic.arn]
}
diff --git a/services/terraform/remote/alarms_blob.tf b/services/terraform/remote/alarms_blob.tf
--- a/services/terraform/remote/alarms_blob.tf
+++ b/services/terraform/remote/alarms_blob.tf
@@ -22,7 +22,7 @@
name = "Blob${each.value.name}ErrorCount"
pattern = "{ $.level = \"ERROR\" && $.fields.errorType = \"${each.value.pattern}\" }"
- log_group_name = "/ecs/blob-service-task-def"
+ log_group_name = local.is_staging ? "/ecs/blob-service-fargate-task-def" : "/ecs/blob-service-task-def"
metric_transformation {
name = "Blob${each.value.name}ErrorCount"
@@ -59,7 +59,7 @@
alarm_description = "Alarm when Blob service memory utilization exceeds 90%"
dimensions = {
ClusterName = aws_ecs_cluster.comm_services.name
- ServiceName = aws_ecs_service.blob_service.name
+ ServiceName = local.is_staging ? aws_ecs_service.blob_service_fargate[0].name : aws_ecs_service.blob_service.name
}
alarm_actions = [aws_sns_topic.blob_error_topic.arn]
}
@@ -76,7 +76,7 @@
alarm_description = "Alarm when Blob service CPU utilization exceeds 90%"
dimensions = {
ClusterName = aws_ecs_cluster.comm_services.name
- ServiceName = aws_ecs_service.blob_service.name
+ ServiceName = local.is_staging ? aws_ecs_service.blob_service_fargate[0].name : aws_ecs_service.blob_service.name
}
alarm_actions = [aws_sns_topic.blob_error_topic.arn]
}
diff --git a/services/terraform/remote/alarms_identity.tf b/services/terraform/remote/alarms_identity.tf
--- a/services/terraform/remote/alarms_identity.tf
+++ b/services/terraform/remote/alarms_identity.tf
@@ -27,7 +27,7 @@
name = "Identity${each.value.name}ErrorCount"
pattern = "{ $.level = \"ERROR\" && $.fields.errorType = \"${each.value.pattern}\" }"
- log_group_name = "/ecs/identity-service-task-def"
+ log_group_name = local.is_staging ? "/ecs/identity-service-fargate-task-def" : "/ecs/identity-service-task-def"
metric_transformation {
name = "Identity${each.value.name}ErrorCount"
diff --git a/services/terraform/remote/alarms_tunnelbroker.tf b/services/terraform/remote/alarms_tunnelbroker.tf
--- a/services/terraform/remote/alarms_tunnelbroker.tf
+++ b/services/terraform/remote/alarms_tunnelbroker.tf
@@ -27,7 +27,7 @@
name = "Tunnelbroker${each.value.name}ErrorCount"
pattern = "{ $.level = \"ERROR\" && $.fields.errorType = \"${each.value.pattern}\" }"
- log_group_name = "/ecs/tunnelbroker-task-def"
+ log_group_name = local.is_staging ? "/ecs/tunnelbroker-fargate-task-def" : "/ecs/tunnelbroker-task-def"
metric_transformation {
name = "Tunnelbroker${each.value.name}ErrorCount"
@@ -65,7 +65,7 @@
namespace = "AWS/ECS"
dimensions = {
ClusterName = aws_ecs_cluster.comm_services.name
- ServiceName = aws_ecs_service.tunnelbroker.name
+ ServiceName = local.is_staging ? aws_ecs_service.tunnelbroker_fargate[0].name : aws_ecs_service.tunnelbroker.name
}
}
@@ -83,6 +83,6 @@
namespace = "AWS/ECS"
dimensions = {
ClusterName = aws_ecs_cluster.comm_services.name
- ServiceName = aws_ecs_service.tunnelbroker.name
+ ServiceName = local.is_staging ? aws_ecs_service.tunnelbroker_fargate[0].name : aws_ecs_service.tunnelbroker.name
}
}
diff --git a/services/terraform/remote/aws_cloudwatch_alarms.tf b/services/terraform/remote/aws_cloudwatch_alarms.tf
--- a/services/terraform/remote/aws_cloudwatch_alarms.tf
+++ b/services/terraform/remote/aws_cloudwatch_alarms.tf
@@ -2,13 +2,13 @@
error_reports_subscribed_email = "error-reports@comm.app"
service_log_groups = {
- Backup = { name = "Backup", log_group_name = "/ecs/backup-service-task-def" },
- Blob = { name = "Blob", log_group_name = "/ecs/blob-service-task-def" },
+ Backup = { name = "Backup", log_group_name = local.is_staging ? "/ecs/backup-service-fargate-task-def" : "/ecs/backup-service-task-def" },
+ Blob = { name = "Blob", log_group_name = local.is_staging ? "/ecs/blob-service-fargate-task-def" : "/ecs/blob-service-task-def" },
ElectronUpdate = { name = "ElectronUpdate", log_group_name = "/ecs/electron-update-task-def" },
FeatureFlags = { name = "FeatureFlags", log_group_name = "/ecs/feature-flags-task-def" },
- Identity = { name = "Identity", log_group_name = "/ecs/identity-service-task-def" },
+ Identity = { name = "Identity", log_group_name = local.is_staging ? "/ecs/identity-service-fargate-task-def" : "/ecs/identity-service-task-def" },
Reports = { name = "Reports", log_group_name = "/ecs/reports-service-task-def" },
- Tunnelbroker = { name = "Tunnelbroker", log_group_name = "/ecs/tunnelbroker-task-def" }
+ Tunnelbroker = { name = "Tunnelbroker", log_group_name = local.is_staging ? "/ecs/tunnelbroker-fargate-task-def" : "/ecs/tunnelbroker-task-def" }
}
}
diff --git a/services/terraform/remote/token_distributor_metrics.tf b/services/terraform/remote/token_distributor_metrics.tf
--- a/services/terraform/remote/token_distributor_metrics.tf
+++ b/services/terraform/remote/token_distributor_metrics.tf
@@ -18,7 +18,7 @@
name = "TokenDistributor${each.value.name}"
pattern = "{ $.fields.metricType = \"${each.value.pattern}\" }"
- log_group_name = "/ecs/tunnelbroker-task-def"
+ log_group_name = local.is_staging ? "/ecs/tunnelbroker-fargate-task-def" : "/ecs/tunnelbroker-task-def"
metric_transformation {
name = "TokenDistributor${each.value.name}"

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 6, 3:45 PM (20 h, 37 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5829060
Default Alt Text
D15497.1765035937.diff (6 KB)

Event Timeline