Alarm grouping

NHSDigital · Jan 9, 2025 · c4e8b9c · c4e8b9c
1 parent b2619cf
commit c4e8b9c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...ture/terraform/components/reporting/cloudwatch_metric_alarm_overdue_request_item_plans.tf b/...ture/terraform/components/reporting/cloudwatch_metric_alarm_overdue_request_item_plans.tf
@@ -7,7 +7,7 @@ resource "aws_cloudwatch_metric_alarm" "overdue_request_item_plans" {
 
   metric_query {
     id          = "max_overdue_request_item_plans_count"
-    expression  = "SELECT MAX(OverdueRequestItemPlansCount) FROM \"Notify/Watchdog\" WHERE environment='${var.environment}'"
+    expression  = "SELECT MAX(OverdueRequestItemPlansCount) FROM \"Notify/Watchdog\" WHERE environment='${var.environment}' GROUP BY clientid, campaignid"
     return_data = "true"
     period      = 3600
   }

diff --git a/...structure/terraform/components/reporting/cloudwatch_metric_alarm_overdue_request_items.tf b/...structure/terraform/components/reporting/cloudwatch_metric_alarm_overdue_request_items.tf
@@ -7,7 +7,7 @@ resource "aws_cloudwatch_metric_alarm" "overdue_request_items" {
 
   metric_query {
     id          = "max_overdue_request_items_count"
-    expression  = "SELECT MAX(OverdueRequestItemsCount) FROM \"Notify/Watchdog\" WHERE environment='${var.environment}'"
+    expression  = "SELECT MAX(OverdueRequestItemsCount) FROM \"Notify/Watchdog\" WHERE environment='${var.environment}' GROUP BY clientid, campaignid"
     return_data = "true"
     period      = 3600
   }

diff --git a/infrastructure/terraform/components/reporting/cloudwatch_metric_alarm_overdue_requests.tf b/infrastructure/terraform/components/reporting/cloudwatch_metric_alarm_overdue_requests.tf
@@ -7,7 +7,7 @@ resource "aws_cloudwatch_metric_alarm" "overdue_requests" {
 
   metric_query {
     id          = "max_overdue_requests_count"
-    expression  = "SELECT MAX(OverdueRequestsCount) FROM \"Notify/Watchdog\" WHERE environment='${var.environment}'"
+    expression  = "SELECT MAX(OverdueRequestsCount) FROM \"Notify/Watchdog\" WHERE environment='${var.environment}' GROUP BY clientid, campaignid"
     return_data = "true"
     period      = 3600
   }