Change names

aamini7 · aamini7 · commit a3cb7eaa087e · 2024-11-27T03:47:02.000-05:00
diff --git a/scenarios/AksOpenAiTerraform/terraform/modules/aks/main.tf b/scenarios/AksOpenAiTerraform/terraform/modules/aks/main.tf
@@ -105,7 +105,7 @@ 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
 
diff --git a/scenarios/AksOpenAiTerraform/terraform/modules/bastion_host/main.tf b/scenarios/AksOpenAiTerraform/terraform/modules/bastion_host/main.tf
@@ -33,7 +33,7 @@ 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
 
@@ -47,7 +47,7 @@ resource "azurerm_monitor_diagnostic_setting" "settings" {
 }
 
 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
 
diff --git a/scenarios/AksOpenAiTerraform/terraform/modules/container_registry/main.tf b/scenarios/AksOpenAiTerraform/terraform/modules/container_registry/main.tf
@@ -44,7 +44,7 @@ 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
 
diff --git a/scenarios/AksOpenAiTerraform/terraform/modules/firewall/main.tf b/scenarios/AksOpenAiTerraform/terraform/modules/firewall/main.tf
@@ -226,7 +226,7 @@ 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
 
@@ -248,7 +248,7 @@ resource "azurerm_monitor_diagnostic_setting" "settings" {
 }
 
 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
 
diff --git a/scenarios/AksOpenAiTerraform/terraform/modules/key_vault/main.tf b/scenarios/AksOpenAiTerraform/terraform/modules/key_vault/main.tf
@@ -31,7 +31,7 @@ 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
 
diff --git a/scenarios/AksOpenAiTerraform/terraform/modules/network_security_group/main.tf b/scenarios/AksOpenAiTerraform/terraform/modules/network_security_group/main.tf
@@ -33,7 +33,7 @@ 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
 
@@ -43,6 +43,5 @@ resource "azurerm_monitor_diagnostic_setting" "settings" {
 
  enabled_log {
     category = "NetworkSecurityGroupRuleCounter"
-    enabled  = true
   }
 }
