Merge branch 'main' into akv-vmext

aztfmod · Oct 5, 2023 · da71538 · da71538
2 parents a2215e1 + 3892885
commit da71538
Show file tree

Hide file tree

Showing 31 changed files with 281 additions and 278 deletions.
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
@@ -6,7 +6,7 @@
   version: '3.7'
   services:
     rover:
-      image: aztfmod/rover:1.5.7-2310.0211
+      image: aztfmod/rover:1.5.6-2309.0507
       user: vscode
 
       labels:

diff --git a/.github/workflows/standalone-scenarios.json b/.github/workflows/standalone-scenarios.json
@@ -85,7 +85,7 @@
     "machine_learning/100-aml",
     "machine_learning/101-aml-vnet",
     "machine_learning/102-aml-compute_instance",
-    "maps/101-azure-maps-account/configuration.tfvars",
+    "maps/101-azure-maps-account",
     "managed_service_identity/100-msi-levels",
     "mariadb_server/100-simple-mariadb",
     "mariadb_server/101-vnet-rule-mariadb",

diff --git a/...mpute/azure_virtual_desktop/wvd_resources_and_session_host/diagnostics_definitions.tfvars b/...mpute/azure_virtual_desktop/wvd_resources_and_session_host/diagnostics_definitions.tfvars
@@ -10,10 +10,10 @@ diagnostics_definition = {
     categories = {
       log = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["Checkpoint", true, true, 7],
-        ["Error", true, true, 7],
-        ["Management", true, true, 7],
-        ["Feed", true, true, 7],
+        ["Checkpoint", true, true, 0],
+        ["Error", true, true, 0],
+        ["Management", true, true, 0],
+        ["Feed", true, true, 0],
       ]
     }
   }
@@ -23,12 +23,12 @@ diagnostics_definition = {
     categories = {
       log = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["Checkpoint", true, true, 7],
-        ["Error", true, true, 7],
-        ["Management", true, true, 7],
-        ["Connection", true, true, 7],
-        ["HostRegistration", true, true, 7],
-        ["AgentHealthStatus", true, true, 7],
+        ["Checkpoint", true, true, 0],
+        ["Error", true, true, 0],
+        ["Management", true, true, 0],
+        ["Connection", true, true, 0],
+        ["HostRegistration", true, true, 0],
+        ["AgentHealthStatus", true, true, 0],
       ]
     }
   }
@@ -38,9 +38,9 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["Checkpoint", true, true, 7],
-        ["Error", true, true, 7],
-        ["Management", true, true, 7],
+        ["Checkpoint", true, true, 0],
+        ["Error", true, true, 0],
+        ["Management", true, true, 0],
       ]
     }
   }

diff --git a/examples/compute/container_registry/200-acr-private-link/diagnostics.tfvars b/examples/compute/container_registry/200-acr-private-link/diagnostics.tfvars
@@ -39,11 +39,11 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["Audit", true, false, 7],
+        ["Audit", true, false, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
   }
@@ -53,12 +53,12 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["ContainerRegistryRepositoryEvents", true, false, 7],
-        ["ContainerRegistryLoginEvents", true, false, 7],
+        ["ContainerRegistryRepositoryEvents", true, false, 0],
+        ["ContainerRegistryLoginEvents", true, false, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
   }

