fix: a change to the rest of the modules to use the new definition of diagnostic settings metrics

MacMur85 · MacMur85 · commit 784938de81c6 · 2025-08-27T08:52:00.000+01:00
diff --git a/infrastructure/tf-core/environments/development.tfvars b/infrastructure/tf-core/environments/development.tfvars
@@ -250,10 +250,6 @@ container_app_jobs = {
   }
 }
 
-diagnostic_settings = {
-  metric_enabled = true
-}
-
 function_apps = {
   acr_mi_name = "dtos-cohort-manager-acr-push"
   acr_name    = "acrukshubdevcohman"
diff --git a/infrastructure/tf-core/environments/integration.tfvars b/infrastructure/tf-core/environments/integration.tfvars
@@ -250,10 +250,6 @@ container_app_jobs = {
   }
 }
 
-diagnostic_settings = {
-  metric_enabled = true
-}
-
 function_apps = {
   acr_mi_name = "dtos-cohort-manager-acr-push"
   acr_name    = "acrukshubdevcohman"
diff --git a/infrastructure/tf-core/environments/nft.tfvars b/infrastructure/tf-core/environments/nft.tfvars
@@ -250,10 +250,6 @@ container_app_jobs = {
   }
 }
 
-diagnostic_settings = {
-  metric_enabled = true
-}
-
 function_apps = {
   acr_mi_name = "dtos-cohort-manager-acr-push"
   acr_name    = "acrukshubdevcohman"
diff --git a/infrastructure/tf-core/environments/preprod.tfvars b/infrastructure/tf-core/environments/preprod.tfvars
@@ -216,10 +216,6 @@ container_app_jobs = {
   }
 }
 
-diagnostic_settings = {
-  metric_enabled = true
-}
-
 function_apps = {
   acr_mi_name = "dtos-cohort-manager-acr-push"
   acr_name    = "acrukshubprodcohman"
diff --git a/infrastructure/tf-core/environments/production.tfvars b/infrastructure/tf-core/environments/production.tfvars
@@ -203,10 +203,6 @@ container_app_jobs = {
   }
 }
 
-diagnostic_settings = {
-  metric_enabled = true
-}
-
 function_apps = {
   acr_mi_name = "dtos-cohort-manager-acr-push"
   acr_name    = "acrukshubprodcohman"
diff --git a/infrastructure/tf-core/environments/sandbox.tfvars b/infrastructure/tf-core/environments/sandbox.tfvars
@@ -303,10 +303,6 @@ container_app_jobs = {
   }
 }
 
-diagnostic_settings = {
-  metric_enabled = true
-}
-
 function_apps = {
   acr_mi_name = "dtos-cohort-manager-acr-push"
   acr_name    = "acrukshubdevcohman"
diff --git a/infrastructure/tf-core/key_vault.tf b/infrastructure/tf-core/key_vault.tf
@@ -10,7 +10,6 @@ module "key_vault" {
   log_analytics_workspace_id                       = data.terraform_remote_state.audit.outputs.log_analytics_workspace_id[local.primary_region]
   monitor_diagnostic_setting_keyvault_enabled_logs = local.monitor_diagnostic_setting_keyvault_enabled_logs
   monitor_diagnostic_setting_keyvault_metrics      = local.monitor_diagnostic_setting_keyvault_metrics
-  metric_enabled                                   = var.diagnostic_settings.metric_enabled
 
   disk_encryption          = var.key_vault.disk_encryption
   soft_delete_retention    = var.key_vault.soft_del_ret_days
diff --git a/infrastructure/tf-core/variables.tf b/infrastructure/tf-core/variables.tf
@@ -208,13 +208,6 @@ variable "container_app_jobs" {
   })
 }
 
-variable "diagnostic_settings" {
-  description = "Configuration for the diagnostic settings"
-  type = object({
-    metric_enabled = optional(bool, false)
-  })
-}
-
 variable "function_apps" {
   description = "Configuration for function apps"
   type = object({

Original file line number	Diff line number	Diff line change
`@@ -250,10 +250,6 @@ container_app_jobs = {`
`250`	`250`	`}`
`251`	`251`	`}`
`252`	`252`
`253`		`-diagnostic_settings = {`
`254`		`- metric_enabled = true`
`255`		`-}`
`256`		`-`
`257`	`253`	`function_apps = {`
`258`	`254`	`acr_mi_name = "dtos-cohort-manager-acr-push"`
`259`	`255`	`acr_name = "acrukshubdevcohman"`
Original file line number	Diff line number	Diff line change
`@@ -216,10 +216,6 @@ container_app_jobs = {`
`216`	`216`	`}`
`217`	`217`	`}`
`218`	`218`
`219`		`-diagnostic_settings = {`
`220`		`- metric_enabled = true`
`221`		`-}`
`222`		`-`
`223`	`219`	`function_apps = {`
`224`	`220`	`acr_mi_name = "dtos-cohort-manager-acr-push"`
`225`	`221`	`acr_name = "acrukshubprodcohman"`
Original file line number	Diff line number	Diff line change
`@@ -203,10 +203,6 @@ container_app_jobs = {`
`203`	`203`	`}`
`204`	`204`	`}`
`205`	`205`
`206`		`-diagnostic_settings = {`
`207`		`- metric_enabled = true`
`208`		`-}`
`209`		`-`
`210`	`206`	`function_apps = {`
`211`	`207`	`acr_mi_name = "dtos-cohort-manager-acr-push"`
`212`	`208`	`acr_name = "acrukshubprodcohman"`
Original file line number	Diff line number	Diff line change
`@@ -303,10 +303,6 @@ container_app_jobs = {`
`303`	`303`	`}`
`304`	`304`	`}`
`305`	`305`
`306`		`-diagnostic_settings = {`
`307`		`- metric_enabled = true`
`308`		`-}`
`309`		`-`
`310`	`306`	`function_apps = {`
`311`	`307`	`acr_mi_name = "dtos-cohort-manager-acr-push"`
`312`	`308`	`acr_name = "acrukshubdevcohman"`