monitor action group name so its unique per environment type

Author: mrlockstar

infrastructure/environments/preprod/variables.tfvars

@@ -1,4 +1,3 @@
-alert_window_size                     = "PT15M"
 api_oauth_token_url                   = "https://int.api.service.nhs.uk/oauth2/token"
 dns_zone_name                         = "manage-breast-screening.screening.nhs.uk"
 enable_auth                           = false

infrastructure/environments/review/variables.tfvars

@@ -7,7 +7,6 @@ postgres_backup_retention_days        = 7
 postgres_geo_redundant_backup_enabled = false
 protect_keyvault                      = false
 vnet_address_space                    = "10.142.0.0/16"
-deploy_database_as_container          = false
+deploy_database_as_container          = true
 seed_demo_data                        = true
-enable_alerting                       = false
 nhs_notify_api_message_batch_url      = "https://int.api.service.nhs.uk/comms/v1/message-batches"

infrastructure/modules/container-apps/postgres.tf

@@ -46,10 +46,9 @@ module "postgres" {
   }
 
   # alerts
-  action_group_id = var.action_group_id
+  action_group_id   = var.action_group_id
   enable_monitoring = var.enable_alerting
 
-
   databases = {
     db1 = {
       collation   = "en_US.utf8"

infrastructure/modules/container-apps/variables.tf

@@ -149,7 +149,6 @@ variable "enable_alerting" {
   type        = bool
 }
 
-
 variable "alert_window_size" {
   type     = string
   nullable = false

infrastructure/modules/infra/monitor_action_group.tf

@@ -1,7 +1,7 @@
 module "monitor_action_group" {
   source = "../dtos-devops-templates/infrastructure/modules/monitor-action-group"
 
-  name                = module.shared_config.names.monitor-action-group
+  name                = "${module.shared_config.names.monitor-action-group}-${var.environment}"
   resource_group_name = azurerm_resource_group.main.name
   location            = var.region
   short_name          = "ag-${var.environment}"

infrastructure/terraform/data.tf

@@ -39,6 +39,6 @@ data "azurerm_subnet" "main" {
 data "azurerm_monitor_action_group" "main" {
   count = var.deploy_infra ? 0 : 1
 
-  name                = module.shared_config.names.monitor-action-group
+  name                = "${module.shared_config.names.monitor-action-group}-${var.env_config}"
   resource_group_name = local.resource_group_name
 }

infrastructure/terraform/variables.tf

@@ -133,7 +133,7 @@ variable "seed_demo_data" {
 variable "alert_window_size" {
   type     = string
   nullable = false
-  default  = "PT5M"
+  default  = "PT15M"
   validation {
     condition     = contains(["PT1M", "PT5M", "PT15M", "PT30M", "PT1H", "PT6H", "PT12H"], var.alert_window_size)
     error_message = "The alert_window_size must be one of: PT1M, PT5M, PT15M, PT30M, PT1H, PT6H, PT12H"