Merge pull request #527 from judyer28/fix-log-templates

Fix alert log templates for ARM and Bicep
Azure · Feb 11, 2025 · d532708 · d532708
2 parents 4b9ef51 + 19c3234
commit d532708
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 14 deletions.
diff --git a/tooling/generate-templates/policy/log.json b/tooling/generate-templates/policy/log.json
@@ -415,7 +415,7 @@
                         "resources": [
                           {
                             "type": "Microsoft.Insights/scheduledQueryRules",
-                            "apiVersion": "2022-08-01-preview",
+                            "apiVersion": "2022-06-15",
                             "name": "[[concat(subscription().displayName, '-##ALERT_NAME##')]",
                             "location": "[[parameters('alertResourceGroupLocation')]",
                             "identity": {

diff --git a/tooling/generate-templates/templates/arm/log.json b/tooling/generate-templates/templates/arm/log.json
@@ -2,6 +2,13 @@
   "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
   "contentVersion": "1.0.0.0",
   "parameters": {
+    "location": {
+      "type": "string",
+      "defaultValue": "[resourceGroup().location]",
+      "metadata": {
+        "description": "Location for the alert."
+      }
+    },
     "alertName": {
       "type": "string",
       "minLength": 1,
@@ -37,22 +44,28 @@
         "description": "Full Resource ID of the resource emitting the metric that will be used for the comparison. For example /subscriptions/00000000-0000-0000-0000-0000-00000000/resourceGroups/ResourceGroupName/providers/Microsoft.compute/virtualMachines/VM_xyz"
       }
     },
+    /* Removing muteActionsDuration and defaulting autoMitigate to true
     "muteActionsDuration": {
       "type": "string",
       "allowedValues": [
-        "PT1M",
         "PT5M",
+        "PT10M",
         "PT15M",
         "PT30M",
+        "PT45M",
         "PT1H",
+        "PT2H",
+        "PT3H",
+        "PT4H",
+        "PT5H",
         "PT6H",
-        "PT12H",
-        "PT24H"
+        "P1D",
+        "P2D"
       ],
       "metadata": {
         "description": "Mute actions for the chosen period of time (in ISO 8601 duration format) after the alert is fired."
       }
-    },
+    }, */
     "alertSeverity": {
       "type": "int",
       "defaultValue": ##SEVERITY##,
@@ -69,7 +82,7 @@
     },
     "autoMitigate": {
       "type": "bool",
-      "defaultValue": ##AUTO_MITIGATE##,
+      "defaultValue": true,
       "metadata": {
         "description": "Specifies whether the alert will automatically resolve"
       }
@@ -215,9 +228,9 @@
   "resources": [
     {
       "type": "Microsoft.Insights/scheduledQueryRules",
-      "apiVersion": "2021-08-01",
+      "apiVersion": "2022-06-15",
       "name": "[parameters('alertName')]",
-      "location": "[resourceGroup().location]",
+      "location": "[parameters('location')]",
       "tags": {
         "_deployed_by_amba": true
       },
@@ -247,7 +260,7 @@
             }
           ]
         },
-        "muteActionsDuration": "[parameters('muteActionsDuration')]",
+        //"muteActionsDuration": "[parameters('muteActionsDuration')]",
         "autoMitigate": "[parameters('autoMitigate')]",
         "checkWorkspaceAlertsStorageConfigured": "[parameters('checkWorkspaceAlertsStorageConfigured')]"
       }

diff --git a/tooling/generate-templates/templates/bicep/log.bicep b/tooling/generate-templates/templates/bicep/log.bicep
@@ -1,3 +1,7 @@
+@description('Location for the alert.')
+@minLength(1)
+param location string = resourceGroup().location
+
 @description('Name of the alert')
 @minLength(1)
 param alertName string
@@ -15,6 +19,7 @@ param checkWorkspaceAlertsStorageConfigured bool = false
 @minLength(1)
 param resourceId string
 
+/* Removing muteActionsDuration and defaulting autoMitigate to true
 @description('Mute actions for the chosen period of time (in ISO 8601 duration format) after the alert is fired.')
 @allowed([
   'PT1M'
@@ -26,7 +31,7 @@ param resourceId string
   'PT12H'
   'PT24H'
 ])
-param muteActionsDuration string
+param muteActionsDuration string */
 
 @description('Severity of alert {0,1,2,3,4}')
 @allowed([
@@ -39,7 +44,7 @@ param muteActionsDuration string
 param alertSeverity int = ##SEVERITY##
 
 @description('Specifies whether the alert will automatically resolve')
-param autoMitigate bool = ##AUTO_MITIGATE##
+param autoMitigate bool = true
 
 @description('Name of the metric used in the comparison to activate the alert.')
 @minLength(1)
@@ -127,9 +132,9 @@ param currentDateTimeUtcNow string = utcNow()
 ])
 param telemetryOptOut string = 'No'
 
-resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
+resource alert 'Microsoft.Insights/scheduledQueryRules@2022-06-15' = {
   name: alertName
-  location: resourceGroup().location
+  location: location
   tags: {
     _deployed_by_amba: 'true'
   }
@@ -159,7 +164,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
         }
       ]
     }
-    muteActionsDuration: muteActionsDuration
+    //muteActionsDuration: muteActionsDuration
     autoMitigate: autoMitigate
     checkWorkspaceAlertsStorageConfigured: checkWorkspaceAlertsStorageConfigured
   }