diff --git a/examples/data_factory/117-data_factory_diagnostics/configuration.tfvars b/examples/data_factory/117-data_factory_diagnostics/configuration.tfvars
@@ -35,21 +35,21 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["ActivityRuns", true, false, 7],
-        ["PipelineRuns", true, false, 7],
-        ["TriggerRuns", true, false, 7],
-        ["SandboxPipelineRuns", true, false, 7],
-        ["SandboxActivityRuns", true, false, 7],
-        ["SSISPackageEventMessages", true, false, 7],
-        ["SSISPackageExecutableStatistics", true, false, 7],
-        ["SSISPackageEventMessageContext", true, false, 7],
-        ["SSISPackageExecutionComponentPhases", true, false, 7],
-        ["SSISPackageExecutionDataStatistics", true, false, 7],
-        ["SSISIntegrationRuntimeLogs", true, false, 7],
+        ["ActivityRuns", true, false, 0],
+        ["PipelineRuns", true, false, 0],
+        ["TriggerRuns", true, false, 0],
+        ["SandboxPipelineRuns", true, false, 0],
+        ["SandboxActivityRuns", true, false, 0],
+        ["SSISPackageEventMessages", true, false, 0],
+        ["SSISPackageExecutableStatistics", true, false, 0],
+        ["SSISPackageEventMessageContext", true, false, 0],
+        ["SSISPackageExecutionComponentPhases", true, false, 0],
+        ["SSISPackageExecutionDataStatistics", true, false, 0],
+        ["SSISIntegrationRuntimeLogs", true, false, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
   }

diff --git a/examples/diagnostics_profiles/100-multiple-destinations/diagnostics_definition.tfvars b/examples/diagnostics_profiles/100-multiple-destinations/diagnostics_definition.tfvars
@@ -9,7 +9,7 @@ diagnostics_definition = {
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
   }

diff --git a/...nostics_profiles/101-log-analytics-destination-type-profile/diagnostics_definition.tfvars b/...nostics_profiles/101-log-analytics-destination-type-profile/diagnostics_definition.tfvars
@@ -4,11 +4,11 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["VMProtectionAlerts", true, true, 90],
+        ["VMProtectionAlerts", true, true, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, true, 90],
+        ["AllMetrics", true, true, 0],
       ]
     }
   }
@@ -18,13 +18,13 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["DDoSProtectionNotifications", true, true, 90],
-        ["DDoSMitigationFlowLogs", true, true, 90],
-        ["DDoSMitigationReports", true, true, 90],
+        ["DDoSProtectionNotifications", true, true, 0],
+        ["DDoSMitigationFlowLogs", true, true, 0],
+        ["DDoSMitigationReports", true, true, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, true, 90],
+        ["AllMetrics", true, true, 0],
       ]
     }
   }
@@ -34,25 +34,25 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AzureFirewallApplicationRule", true, true, 90],
-        ["AzureFirewallNetworkRule", true, true, 90],
-        ["AzureFirewallDnsProxy", true, true, 90],
-        ["AZFWApplicationRule", true, true, 90],
-        ["AZFWApplicationRuleAggregation", true, true, 90],
-        ["AZFWDnsQuery", true, true, 90],
-        ["AZFWFatFlow", true, true, 90],
-        ["AZFWFlowTrace", true, true, 90],
-        ["AZFWFqdnResolveFailure", true, true, 90],
-        ["AZFWIdpsSignature", true, true, 90],
-        ["AZFWNatRule", true, true, 90],
-        ["AZFWNatRuleAggregation", true, true, 90],
-        ["AZFWNetworkRule", true, true, 90],
-        ["AZFWNetworkRuleAggregation", true, true, 90],
-        ["AZFWThreatIntel", true, true, 90],
+        ["AzureFirewallApplicationRule", true, true, 0],
+        ["AzureFirewallNetworkRule", true, true, 0],
+        ["AzureFirewallDnsProxy", true, true, 0],
+        ["AZFWApplicationRule", true, true, 0],
+        ["AZFWApplicationRuleAggregation", true, true, 0],
+        ["AZFWDnsQuery", true, true, 0],
+        ["AZFWFatFlow", true, true, 0],
+        ["AZFWFlowTrace", true, true, 0],
+        ["AZFWFqdnResolveFailure", true, true, 0],
+        ["AZFWIdpsSignature", true, true, 0],
+        ["AZFWNatRule", true, true, 0],
+        ["AZFWNatRuleAggregation", true, true, 0],
+        ["AZFWNetworkRule", true, true, 0],
+        ["AZFWNetworkRuleAggregation", true, true, 0],
+        ["AZFWThreatIntel", true, true, 0],
       ]
       metric = [
         # ["Category name",  "Metric Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, true, 90],
+        ["AllMetrics", true, true, 0],
       ]
     }
   }