Fix logs

Author: aamini7

scenarios/AksOpenAiTerraform/terraform/main.tf

@@ -55,7 +55,6 @@ module "virtual_network" {
   vnet_name                    = var.name_prefix == null ? "${random_string.prefix.result}${var.vnet_name}" : "${var.name_prefix}${var.vnet_name}"
   address_space                = var.vnet_address_space
   log_analytics_workspace_id   = module.log_analytics_workspace.id
-  log_analytics_retention_days = var.log_analytics_retention_days
   tags                         = var.tags
 
   subnets = [
@@ -118,7 +117,6 @@ module "container_registry" {
   admin_enabled                = var.acr_admin_enabled
   georeplication_locations     = var.acr_georeplication_locations
   log_analytics_workspace_id   = module.log_analytics_workspace.id
-  log_analytics_retention_days = var.log_analytics_retention_days
   tags                         = var.tags
 
 }

scenarios/AksOpenAiTerraform/terraform/modules/aks/main.tf

@@ -111,79 +111,39 @@ resource "azurerm_kubernetes_cluster" "aks_cluster" {
 }
 
 resource "azurerm_monitor_diagnostic_setting" "settings" {
-  name                       = "DiagnosticsSettings"
+  name                       = "AksDiagnosticsSettings"
   target_resource_id         = azurerm_kubernetes_cluster.aks_cluster.id
   log_analytics_workspace_id = var.log_analytics_workspace_id
 
   enabled_log {
     category = "kube-apiserver"
-
-    retention_policy {
-      enabled = true  
-      days    = var.log_analytics_retention_days
-    }
   }
 
   enabled_log {
     category = "kube-audit"
-
-    retention_policy {
-      enabled = true
-      days    = var.log_analytics_retention_days
-    }
   }
 
   enabled_log {
     category = "kube-audit-admin"
-
-    retention_policy {
-      enabled = true
-      days    = var.log_analytics_retention_days
-    }
   }
 
   enabled_log {
     category = "kube-controller-manager"
-
-    retention_policy {
-      enabled = true
-      days    = var.log_analytics_retention_days
-    }
   }
 
   enabled_log {
     category = "kube-scheduler"
-
-    retention_policy {
-      enabled = true
-      days    = var.log_analytics_retention_days
-    }
   }
 
   enabled_log {
     category = "cluster-autoscaler"
-
-    retention_policy {
-      enabled = true
-      days    = var.log_analytics_retention_days
-    }
   }
 
   enabled_log {
     category = "guard"
-
-    retention_policy {
-      enabled = true
-      days    = var.log_analytics_retention_days
-    }
   }
 
   metric {
     category = "AllMetrics"
-
-    retention_policy {
-      enabled = true
-      days    = var.log_analytics_retention_days
-    }
   }
 }

scenarios/AksOpenAiTerraform/terraform/modules/bastion_host/main.tf

@@ -33,67 +33,37 @@ resource "azurerm_bastion_host" "bastion_host" {
 }
 
 resource "azurerm_monitor_diagnostic_setting" "settings" {
-  name                       = "DiagnosticsSettings"
+  name                       = "BastionDiagnosticsSettings"
   target_resource_id         = azurerm_bastion_host.bastion_host.id
   log_analytics_workspace_id = var.log_analytics_workspace_id
 
   enabled_log {
     category = "BastionAuditLogs"
-
-    retention_policy {
-      enabled = true
-      days    = var.log_analytics_retention_days
-    }
   }
 
   metric {
     category = "AllMetrics"
-
-    retention_policy {
-      enabled = true
-      days    = var.log_analytics_retention_days
-    }
   }
 }
 
 resource "azurerm_monitor_diagnostic_setting" "pip_settings" {
-  name                       = "DiagnosticsSettings"
+  name                       = "BastionDdosDiagnosticsSettings"
   target_resource_id         = azurerm_public_ip.public_ip.id
   log_analytics_workspace_id = var.log_analytics_workspace_id
 
   enabled_log {
     category = "DDoSProtectionNotifications"
-
-    retention_policy {
-      enabled = true
-      days    = var.log_analytics_retention_days
-    }
   }
 
   enabled_log {
     category = "DDoSMitigationFlowLogs"
-
-    retention_policy {
-      enabled = true
-      days    = var.log_analytics_retention_days
-    }
   }
 
   enabled_log {
     category = "DDoSMitigationReports"
-    
-    retention_policy {
-      enabled = true
-      days    = var.log_analytics_retention_days
-    }
   }
 
   metric {
     category = "AllMetrics"
-
-    retention_policy {
-      enabled = true
-      days    = var.log_analytics_retention_days
-    }
   }
 }

scenarios/AksOpenAiTerraform/terraform/modules/container_registry/main.tf

@@ -44,34 +44,19 @@ resource "azurerm_user_assigned_identity" "acr_identity" {
 }
 
 resource "azurerm_monitor_diagnostic_setting" "settings" {
-  name                       = "DiagnosticsSettings"
+  name                       = "ContainerDiagnosticsSettings"
   target_resource_id         = azurerm_container_registry.acr.id
   log_analytics_workspace_id = var.log_analytics_workspace_id
 
   enabled_log {
     category = "ContainerRegistryRepositoryEvents"
-
-    retention_policy {
-      enabled = true
-      days    = var.log_analytics_retention_days
-    }
   }
 
   enabled_log {
     category = "ContainerRegistryLoginEvents"
-
-    retention_policy {
-      enabled = true
-      days    = var.log_analytics_retention_days
-    }
   }
 
   metric {
     category = "AllMetrics"
-
-    retention_policy {
-      enabled = true
-      days    = var.log_analytics_retention_days
-    }
   }
 }

scenarios/AksOpenAiTerraform/terraform/modules/container_registry/variables.tf

@@ -45,10 +45,4 @@ variable "georeplication_locations" {
 variable "log_analytics_workspace_id" {
   description = "Specifies the log analytics workspace id"
   type        = string
-}
-
-variable "log_analytics_retention_days" {
-  description = "Specifies the number of days of the retention policy"
-  type        = number
-  default     = 7
 }

scenarios/AksOpenAiTerraform/terraform/modules/diagnostic_setting/main.tf

@@ -15,11 +15,6 @@ resource "azurerm_monitor_diagnostic_setting" "settings" {
     content {
       category = each.key
       enabled  = true
-
-      retention_policy {
-        enabled = var.retention_policy_enabled
-        days    = var.retention_policy_days
-      }
     }
   }
 
@@ -28,11 +23,6 @@ resource "azurerm_monitor_diagnostic_setting" "settings" {
     content {
       category = each.key
       enabled  = true
-
-      retention_policy {
-        enabled = var.retention_policy_enabled
-        days    = var.retention_policy_days
-      }
     }
   }
 }

scenarios/AksOpenAiTerraform/terraform/modules/firewall/main.tf

@@ -226,85 +226,45 @@ resource "azurerm_firewall_policy_rule_collection_group" "policy" {
 }
 
 resource "azurerm_monitor_diagnostic_setting" "settings" {
-  name                       = "DiagnosticsSettings"
+  name                       = "FirewallDiagnosticsSettings"
   target_resource_id         = azurerm_firewall.firewall.id
   log_analytics_workspace_id = var.log_analytics_workspace_id
 
   enabled_log {
     category = "AzureFirewallApplicationRule"
-
-    retention_policy {
-      enabled = true
-      days    = var.log_analytics_retention_days
-    }
   }
 
   enabled_log {
     category = "AzureFirewallNetworkRule"
-
-    retention_policy {
-      enabled = true
-      days    = var.log_analytics_retention_days
-    }
   }
 
   enabled_log {
     category = "AzureFirewallDnsProxy"
-
-    retention_policy {
-      enabled = true
-      days    = var.log_analytics_retention_days
-    }
   }
 
   metric {
     category = "AllMetrics"
-
-    retention_policy {
-      enabled = true
-      days    = var.log_analytics_retention_days
-    }
   }
 }
 
 resource "azurerm_monitor_diagnostic_setting" "pip_settings" {
-  name                       = "DiagnosticsSettings"
+  name                       = "FirewallDdosDiagnosticsSettings"
   target_resource_id         = azurerm_public_ip.pip.id
   log_analytics_workspace_id = var.log_analytics_workspace_id
 
   enabled_log {
     category = "DDoSProtectionNotifications"
-
-    retention_policy {
-      enabled = true
-      days    = var.log_analytics_retention_days
-    }
   }
 
   enabled_log {
     category = "DDoSMitigationFlowLogs"
-
-    retention_policy {
-      enabled = true
-      days    = var.log_analytics_retention_days
-    }
   }
 
   enabled_log {
     category = "DDoSMitigationReports"
-
-    retention_policy {
-      enabled = true
-      days    = var.log_analytics_retention_days
-    }
   }
 
   metric {
     category = "AllMetrics"
-
-    retention_policy {
-      enabled = true
-      days    = var.log_analytics_retention_days
-    }
   }
 }

scenarios/AksOpenAiTerraform/terraform/modules/key_vault/main.tf

@@ -31,34 +31,19 @@ resource "azurerm_key_vault" "key_vault" {
 }
 
 resource "azurerm_monitor_diagnostic_setting" "settings" {
-  name                       = "DiagnosticsSettings"
+  name                       = "KeyVaultDiagnosticsSettings"
   target_resource_id         = azurerm_key_vault.key_vault.id
   log_analytics_workspace_id = var.log_analytics_workspace_id
 
   enabled_log {
     category = "AuditEvent"
-
-    retention_policy {
-      enabled = true
-      days    = var.log_analytics_retention_days
-    }
   }
 
   enabled_log {
     category = "AzurePolicyEvaluationDetails"
-
-    retention_policy {
-      enabled = true
-      days    = var.log_analytics_retention_days
-    }
   }
 
   metric {
     category = "AllMetrics"
-
-    retention_policy {
-      enabled = true
-      days    = var.log_analytics_retention_days
-    }
   }
 }

scenarios/AksOpenAiTerraform/terraform/modules/network_security_group/main.tf

@@ -33,26 +33,15 @@ resource "azurerm_network_security_group" "nsg" {
 }
 
 resource "azurerm_monitor_diagnostic_setting" "settings" {
-  name                       = "DiagnosticsSettings"
+  name                       = "NetworkSecurityDiagnosticsSettings"
   target_resource_id         = azurerm_network_security_group.nsg.id
   log_analytics_workspace_id = var.log_analytics_workspace_id
 
   enabled_log {
     category = "NetworkSecurityGroupEvent"
-
-    retention_policy {
-      enabled = true
-      days    = var.log_analytics_retention_days
-    }
   }
 
  enabled_log {
     category = "NetworkSecurityGroupRuleCounter"
-    enabled  = true
-
-    retention_policy {
-      enabled = true
-      days    = var.log_analytics_retention_days
-    }
   }
 }