Add alarms dir and fix anomaly metric

Author: francisco-videira-nhs

infrastructure/terraform/components/api/README.md

@@ -42,11 +42,11 @@ No requirements.
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_apigw_alarms"></a> [apigw\_alarms](#module\_apigw\_alarms) | ../../modules/alarms-apigw | n/a |
+| <a name="module_apigw_alarms"></a> [apigw\_alarms](#module\_apigw\_alarms) | ../../modules/alarms/alarms-apigw | n/a |
 | <a name="module_authorizer_lambda"></a> [authorizer\_lambda](#module\_authorizer\_lambda) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
-| <a name="module_ddb_alarms_letters"></a> [ddb\_alarms\_letters](#module\_ddb\_alarms\_letters) | ../../modules/alarms-ddb | n/a |
-| <a name="module_ddb_alarms_mi"></a> [ddb\_alarms\_mi](#module\_ddb\_alarms\_mi) | ../../modules/alarms-ddb | n/a |
-| <a name="module_ddb_alarms_suppliers"></a> [ddb\_alarms\_suppliers](#module\_ddb\_alarms\_suppliers) | ../../modules/alarms-ddb | n/a |
+| <a name="module_ddb_alarms_letters"></a> [ddb\_alarms\_letters](#module\_ddb\_alarms\_letters) | ../../modules/alarms/alarms-ddb | n/a |
+| <a name="module_ddb_alarms_mi"></a> [ddb\_alarms\_mi](#module\_ddb\_alarms\_mi) | ../../modules/alarms/alarms-ddb | n/a |
+| <a name="module_ddb_alarms_suppliers"></a> [ddb\_alarms\_suppliers](#module\_ddb\_alarms\_suppliers) | ../../modules/alarms/alarms-ddb | n/a |
 | <a name="module_domain_truststore"></a> [domain\_truststore](#module\_domain\_truststore) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-s3bucket.zip | n/a |
 | <a name="module_eventpub"></a> [eventpub](#module\_eventpub) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-eventpub.zip | n/a |
 | <a name="module_eventsub"></a> [eventsub](#module\_eventsub) | ../../modules/eventsub | n/a |
@@ -55,7 +55,7 @@ No requirements.
 | <a name="module_get_letters"></a> [get\_letters](#module\_get\_letters) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
 | <a name="module_get_status"></a> [get\_status](#module\_get\_status) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
 | <a name="module_kms"></a> [kms](#module\_kms) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-kms.zip | n/a |
-| <a name="module_lambda_alarms"></a> [lambda\_alarms](#module\_lambda\_alarms) | ../../modules/alarms-lambda | n/a |
+| <a name="module_lambda_alarms"></a> [lambda\_alarms](#module\_lambda\_alarms) | ../../modules/alarms/alarms-lambda | n/a |
 | <a name="module_letter_status_update"></a> [letter\_status\_update](#module\_letter\_status\_update) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
 | <a name="module_letter_status_updates_queue"></a> [letter\_status\_updates\_queue](#module\_letter\_status\_updates\_queue) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-sqs.zip | n/a |
 | <a name="module_letter_updates_transformer"></a> [letter\_updates\_transformer](#module\_letter\_updates\_transformer) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
@@ -65,7 +65,7 @@ No requirements.
 | <a name="module_post_letters"></a> [post\_letters](#module\_post\_letters) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
 | <a name="module_post_mi"></a> [post\_mi](#module\_post\_mi) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
 | <a name="module_s3bucket_test_letters"></a> [s3bucket\_test\_letters](#module\_s3bucket\_test\_letters) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-s3bucket.zip | n/a |
-| <a name="module_sqs_alarms"></a> [sqs\_alarms](#module\_sqs\_alarms) | ../../modules/alarms-sqs | n/a |
+| <a name="module_sqs_alarms"></a> [sqs\_alarms](#module\_sqs\_alarms) | ../../modules/alarms/alarms-sqs | n/a |
 | <a name="module_sqs_letter_updates"></a> [sqs\_letter\_updates](#module\_sqs\_letter\_updates) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-sqs.zip | n/a |
 | <a name="module_supplier_ssl"></a> [supplier\_ssl](#module\_supplier\_ssl) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-ssl.zip | n/a |
 | <a name="module_upsert_letter"></a> [upsert\_letter](#module\_upsert\_letter) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |

infrastructure/terraform/components/api/alarms.tf

@@ -15,14 +15,20 @@ locals {
   }
 
   sqs_queue_names = {
-    letter_updates        = module.sqs_letter_updates.sqs_queue_name
-    letter_status_updates = module.letter_status_updates_queue.sqs_queue_name
+    letter_updates = {
+      name              = module.sqs_letter_updates.sqs_queue_name
+      age_period_seconds = 900
+    }
+    letter_status_updates = {
+      name              = module.letter_status_updates_queue.sqs_queue_name
+      age_period_seconds = 300
+    }
   }
 }
 
 module "lambda_alarms" {
   for_each   = local.lambda_alarm_targets
-  source     = "../../modules/alarms-lambda"
+  source     = "../../modules/alarms/alarms-lambda"
 
   alarm_prefix   = local.csi
   function_name  = each.value
@@ -31,38 +37,39 @@ module "lambda_alarms" {
 }
 
 module "ddb_alarms_letters" {
-  source       = "../../modules/alarms-ddb"
+  source       = "../../modules/alarms/alarms-ddb"
   alarm_prefix = local.csi
   table_name   = aws_dynamodb_table.letters.name
   tags         = local.default_tags
 }
 
 module "ddb_alarms_mi" {
-  source       = "../../modules/alarms-ddb"
+  source       = "../../modules/alarms/alarms-ddb"
   alarm_prefix = local.csi
   table_name   = aws_dynamodb_table.mi.name
   tags         = local.default_tags
 }
 
 module "ddb_alarms_suppliers" {
-  source       = "../../modules/alarms-ddb"
+  source       = "../../modules/alarms/alarms-ddb"
   alarm_prefix = local.csi
   table_name   = aws_dynamodb_table.suppliers.name
   tags         = local.default_tags
 }
 
 module "sqs_alarms" {
   for_each   = local.sqs_queue_names
-  source     = "../../modules/alarms-sqs"
+  source     = "../../modules/alarms/alarms-sqs"
 
   alarm_prefix   = local.csi
-  queue_name     = each.value
-  dlq_queue_name = replace(each.value, "-queue", "-dlq")
+  queue_name     = each.value.name
+  dlq_queue_name = replace(each.value.name, "-queue", "-dlq")
+  age_period_seconds = each.value.age_period_seconds
   tags           = local.default_tags
 }
 
 module "apigw_alarms" {
-  source       = "../../modules/alarms-apigw"
+  source       = "../../modules/alarms/alarms-apigw"
   alarm_prefix = local.csi
   api_name     = aws_api_gateway_rest_api.main.name
   stage_name   = aws_api_gateway_stage.main.stage_name

…terraform/modules/alarms-apigw/README.md …rm/modules/alarms/alarms-apigw/README.mdinfrastructure/terraform/modules/alarms-apigw/README.md renamed to infrastructure/terraform/modules/alarms/alarms-apigw/README.md infrastructure/terraform/modules/alarms-apigw/README.md renamed to infrastructure/terraform/modules/alarms/alarms-apigw/README.md

@@ -75,13 +75,12 @@ resource "aws_cloudwatch_metric_alarm" "latency_anomaly" {
       period      = var.latency_period_seconds
       dimensions  = local.api_dimensions
     }
-    return_data = true
   }
 
   metric_query {
     id          = "ad1"
     expression  = "ANOMALY_DETECTION_BAND(m1, ${var.latency_anomaly_sensitivity})"
     label       = "Latency (expected)"
-    return_data = false
+    return_data = true
   }
 }