Update policy definitions and parameters; add ALZAlertSeverity and AL…

…ZProcessingRuleNameSuffix and increment versions
Azure · Dec 11, 2024 · 0f8cff1 · 0f8cff1
1 parent 1ec2f1f
commit 0f8cff1
Show file tree

Hide file tree

Showing 17 changed files with 134 additions and 83 deletions.
diff --git a/patterns/alz/alzArm.param.json b/patterns/alz/alzArm.param.json
@@ -120,6 +120,18 @@
     "ALZFunctionTriggerUrl": {
       "value": ""
     },
+    "ALZProcessingRuleNameSuffix": {
+      "value": "-001"
+    },
+    "ALZAlertSeverity": {
+      "value": [
+        "Sev0",
+        "Sev1",
+        "Sev2",
+        "Sev3",
+        "Sev4"
+      ]
+    },
     "BYOActionGroup": {
       "value": []
     },

diff --git a/patterns/alz/eslzArm.terraform-sync.param.json b/patterns/alz/eslzArm.terraform-sync.param.json
@@ -120,6 +120,18 @@
     "ALZFunctionTriggerUrl": {
       "value": ""
     },
+    "ALZProcessingRuleNameSuffix": {
+      "value": "-001"
+    },
+    "ALZAlertSeverity": {
+      "value": [
+        "Sev0",
+        "Sev1",
+        "Sev2",
+        "Sev3",
+        "Sev4"
+      ]
+    },
     "BYOActionGroup": {
       "value": []
     },

diff --git a/patterns/alz/policyDefinitions/policies-Automation.json b/patterns/alz/policyDefinitions/policies-Automation.json
@@ -219,4 +219,4 @@
       }
     }
   }
-}
+}
diff --git a/patterns/alz/policyDefinitions/policies-Compute.json b/patterns/alz/policyDefinitions/policies-Compute.json
diff --git a/patterns/alz/policyDefinitions/policies-Hybrid.json b/patterns/alz/policyDefinitions/policies-Hybrid.json
@@ -2824,4 +2824,4 @@
       }
     }
   }
-}
+}
diff --git a/patterns/alz/policyDefinitions/policies-KeyManagement.json b/patterns/alz/policyDefinitions/policies-KeyManagement.json
@@ -1816,4 +1816,4 @@
       }
     }
   }
-}
+}
diff --git a/patterns/alz/policyDefinitions/policies-Monitoring.json b/patterns/alz/policyDefinitions/policies-Monitoring.json
@@ -223,4 +223,4 @@
       }
     }
   }
-}
+}
diff --git a/patterns/alz/policyDefinitions/policies-Network.json b/patterns/alz/policyDefinitions/policies-Network.json
diff --git a/patterns/alz/policyDefinitions/policies-NotificationAssets.json b/patterns/alz/policyDefinitions/policies-NotificationAssets.json
diff --git a/patterns/alz/policyDefinitions/policies-RecoveryServices.json b/patterns/alz/policyDefinitions/policies-RecoveryServices.json
@@ -324,4 +324,4 @@
       }
     }
   }
-}
+}
diff --git a/patterns/alz/policyDefinitions/policies-ServiceHealth.json b/patterns/alz/policyDefinitions/policies-ServiceHealth.json
@@ -695,4 +695,4 @@
       }
     }
   }
-}
+}
diff --git a/patterns/alz/policyDefinitions/policies-Storage.json b/patterns/alz/policyDefinitions/policies-Storage.json
@@ -447,4 +447,4 @@
       }
     }
   }
-}
+}
diff --git a/patterns/alz/policyDefinitions/policies-Web.json b/patterns/alz/policyDefinitions/policies-Web.json
diff --git a/patterns/alz/policyDefinitions/policySets.json b/patterns/alz/policyDefinitions/policySets.json
@@ -6359,4 +6359,4 @@
       }
     }
   }
-}
+}
diff --git a/patterns/alz/policySetDefinitions/Deploy-Notification-Assets.json b/patterns/alz/policySetDefinitions/Deploy-Notification-Assets.json
@@ -6,7 +6,7 @@
     "displayName": "Deploy Azure Monitor Baseline Alerts - Notification Assets",
     "description": "This initiative deploys Notification Assets for Azure Monitor Baseline Alerts. This includes the setup of an Alert Processing Rule and an Action Group to manage notifications and actions, along with a Notification Suppression Rule to manage alert notifications, as well as a Notification Suppression Rule to control alert notifications.",
     "metadata": {
-      "version": "1.3.1",
+      "version": "1.4.1",
       "category": "Monitoring",
       "source": "https://github.com/Azure/azure-monitor-baseline-alerts/",
       "alzCloudEnvironments": [
@@ -126,6 +126,14 @@
         },
         "defaultValue": ""
       },
+      "ALZProcessingRuleNameSuffix": {
+        "type": "String",
+        "metadata": {
+          "displayName": "Alert Processing Rule Name Suffix",
+          "description": "Name of the Alert Processing Rule  and actionGroup suffix"
+        },
+        "defaultValue": "-001"
+      },
       "ALZAlertSeverity": {
         "type": "Array",
         "metadata": {
@@ -195,6 +203,9 @@
           "ALZFunctionTriggerUrl": {
             "value": "[[parameters('ALZFunctionTriggerUrl')]"
           },
+          "ALZProcessingRuleNameSuffix": {
+            "value": "[[parameters('ALZProcessingRuleNameSuffix')]"
+          },
           "ALZAlertSeverity": {
             "value": "[[parameters('ALZAlertSeverity')]"
           },

diff --git a/services/AlertsManagement/actionRules/Deploy-AlertProcessingRule-Deploy.json b/services/AlertsManagement/actionRules/Deploy-AlertProcessingRule-Deploy.json
@@ -35,14 +35,6 @@
           "_deployed_by_amba": true
         }
       },
