fix: change to the diagnostic setting module to alleviate the deprecated metric parameter (#222)

MacMur85 · web-flow · commit 143bb43a2f95 · 2025-08-29T08:37:57.000Z
diff --git a/infrastructure/modules/api-management/main.tf b/infrastructure/modules/api-management/main.tf
@@ -152,6 +152,7 @@ module "diagnostic-settings" {
   target_resource_id         = azurerm_api_management.apim.id
   log_analytics_workspace_id = var.log_analytics_workspace_id
   enabled_log                = var.monitor_diagnostic_setting_apim_enabled_logs
-  metric                     = var.monitor_diagnostic_setting_apim_metrics
+  enabled_metric             = var.monitor_diagnostic_setting_apim_metrics
   metric_enabled             = var.metric_enabled
+
 }
diff --git a/infrastructure/modules/app-service-plan/main.tf b/infrastructure/modules/app-service-plan/main.tf
@@ -27,6 +27,6 @@ module "diagnostic-settings" {
   name                       = "${var.name}-diagnostic-setting"
   target_resource_id         = azurerm_service_plan.appserviceplan.id
   log_analytics_workspace_id = var.log_analytics_workspace_id
+  enabled_metric             = var.monitor_diagnostic_setting_appserviceplan_metrics
   #enabled_log                = var.enabled_log
-  metric = var.monitor_diagnostic_setting_appserviceplan_metrics
 }
diff --git a/infrastructure/modules/cdn-frontdoor-profile/main.tf b/infrastructure/modules/cdn-frontdoor-profile/main.tf
@@ -39,6 +39,7 @@ module "diagnostic-settings" {
   target_resource_id         = azurerm_cdn_frontdoor_profile.this.id
   log_analytics_workspace_id = var.log_analytics_workspace_id
   enabled_log                = var.monitor_diagnostic_setting_frontdoor_enabled_logs
-  metric                     = var.monitor_diagnostic_setting_frontdoor_metrics
+  enabled_metric             = var.monitor_diagnostic_setting_frontdoor_metrics
   metric_enabled             = var.metric_enabled
+
 }
diff --git a/infrastructure/modules/container-registry/main.tf b/infrastructure/modules/container-registry/main.tf
@@ -54,6 +54,6 @@ module "diagnostic-settings" {
   target_resource_id         = azurerm_container_registry.acr.id
   log_analytics_workspace_id = var.log_analytics_workspace_id
   enabled_log                = var.monitor_diagnostic_setting_acr_enabled_logs
-  metric                     = var.monitor_diagnostic_setting_acr_metrics
+  enabled_metric             = var.monitor_diagnostic_setting_acr_metrics
 
 }
diff --git a/infrastructure/modules/diagnostic-settings/examples/main.tf b/infrastructure/modules/diagnostic-settings/examples/main.tf
@@ -6,6 +6,6 @@ module "diagnostic-settings" {
   target_resource_id         = "${azurerm_storage_account.example.id}/${each.value}/default"
   log_analytics_workspace_id = azurerm_log_analytics_workspace.example.id
   enabled_log                = ["StorageWrite", "StorageRead", "StorageDelete"]
-  metric                     = ["AllMetrics"]
+  enabled_metric             = ["AllMetrics"]
 
 }
diff --git a/infrastructure/modules/diagnostic-settings/main.tf b/infrastructure/modules/diagnostic-settings/main.tf
@@ -14,11 +14,10 @@ resource "azurerm_monitor_diagnostic_setting" "this" {
     }
   }
 
