fix: DTOSS-9703 update diagnostic settings module

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
+
 }

infrastructure/modules/app-service-plan/main.tf

@@ -28,5 +28,5 @@ module "diagnostic-settings" {
   target_resource_id         = azurerm_service_plan.appserviceplan.id
   log_analytics_workspace_id = var.log_analytics_workspace_id
   #enabled_log                = var.enabled_log
-  metric = var.monitor_diagnostic_setting_appserviceplan_metrics
+  enabled_metric = var.monitor_diagnostic_setting_appserviceplan_metrics
 }

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
+
 }

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
 
 }

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"]
 
 }

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
     }
   }
 

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     = []

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
 
 }
 

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
 
 }

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
 }
 

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
 }

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
 
 }

infrastructure/modules/postgresql-flexible/main.tf

@@ -135,5 +135,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
 }

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
 }
 
 

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]

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
 
 }

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
 
 }