fix: resolve diagnostic settings inconsistent plan error in all modules

modules/azure/analysis_services/main.tf

@@ -33,11 +33,6 @@ resource "azurerm_analysis_services_server" "server" {
   }
 }
 
-data "azurerm_monitor_diagnostic_categories" "diagnostic_categories" {
-  count       = var.log_analytics_workspace_id == null ? 0 : 1
-  resource_id = azurerm_analysis_services_server.server.id
-}
-
 resource "azurerm_monitor_diagnostic_setting" "diagnostic_setting" {
   count                      = var.log_analytics_workspace_id == null ? 0 : 1
   name                       = "diag-${var.name}"
@@ -47,28 +42,12 @@ resource "azurerm_monitor_diagnostic_setting" "diagnostic_setting" {
   // TODO: not yet implemented by Azure
   // log_analytics_destination_type = "Dedicated"
 
-  dynamic "enabled_log" {
-    for_each = data.azurerm_monitor_diagnostic_categories.diagnostic_categories[0].log_category_types
-
-    content {
-      category = enabled_log.value
-
-      retention_policy {
-        enabled = false
-      }
-    }
+  enabled_log {
+    category_group = "allLogs"
   }
 
-  dynamic "metric" {
-    for_each = data.azurerm_monitor_diagnostic_categories.diagnostic_categories[0].metrics
-
-    content {
-      category = metric.value
-      enabled  = true
-
-      retention_policy {
-        enabled = false
-      }
-    }
+  metric {
+    category = "AllMetrics"
+    enabled  = true
   }
 }

modules/azure/api_management/main.tf

@@ -120,41 +120,20 @@ resource "azurerm_api_management_diagnostic" "apim_diagnostic" {
   }
 }
 
-data "azurerm_monitor_diagnostic_categories" "diagnostic_categories" {
-  count       = var.log_analytics_workspace_id == null ? 0 : 1
-  resource_id = azurerm_api_management.api_management.id
-}
-
 // Write logs and metrics to log analytics if specified
 resource "azurerm_monitor_diagnostic_setting" "diagnostic_setting" {
   count                      = var.log_analytics_workspace_id == null ? 0 : 1
   name                       = "diag-${azurerm_api_management.api_management.name}"
   target_resource_id         = azurerm_api_management.api_management.id
   log_analytics_workspace_id = var.log_analytics_workspace_id
 
-  dynamic "enabled_log" {
-    for_each = data.azurerm_monitor_diagnostic_categories.diagnostic_categories[0].log_category_types
-
-    content {
-      category = enabled_log.value
-
-      retention_policy {
-        enabled = false
-      }
-    }
+  enabled_log {
+    category_group = "allLogs"
   }
 
-  dynamic "metric" {
-    for_each = data.azurerm_monitor_diagnostic_categories.diagnostic_categories[0].metrics
-
-    content {
-      category = metric.value
-      enabled  = true
-
-      retention_policy {
-        enabled = false
-      }
-    }
+  metric {
+    category = "AllMetrics"
+    enabled  = true
   }
 }
 

modules/azure/data_lake_storage/main.tf

@@ -118,11 +118,6 @@ resource "azurerm_storage_account_network_rules" "storage_account_network_rules"
   bypass                     = ["Logging", "Metrics", "AzureServices"]
 }
 
-data "azurerm_monitor_diagnostic_categories" "diagnostic_categories" {
-  count       = var.log_analytics_workspace_id == null ? 0 : 1
-  resource_id = azurerm_storage_account.storage_account.id
-}
-
 resource "azurerm_monitor_diagnostic_setting" "diagnostic_setting" {
   count                      = var.log_analytics_workspace_id == null ? 0 : 1
   name                       = "diag-${var.name}"
@@ -132,28 +127,12 @@ resource "azurerm_monitor_diagnostic_setting" "diagnostic_setting" {
   // TODO: not yet implemented by Azure
   // log_analytics_destination_type = "Dedicated"
 
-  dynamic "enabled_log" {
-    for_each = data.azurerm_monitor_diagnostic_categories.diagnostic_categories[0].log_category_types
-
-    content {
-      category = enabled_log.value
-
-      retention_policy {
-        enabled = false
-      }
-    }
+  enabled_log {
+    category_group = "allLogs"
   }
 
-  dynamic "metric" {
-    for_each = data.azurerm_monitor_diagnostic_categories.diagnostic_categories[0].metrics
-
-    content {
-      category = metric.value
-      enabled  = true
-
-      retention_policy {
-        enabled = false
-      }
-    }
+  metric {
+    category = "AllMetrics"
+    enabled  = true
   }
 }

modules/azure/event_grid_topic/main.tf

@@ -23,32 +23,19 @@ resource "azurerm_eventgrid_system_topic" "topic" {
   topic_type             = var.topic_type
 }
 
-data "azurerm_monitor_diagnostic_categories" "diagnostic_categories" {
-  count       = var.loganalytics_diagnostic_setting == null ? 0 : 1
-  resource_id = azurerm_eventgrid_system_topic.topic.id
-}
-
 resource "azurerm_monitor_diagnostic_setting" "diagnostic_setting" {
   count                      = var.loganalytics_diagnostic_setting == null ? 0 : 1
   name                       = "diag-${var.topic_name}"
   target_resource_id         = azurerm_eventgrid_system_topic.topic.id
   log_analytics_workspace_id = var.loganalytics_diagnostic_setting.workspace_id
 
 
-  dynamic "enabled_log" {
-    for_each = var.loganalytics_diagnostic_setting.categories == null ? data.azurerm_monitor_diagnostic_categories.diagnostic_categories[0].log_category_types : var.loganalytics_diagnostic_setting.categories
-
-    content {
-      category = enabled_log.value
-    }
+  enabled_log {
+    category_group = "allLogs"
   }
 
-  dynamic "metric" {
-    for_each = var.loganalytics_diagnostic_setting.metrics == null ? data.azurerm_monitor_diagnostic_categories.diagnostic_categories[0].metrics : var.loganalytics_diagnostic_setting.metrics
-
-    content {
-      category = metric.value
-      enabled  = true
-    }
+  metric {
+    category = "AllMetrics"
+    enabled  = true
   }
 }

modules/azure/event_hub/main.tf

@@ -39,32 +39,19 @@ resource "azurerm_eventhub_consumer_group" "consumer" {
 }
 
 
-data "azurerm_monitor_diagnostic_categories" "diagnostic_categories" {
-  count       = var.loganalytics_diagnostic_setting == null ? 0 : 1
-  resource_id = azurerm_eventhub_namespace.namespace.id
-}
-
 resource "azurerm_monitor_diagnostic_setting" "diagnostic_setting" {
   count                          = var.loganalytics_diagnostic_setting == null ? 0 : 1
   name                           = "diag-${var.namespace_name}"
   target_resource_id             = azurerm_eventhub_namespace.namespace.id
   log_analytics_workspace_id     = var.loganalytics_diagnostic_setting.workspace_id
   log_analytics_destination_type = var.loganalytics_diagnostic_setting.destination_type == null ? null : var.loganalytics_diagnostic_setting.destination_type
 
-  dynamic "enabled_log" {
-    for_each = var.loganalytics_diagnostic_setting.categories == null ? data.azurerm_monitor_diagnostic_categories.diagnostic_categories[0].log_category_types : var.loganalytics_diagnostic_setting.categories
-
-    content {
-      category = enabled_log.value
-    }
+  enabled_log {
+    category_group = "allLogs"
   }
 
-  dynamic "metric" {
-    for_each = var.loganalytics_diagnostic_setting.metrics == null ? data.azurerm_monitor_diagnostic_categories.diagnostic_categories[0].metrics : var.loganalytics_diagnostic_setting.metrics
-
-    content {
-      category = metric.value
-      enabled  = true
-    }
+  metric {
+    category = "AllMetrics"
+    enabled  = true
   }
 }

modules/azure/frontdoor_classic/main.tf

@@ -141,11 +141,6 @@ resource "azurerm_frontdoor" "frontdoor" {
   }
 }
 
-data "azurerm_monitor_diagnostic_categories" "diagnostic_categories" {
-  count       = var.log_analytics_workspace_id == null ? 0 : 1
-  resource_id = azurerm_frontdoor.frontdoor.id
-}
-
 resource "azurerm_monitor_diagnostic_setting" "diagnostic_setting" {
   count                      = var.log_analytics_workspace_id == null ? 0 : 1
   name                       = "diag-${var.name}"
@@ -155,29 +150,13 @@ resource "azurerm_monitor_diagnostic_setting" "diagnostic_setting" {
   // TODO: not yet implemented by Azure
   // log_analytics_destination_type = "Dedicated"
 
-  dynamic "enabled_log" {
-    for_each = data.azurerm_monitor_diagnostic_categories.diagnostic_categories[0].log_category_types
-
-    content {
-      category = enabled_log.value
-
-      retention_policy {
-        enabled = false
-      }
-    }
+  enabled_log {
+    category_group = "allLogs"
   }
 
-  dynamic "metric" {
-    for_each = data.azurerm_monitor_diagnostic_categories.diagnostic_categories[0].metrics
-
-    content {
-      category = metric.value
-      enabled  = true
-
-      retention_policy {
-        enabled = false
-      }
-    }
+  metric {
+    category = "AllMetrics"
+    enabled  = true
   }
 }
 

modules/azure/frontdoor_standard/main.tf

@@ -172,34 +172,18 @@ resource "azurerm_cdn_frontdoor_security_policy" "fd_security_policy" {
 }
 
 # Diagnostic settings
-data "azurerm_monitor_diagnostic_categories" "fd_categories" {
-  count       = var.log_analytics_workspace_id == null ? 0 : 1
-  resource_id = azurerm_cdn_frontdoor_profile.fd_profile.id
-}
-
 resource "azurerm_monitor_diagnostic_setting" "fd_diagnostics" {
   count                      = var.log_analytics_workspace_id == null ? 0 : 1
   name                       = "diag-${var.name}"
   target_resource_id         = azurerm_cdn_frontdoor_profile.fd_profile.id
   log_analytics_workspace_id = var.log_analytics_workspace_id
 
-  dynamic "enabled_log" {
-    for_each = data.azurerm_monitor_diagnostic_categories.fd_categories[0].log_category_types
-    content {
-      category = enabled_log.value
-      retention_policy {
-        enabled = false
-      }
-    }
+  enabled_log {
+    category_group = "allLogs"
   }
 
-  dynamic "metric" {
-    for_each = data.azurerm_monitor_diagnostic_categories.fd_categories[0].metrics
-    content {
-      category = metric.value
-      retention_policy {
-        enabled = false
-      }
-    }
+  metric {
+    category = "AllMetrics"
+    enabled  = true
   }
 }

modules/azure/key_vault/main.tf

@@ -82,11 +82,6 @@ resource "azurerm_key_vault" "key_vault" {
   }
 }
 
-data "azurerm_monitor_diagnostic_categories" "diagnostic_categories" {
-  count       = var.log_analytics_workspace_id == null ? 0 : 1
-  resource_id = azurerm_key_vault.key_vault.id
-}
-
 resource "azurerm_monitor_diagnostic_setting" "diagnostic_setting" {
   count                      = var.log_analytics_workspace_id == null ? 0 : 1
   name                       = "diag-${var.name}"
@@ -96,28 +91,12 @@ resource "azurerm_monitor_diagnostic_setting" "diagnostic_setting" {
   // TODO: not yet implemented by Azure
   // log_analytics_destination_type = "Dedicated"
 
-  dynamic "enabled_log" {
-    for_each = data.azurerm_monitor_diagnostic_categories.diagnostic_categories[0].log_category_types
-
-    content {
-      category = enabled_log.value
-
-      retention_policy {
-        enabled = false
-      }
-    }
+  enabled_log {
+    category_group = "allLogs"
   }
 
-  dynamic "metric" {
-    for_each = data.azurerm_monitor_diagnostic_categories.diagnostic_categories[0].metrics
-
-    content {
-      category = metric.value
-      enabled  = true
-
-      retention_policy {
-        enabled = false
-      }
-    }
+  metric {
+    category = "AllMetrics"
+    enabled  = true
   }
 }

modules/azure/log_analytics_workspace/main.tf

@@ -26,33 +26,20 @@ resource "azurerm_log_analytics_workspace" "workspace" {
 
 
 
-data "azurerm_monitor_diagnostic_categories" "diagnostic_categories" {
-  count       = var.loganalytics_diagnostic_setting == null ? 0 : 1
-  resource_id = azurerm_log_analytics_workspace.workspace.id
-}
-
 resource "azurerm_monitor_diagnostic_setting" "diagnostic_setting" {
   count                          = var.loganalytics_diagnostic_setting == null ? 0 : 1
   name                           = "diag-${var.name}"
   target_resource_id             = azurerm_log_analytics_workspace.workspace.id
   log_analytics_workspace_id     = azurerm_log_analytics_workspace.workspace.id
   log_analytics_destination_type = var.loganalytics_diagnostic_setting.destination_type == null ? null : var.loganalytics_diagnostic_setting.destination_type
 
-  dynamic "enabled_log" {
-    for_each = var.loganalytics_diagnostic_setting.categories == null ? data.azurerm_monitor_diagnostic_categories.diagnostic_categories[0].log_category_types : var.loganalytics_diagnostic_setting.categories
-
-    content {
-      category = enabled_log.value
-    }
+  enabled_log {
+    category_group = "allLogs"
   }
 
-  dynamic "metric" {
-    for_each = var.loganalytics_diagnostic_setting.metrics == null ? data.azurerm_monitor_diagnostic_categories.diagnostic_categories[0].metrics : var.loganalytics_diagnostic_setting.metrics
-
-    content {
-      category = metric.value
-      enabled  = true
-    }
+  metric {
+    category = "AllMetrics"
+    enabled  = true
   }
 }