diff --git a/scenarios/AksOpenAiTerraform/terraform/modules/openai/main.tf b/scenarios/AksOpenAiTerraform/terraform/modules/openai/main.tf
@@ -37,7 +37,7 @@ resource "azurerm_cognitive_deployment" "deployment" {
 }
 
 resource "azurerm_monitor_diagnostic_setting" "settings" {
-  name                       = "DiagnosticsSettings"
+  name                       = "OpenAiDiagnosticsSettings"
   target_resource_id         = azurerm_cognitive_account.openai.id
   log_analytics_workspace_id = var.log_analytics_workspace_id
 
diff --git a/scenarios/AksOpenAiTerraform/terraform/modules/virtual_network/main.tf b/scenarios/AksOpenAiTerraform/terraform/modules/virtual_network/main.tf
@@ -35,7 +35,7 @@ resource "azurerm_subnet" "subnet" {
 }
 
 resource "azurerm_monitor_diagnostic_setting" "settings" {
-  name                       = "DiagnosticsSettings"
+  name                       = "VirtualNetworkDiagnosticsSettings"
   target_resource_id         = azurerm_virtual_network.vnet.id
   log_analytics_workspace_id = var.log_analytics_workspace_id
 

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ resource "azurerm_kubernetes_cluster" "aks_cluster" {`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`resource "azurerm_monitor_diagnostic_setting" "settings" {`
`108`		`- name = "DiagnosticsSettings"`
	`108`	`+ name = "AksDiagnosticsSettings"`
`109`	`109`	`target_resource_id = azurerm_kubernetes_cluster.aks_cluster.id`
`110`	`110`	`log_analytics_workspace_id = var.log_analytics_workspace_id`
`111`	`111`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ resource "azurerm_bastion_host" "bastion_host" {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`resource "azurerm_monitor_diagnostic_setting" "settings" {`
`36`		`- name = "DiagnosticsSettings"`
	`36`	`+ name = "BastionDiagnosticsSettings"`
`37`	`37`	`target_resource_id = azurerm_bastion_host.bastion_host.id`
`38`	`38`	`log_analytics_workspace_id = var.log_analytics_workspace_id`
`39`	`39`
`@@ -47,7 +47,7 @@ resource "azurerm_monitor_diagnostic_setting" "settings" {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`resource "azurerm_monitor_diagnostic_setting" "pip_settings" {`
`50`		`- name = "DiagnosticsSettings"`
	`50`	`+ name = "BastionDdosDiagnosticsSettings"`
`51`	`51`	`target_resource_id = azurerm_public_ip.public_ip.id`
`52`	`52`	`log_analytics_workspace_id = var.log_analytics_workspace_id`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ resource "azurerm_user_assigned_identity" "acr_identity" {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`resource "azurerm_monitor_diagnostic_setting" "settings" {`
`47`		`- name = "DiagnosticsSettings"`
	`47`	`+ name = "ContainerDiagnosticsSettings"`
`48`	`48`	`target_resource_id = azurerm_container_registry.acr.id`
`49`	`49`	`log_analytics_workspace_id = var.log_analytics_workspace_id`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ resource "azurerm_firewall_policy_rule_collection_group" "policy" {`
`226`	`226`	`}`
`227`	`227`
`228`	`228`	`resource "azurerm_monitor_diagnostic_setting" "settings" {`
`229`		`- name = "DiagnosticsSettings"`
	`229`	`+ name = "FirewallDiagnosticsSettings"`
`230`	`230`	`target_resource_id = azurerm_firewall.firewall.id`
`231`	`231`	`log_analytics_workspace_id = var.log_analytics_workspace_id`
`232`	`232`
`@@ -248,7 +248,7 @@ resource "azurerm_monitor_diagnostic_setting" "settings" {`
`248`	`248`	`}`
`249`	`249`
`250`	`250`	`resource "azurerm_monitor_diagnostic_setting" "pip_settings" {`
`251`		`- name = "DiagnosticsSettings"`
	`251`	`+ name = "FirewallDdosDiagnosticsSettings"`
`252`	`252`	`target_resource_id = azurerm_public_ip.pip.id`
`253`	`253`	`log_analytics_workspace_id = var.log_analytics_workspace_id`
`254`	`254`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ resource "azurerm_key_vault" "key_vault" {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`resource "azurerm_monitor_diagnostic_setting" "settings" {`
`34`		`- name = "DiagnosticsSettings"`
	`34`	`+ name = "KeyVaultDiagnosticsSettings"`
`35`	`35`	`target_resource_id = azurerm_key_vault.key_vault.id`
`36`	`36`	`log_analytics_workspace_id = var.log_analytics_workspace_id`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ resource "azurerm_network_security_group" "nsg" {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`resource "azurerm_monitor_diagnostic_setting" "settings" {`
`36`		`- name = "DiagnosticsSettings"`
	`36`	`+ name = "NetworkSecurityDiagnosticsSettings"`
`37`	`37`	`target_resource_id = azurerm_network_security_group.nsg.id`
`38`	`38`	`log_analytics_workspace_id = var.log_analytics_workspace_id`
`39`	`39`
`@@ -43,6 +43,5 @@ resource "azurerm_monitor_diagnostic_setting" "settings" {`
`43`	`43`
`44`	`44`	`enabled_log {`
`45`	`45`	`category = "NetworkSecurityGroupRuleCounter"`
`46`		`- enabled = true`
`47`	`46`	`}`
`48`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ resource "azurerm_cognitive_deployment" "deployment" {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`resource "azurerm_monitor_diagnostic_setting" "settings" {`
`40`		`- name = "DiagnosticsSettings"`
	`40`	`+ name = "OpenAiDiagnosticsSettings"`
`41`	`41`	`target_resource_id = azurerm_cognitive_account.openai.id`
`42`	`42`	`log_analytics_workspace_id = var.log_analytics_workspace_id`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ resource "azurerm_subnet" "subnet" {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`resource "azurerm_monitor_diagnostic_setting" "settings" {`
`38`		`- name = "DiagnosticsSettings"`
	`38`	`+ name = "VirtualNetworkDiagnosticsSettings"`
`39`	`39`	`target_resource_id = azurerm_virtual_network.vnet.id`
`40`	`40`	`log_analytics_workspace_id = var.log_analytics_workspace_id`
`41`	`41`