-  dynamic "metric" {
-    for_each = var.metric
+  dynamic "enabled_metric" {
+    for_each = var.enabled_metric
     content {
-      category = metric.value
-      enabled  = var.metric_enabled
+      category = enabled_metric.value
     }
   }
 
diff --git a/infrastructure/modules/diagnostic-settings/variables.tf b/infrastructure/modules/diagnostic-settings/variables.tf
@@ -31,7 +31,7 @@ variable "log_analytics_workspace_id" {
   default     = null
 }
 
-variable "metric" {
+variable "enabled_metric" {
   type        = list(string)
   description = "value of the metric"
   default     = []
diff --git a/infrastructure/modules/event-hub/main.tf b/infrastructure/modules/event-hub/main.tf
@@ -104,7 +104,7 @@ module "diagnostic-settings" {
   target_resource_id         = azurerm_eventhub_namespace.eventhub_ns.id
   log_analytics_workspace_id = var.log_analytics_workspace_id
   enabled_log                = var.monitor_diagnostic_setting_eventhub_enabled_logs
-  metric                     = var.monitor_diagnostic_setting_eventhub_metrics
+  enabled_metric             = var.monitor_diagnostic_setting_eventhub_metrics
 
 }
 
diff --git a/infrastructure/modules/function-app/main.tf b/infrastructure/modules/function-app/main.tf
@@ -139,6 +139,6 @@ module "diagnostic-settings" {
   target_resource_id         = azurerm_linux_function_app.function_app.id
   log_analytics_workspace_id = var.log_analytics_workspace_id
   enabled_log                = var.monitor_diagnostic_setting_function_app_enabled_logs
-  metric                     = var.monitor_diagnostic_setting_function_app_metrics
+  enabled_metric             = var.monitor_diagnostic_setting_function_app_metrics
 
 }
diff --git a/infrastructure/modules/key-vault/main.tf b/infrastructure/modules/key-vault/main.tf
@@ -59,7 +59,7 @@ module "diagnostic-settings" {
   target_resource_id         = azurerm_key_vault.keyvault.id
   log_analytics_workspace_id = var.log_analytics_workspace_id
   enabled_log                = var.monitor_diagnostic_setting_keyvault_enabled_logs
-  metric                     = var.monitor_diagnostic_setting_keyvault_metrics
+  enabled_metric             = var.monitor_diagnostic_setting_keyvault_metrics
   metric_enabled             = var.metric_enabled
 }
 
diff --git a/infrastructure/modules/linux-web-app/main.tf b/infrastructure/modules/linux-web-app/main.tf
@@ -173,5 +173,5 @@ module "diagnostic-settings" {
   target_resource_id         = azurerm_linux_web_app.this.id
   log_analytics_workspace_id = var.log_analytics_workspace_id
   enabled_log                = var.monitor_diagnostic_setting_linux_web_app_enabled_logs
-  metric                     = var.monitor_diagnostic_setting_linux_web_app_metrics
+  enabled_metric             = var.monitor_diagnostic_setting_linux_web_app_metrics
 }
diff --git a/infrastructure/modules/log-analytics-workspace/main.tf b/infrastructure/modules/log-analytics-workspace/main.tf
@@ -25,6 +25,6 @@ module "diagnostic-settings" {
   target_resource_id         = azurerm_log_analytics_workspace.log_analytics_workspace.id
   log_analytics_workspace_id = azurerm_log_analytics_workspace.log_analytics_workspace.id
   enabled_log                = var.monitor_diagnostic_setting_log_analytics_workspace_enabled_logs
-  metric                     = var.monitor_diagnostic_setting_log_analytics_workspace_metrics
+  enabled_metric             = var.monitor_diagnostic_setting_log_analytics_workspace_metrics
 
 }
diff --git a/infrastructure/modules/postgresql-flexible/main.tf b/infrastructure/modules/postgresql-flexible/main.tf
@@ -143,5 +143,5 @@ module "diagnostic_setting_postgresql_server" {
   target_resource_id         = azurerm_postgresql_flexible_server.postgresql_flexible_server.id
   log_analytics_workspace_id = var.log_analytics_workspace_id
   enabled_log                = var.monitor_diagnostic_setting_postgresql_server_enabled_logs
-  metric                     = var.monitor_diagnostic_setting_postgresql_server_metrics
+  enabled_metric             = var.monitor_diagnostic_setting_postgresql_server_metrics
 }
diff --git a/infrastructure/modules/sql-server/database.tf b/infrastructure/modules/sql-server/database.tf
@@ -52,7 +52,7 @@ module "azurerm_monitor_diagnostic_setting_db" {
   target_resource_id         = azurerm_mssql_database.defaultdb.id
   log_analytics_workspace_id = var.log_analytics_workspace_id
   enabled_log                = var.monitor_diagnostic_setting_database_enabled_logs
-  metric                     = var.monitor_diagnostic_setting_database_metrics
+  enabled_metric             = var.monitor_diagnostic_setting_database_metrics
 }
 
 
diff --git a/infrastructure/modules/sql-server/main.tf b/infrastructure/modules/sql-server/main.tf
@@ -83,7 +83,7 @@ module "diagnostic_setting_sql_server" {
   target_resource_id         = "${azurerm_mssql_server.azure_sql_server.id}/databases/master"
   log_analytics_workspace_id = var.log_analytics_workspace_id
   enabled_log                = var.monitor_diagnostic_setting_sql_server_enabled_logs
-  metric                     = var.monitor_diagnostic_setting_sql_server_metrics
+  enabled_metric             = var.monitor_diagnostic_setting_sql_server_metrics
 
   # Add dependency on the database we create as the master database will be created by that point too
   depends_on = [azurerm_mssql_database.defaultdb]
diff --git a/infrastructure/modules/storage/main.tf b/infrastructure/modules/storage/main.tf
@@ -126,6 +126,6 @@ module "diagnostic-settings" {
   target_resource_id         = "${azurerm_storage_account.storage_account.id}/${each.value}/default"
   log_analytics_workspace_id = var.log_analytics_workspace_id
   enabled_log                = var.monitor_diagnostic_setting_storage_account_enabled_logs
-  metric                     = var.monitor_diagnostic_setting_storage_account_metrics
+  enabled_metric             = var.monitor_diagnostic_setting_storage_account_metrics
 
 }
diff --git a/infrastructure/modules/vnet/main.tf b/infrastructure/modules/vnet/main.tf
@@ -20,6 +20,6 @@ module "diagnostic-settings" {
   target_resource_id         = azurerm_virtual_network.vnet.id
   log_analytics_workspace_id = var.log_analytics_workspace_id
   enabled_log                = var.monitor_diagnostic_setting_vnet_enabled_logs
-  metric                     = var.monitor_diagnostic_setting_vnet_metrics
+  enabled_metric             = var.monitor_diagnostic_setting_vnet_metrics
 
 }

Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,7 @@ module "diagnostic-settings" {`
`152`	`152`	`target_resource_id = azurerm_api_management.apim.id`
`153`	`153`	`log_analytics_workspace_id = var.log_analytics_workspace_id`
`154`	`154`	`enabled_log = var.monitor_diagnostic_setting_apim_enabled_logs`
`155`		`- metric = var.monitor_diagnostic_setting_apim_metrics`
	`155`	`+ enabled_metric = var.monitor_diagnostic_setting_apim_metrics`
`156`	`156`	`metric_enabled = var.metric_enabled`
	`157`	`+`
`157`	`158`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,6 @@ module "diagnostic-settings" {`
`27`	`27`	`name = "${var.name}-diagnostic-setting"`
`28`	`28`	`target_resource_id = azurerm_service_plan.appserviceplan.id`
`29`	`29`	`log_analytics_workspace_id = var.log_analytics_workspace_id`
	`30`	`+ enabled_metric = var.monitor_diagnostic_setting_appserviceplan_metrics`
`30`	`31`	`#enabled_log = var.enabled_log`
`31`		`- metric = var.monitor_diagnostic_setting_appserviceplan_metrics`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ module "diagnostic-settings" {`
`39`	`39`	`target_resource_id = azurerm_cdn_frontdoor_profile.this.id`
`40`	`40`	`log_analytics_workspace_id = var.log_analytics_workspace_id`
`41`	`41`	`enabled_log = var.monitor_diagnostic_setting_frontdoor_enabled_logs`
`42`		`- metric = var.monitor_diagnostic_setting_frontdoor_metrics`
	`42`	`+ enabled_metric = var.monitor_diagnostic_setting_frontdoor_metrics`
`43`	`43`	`metric_enabled = var.metric_enabled`
	`44`	`+`
`44`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,6 @@ module "diagnostic-settings" {`
`54`	`54`	`target_resource_id = azurerm_container_registry.acr.id`
`55`	`55`	`log_analytics_workspace_id = var.log_analytics_workspace_id`
`56`	`56`	`enabled_log = var.monitor_diagnostic_setting_acr_enabled_logs`
`57`		`- metric = var.monitor_diagnostic_setting_acr_metrics`
	`57`	`+ enabled_metric = var.monitor_diagnostic_setting_acr_metrics`
`58`	`58`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@ module "diagnostic-settings" {`
`6`	`6`	`target_resource_id = "${azurerm_storage_account.example.id}/${each.value}/default"`
`7`	`7`	`log_analytics_workspace_id = azurerm_log_analytics_workspace.example.id`
`8`	`8`	`enabled_log = ["StorageWrite", "StorageRead", "StorageDelete"]`
`9`		`- metric = ["AllMetrics"]`
	`9`	`+ enabled_metric = ["AllMetrics"]`
`10`	`10`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,10 @@ resource "azurerm_monitor_diagnostic_setting" "this" {`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`
`17`		`- dynamic "metric" {`
`18`		`- for_each = var.metric`
	`17`	`+ dynamic "enabled_metric" {`
	`18`	`+ for_each = var.enabled_metric`
`19`	`19`	`content {`
`20`		`- category = metric.value`
`21`		`- enabled = var.metric_enabled`
	`20`	`+ category = enabled_metric.value`
`22`	`21`	`}`
`23`	`22`	`}`
`24`	`23`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ variable "log_analytics_workspace_id" {`
`31`	`31`	`default = null`
`32`	`32`	`}`
`33`	`33`
`34`		`-variable "metric" {`
	`34`	`+variable "enabled_metric" {`
`35`	`35`	`type = list(string)`
`36`	`36`	`description = "value of the metric"`
`37`	`37`	`default = []`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ module "diagnostic-settings" {`
`104`	`104`	`target_resource_id = azurerm_eventhub_namespace.eventhub_ns.id`
`105`	`105`	`log_analytics_workspace_id = var.log_analytics_workspace_id`
`106`	`106`	`enabled_log = var.monitor_diagnostic_setting_eventhub_enabled_logs`
`107`		`- metric = var.monitor_diagnostic_setting_eventhub_metrics`
	`107`	`+ enabled_metric = var.monitor_diagnostic_setting_eventhub_metrics`
`108`	`108`
`109`	`109`	`}`
`110`	`110`
Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,6 @@ module "diagnostic-settings" {`
`139`	`139`	`target_resource_id = azurerm_linux_function_app.function_app.id`
`140`	`140`	`log_analytics_workspace_id = var.log_analytics_workspace_id`
`141`	`141`	`enabled_log = var.monitor_diagnostic_setting_function_app_enabled_logs`
`142`		`- metric = var.monitor_diagnostic_setting_function_app_metrics`
	`142`	`+ enabled_metric = var.monitor_diagnostic_setting_function_app_metrics`
`143`	`143`
`144`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ module "diagnostic-settings" {`
`59`	`59`	`target_resource_id = azurerm_key_vault.keyvault.id`
`60`	`60`	`log_analytics_workspace_id = var.log_analytics_workspace_id`
`61`	`61`	`enabled_log = var.monitor_diagnostic_setting_keyvault_enabled_logs`
`62`		`- metric = var.monitor_diagnostic_setting_keyvault_metrics`
	`62`	`+ enabled_metric = var.monitor_diagnostic_setting_keyvault_metrics`
`63`	`63`	`metric_enabled = var.metric_enabled`
`64`	`64`	`}`
`65`	`65`