-      "ALZProcessingRuleNameSuffix": {
-        "type": "String",
-        "metadata": {
-          "displayName": "Alert Processing Rule Name Suffix",
-          "description": "Name of the Alert Processing Rule  and actionGroup suffix"
-        },
-        "defaultValue": "-001"
-      },
       "ALZMonitorResourceGroupLocation": {
         "type": "String",
         "metadata": {
@@ -115,21 +107,13 @@
         },
         "defaultValue": ""
       },
-      "BYOActionGroup": {
-        "type": "array",
-        "metadata": {
-          "displayName": "Customer defined Action Group Resource IDs",
-          "description": "The Resource IDs of existing Action Groups currently deployed in the environment."
-        },
-        "defaultValue": []
-      },
-      "BYOAlertProcessingRule": {
+      "ALZProcessingRuleNameSuffix": {
         "type": "String",
         "metadata": {
-          "displayName": "Customer defined Alert Processing Rule Resource ID",
-          "description": "The Resource ID of an existing Alert Processing Rule already deployed by the customer in his environment"
+          "displayName": "Alert Processing Rule Name Suffix",
+          "description": "Name of the Alert Processing Rule  and actionGroup suffix"
         },
-        "defaultValue": ""
+        "defaultValue": "-001"
       },
       "ALZAlertSeverity": {
         "type": "Array",
@@ -145,6 +129,22 @@
           "Sev4"
         ]
       },
+      "BYOActionGroup": {
+        "type": "array",
+        "metadata": {
+          "displayName": "Customer defined Action Group Resource IDs",
+          "description": "The Resource IDs of existing Action Groups currently deployed in the environment."
+        },
+        "defaultValue": []
+      },
+      "BYOAlertProcessingRule": {
+        "type": "String",
+        "metadata": {
+          "displayName": "Customer defined Alert Processing Rule Resource ID",
+          "description": "The Resource ID of an existing Alert Processing Rule already deployed by the customer in his environment"
+        },
+        "defaultValue": ""
+      },
       "MonitorDisableTagName": {
         "type": "String",
         "metadata": {
@@ -200,8 +200,6 @@
                 "field": "Microsoft.AlertsManagement/actionRules/description",
                 "equals": "[[concat('apr-AMBA-', subscription().displayName, parameters('ALZProcessingRuleNameSuffix'))]"
               }
-
-
             ]
           },
           "deployment": {
@@ -248,6 +246,9 @@
                   "ALZFunctionTriggerUrl": {
                     "type": "String"
                   },
+                  "ALZAlertProcessingRuleNameSuffix": {
+                    "type": "string"
+                  },
                   "ALZAlertSeverity": {
                     "type": "Array"
                   },
@@ -385,6 +386,9 @@
                           "ALZFunctionTriggerUrl": {
                             "type": "string"
                           },
+                          "ALZAlertProcessingRuleNameSuffix": {
+                            "type": "string"
+                          },
                           "ALZAlertSeverity": {
                             "type": "Array"
                           },
@@ -441,10 +445,6 @@
                                   "values": "[[parameters('ALZAlertSeverity')]"
                                 }
                               ],
-
-
-
-
                               "enabled": true,
                               "actions": [
                                 {
@@ -463,7 +463,6 @@
                         "ALZProcessingRuleNameSuffix": {
                           "value": "[[parameters('ALZProcessingRuleNameSuffix')]"
                         },
-
                         "ALZMonitorActionGroupEmail": {
                           "value": "[[parameters('ALZMonitorActionGroupEmail')]"
                         },
@@ -488,6 +487,9 @@
                         "ALZFunctionTriggerUrl": {
                           "value": "[[parameters('ALZFunctionTriggerUrl')]"
                         },
+                        "ALZAlertProcessingRuleNameSuffix":{
+                          "value": "[[parameters('ALZProcessingRuleNameSuffix')]"
+                        },
                         "ALZAlertSeverity": {
                           "value": "[[parameters('ALZAlertSeverity')]"
                         },
@@ -539,7 +541,10 @@
                 "ALZFunctionTriggerUrl": {
                   "value": "[[parameters('ALZFunctionTriggerUrl')]"
                 },
-               "ALZAlertSeverity": {
+                "ALZAlertProcessingRuleNameSuffix":{
+                  "value": "[[parameters('ALZProcessingRuleNameSuffix')]"
+                },
+                "ALZAlertSeverity": {
                   "value": "[[parameters('ALZAlertSeverity')]"
                 },
                 "BYOActionGroup": {

diff --git a/services/AlertsManagement/actionRules/Deploy-AlertProcessingRule-Suppression.json b/services/AlertsManagement/actionRules/Deploy-AlertProcessingRule-Suppression.json
@@ -146,7 +146,7 @@
                           {
                             "type": "Microsoft.AlertsManagement/actionRules",
                             "apiVersion": "2021-08-08",
-                            "name": "[[concat('apr-AMBA-',subscription().displayName, '-002')]",
+                            "name": "[[concat('apr-AMBA-',subscription().displayName, '-S001')]",
                             "location": "Global",
                             "dependsOn": [],
                             "tags": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -219,4 +219,4 @@ @@
           }
         }
       }
-    }
+    }