Merge pull request #509 from NHSDigital/feat/DTOSS-11103-Azure-monitor-infrastructure-metrics-for-container-app-jobs

[DTOSS-11103] Add new alerting on container app jobs

Author: mrlockstar

infrastructure/environments/review/variables.tfvars

@@ -10,4 +10,3 @@ vnet_address_space                    = "10.142.0.0/16"
 deploy_database_as_container          = true
 seed_demo_data                        = true
 nhs_notify_api_message_batch_url      = "https://int.api.service.nhs.uk/comms/v1/message-batches"
-enable_alerting                       = true

infrastructure/modules/container-apps/jobs.tf

@@ -88,6 +88,12 @@ module "db_setup" {
     local.common_env,
     var.deploy_database_as_container ? local.container_db_env : local.azure_db_env
   )
+
+  # alerts
+  action_group_id            = var.action_group_id
+  enable_alerting            = var.enable_alerting
+  log_analytics_workspace_id = var.log_analytics_workspace_id
+
   depends_on = [
     module.queue_storage_role_assignment,
     module.blob_storage_role_assignment
@@ -130,6 +136,12 @@ module "scheduled_jobs" {
     var.deploy_database_as_container ? local.container_db_env : local.azure_db_env
   )
 
+
+  # alerts
+  action_group_id            = var.action_group_id
+  enable_alerting            = var.enable_alerting
+  log_analytics_workspace_id = var.log_analytics_workspace_id
+
   # Ensure RBAC role assignments are created before the job definition finalizes
   depends_on = [
     module.blob_storage_role_assignment,

infrastructure/modules/container-apps/postgres.tf

@@ -25,7 +25,7 @@ module "postgres" {
   admin_identities                = [module.db_connect_identity[0]]
 
   # Diagnostic Settings
-  log_analytics_workspace_id                                = var.log_analytics_workspace_audit_id
+  log_analytics_workspace_id                                = var.log_analytics_workspace_id
   monitor_diagnostic_setting_postgresql_server_enabled_logs = ["PostgreSQLLogs", "PostgreSQLFlexSessions", "PostgreSQLFlexQueryStoreRuntime", "PostgreSQLFlexQueryStoreWaitStats", "PostgreSQLFlexTableStats", "PostgreSQLFlexDatabaseXacts"]
   monitor_diagnostic_setting_postgresql_server_metrics      = ["AllMetrics"]
 

infrastructure/modules/container-apps/storage.tf

@@ -17,7 +17,7 @@ module "storage" {
 
   containers                 = local.storage_containers
   location                   = var.region
-  log_analytics_workspace_id = var.log_analytics_workspace_audit_id
+  log_analytics_workspace_id = var.log_analytics_workspace_id
   # log_analytics_workspace_id = module.log_analytics_workspace_audit.id
 
   monitor_diagnostic_setting_storage_account_enabled_logs = ["StorageWrite", "StorageRead", "StorageDelete"]

infrastructure/modules/container-apps/variables.tf

@@ -73,11 +73,12 @@ variable "hub" {
   type        = string
 }
 
-variable "log_analytics_workspace_audit_id" {
+variable "log_analytics_workspace_id" {
   description = "Log analytics workspace audit ID"
   type        = string
 }
 
+
 variable "deploy_database_as_container" {
   description = "Whether to deploy the database as a container or as an Azure postgres flexible server."
   type        = bool

infrastructure/modules/infra/output.tf

@@ -10,7 +10,7 @@ output "vnet_name" {
   value = module.main_vnet.name
 }
 
-output "log_analytics_workspace_audit_id" {
+output "log_analytics_workspace_id" {
   value = module.log_analytics_workspace_audit.id
 }
 

infrastructure/terraform/main.tf

@@ -55,7 +55,7 @@ module "container-apps" {
   fetch_secrets_from_app_key_vault      = var.fetch_secrets_from_app_key_vault
   front_door_profile                    = var.front_door_profile
   hub                                   = var.hub
-  log_analytics_workspace_audit_id      = var.deploy_infra ? module.infra[0].log_analytics_workspace_audit_id : data.azurerm_log_analytics_workspace.audit[0].id
+  log_analytics_workspace_id            = var.deploy_infra ? module.infra[0].log_analytics_workspace_id : data.azurerm_log_analytics_workspace.audit[0].id
   postgres_backup_retention_days        = var.postgres_backup_retention_days
   postgres_geo_redundant_backup_enabled = var.postgres_geo_redundant_backup_enabled
   postgres_sku_name                     = var.postgres_sku_name