Merge pull request #192 from Brunoga-MS/main

Fixing compliance evaluation issues
Azure · May 13, 2024 · aad6bf2 · aad6bf2
2 parents aafd12f + 14277b3
commit aad6bf2
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 40 deletions.
diff --git a/patterns/alz/policyDefinitions/policies.json b/patterns/alz/policyDefinitions/policies.json
diff --git a/services/KeyVault/vaults/Deploy-KV-Requests-Alert.json b/services/KeyVault/vaults/Deploy-KV-Requests-Alert.json
@@ -8,7 +8,7 @@
     "displayName": "Deploy KeyVault Requests Alert",
     "description": "Policy to audit/deploy KeyVault Requests Alert",
     "metadata": {
-      "version": "1.1.0",
+      "version": "1.2.0",
       "category": "Key Vault",
       "source": "https://github.com/Azure/azure-monitor-baseline-alerts/",
       "alzCloudEnvironments": [
@@ -104,8 +104,8 @@
       "MonitorDisable": {
         "type": "String",
         "metadata": {
-          "displayName": "Effect",
-          "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled"
+          "displayName": "Monitoring disabled",
+          "description": "Tag name to disable monitoring. Set to true if monitoring should be disabled"
         },
         "defaultValue": "MonitorDisable"
       }
@@ -178,11 +178,11 @@
               },
               {
                 "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.minFailingPeriodsToAlert",
-                "equals": 2
+                "equals": 4
               },
               {
                 "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.numberOfEvaluationPeriods",
-                "equals": 2
+                "equals": 4
               }
             ]
           },

diff --git a/services/Network/applicationGateways/Deploy-AGW-ApplicationGatewayTotalTime-Alert.json b/services/Network/applicationGateways/Deploy-AGW-ApplicationGatewayTotalTime-Alert.json
@@ -8,7 +8,7 @@
     "displayName": "Deploy AGW ApplicationGatewayTotalTime Alert",
     "description": "Policy to audit/deploy Azure Application Gateway ApplicationGatewayTotalTime Alert",
     "metadata": {
-      "version": "1.1.0",
+      "version": "1.2.0",
       "Category": "Networking",
       "source": "https://github.com/Azure/azure-monitor-baseline-alerts/",
       "_deployed_by_amba": "True"
@@ -155,7 +155,7 @@
               },
               {
                 "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].timeAggregation",
-                "equals": "Total"
+                "equals": "Average"
               },
               {
                 "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.operator",
@@ -244,7 +244,7 @@
                               "minFailingPeriodsToAlert": 2,
                               "numberOfEvaluationPeriods": 2
                             },
-                            "timeAggregation": "Total",
+                            "timeAggregation": "Average",
                             "criterionType": "DynamicThresholdCriterion"
                           }
                         ],

diff --git a/services/Network/applicationGateways/Deploy-AGW-BackendLastByteResponseTime-Alert.json b/services/Network/applicationGateways/Deploy-AGW-BackendLastByteResponseTime-Alert.json
@@ -8,7 +8,7 @@
     "displayName": "Deploy AGW BackendLastByteResponseTime Alert",
     "description": "Policy to audit/deploy Azure Application Gateway BackendLastByteResponseTime Alert",
     "metadata": {
-      "version": "1.1.0",
+      "version": "1.2.0",
       "Category": "Networking",
       "source": "https://github.com/Azure/azure-monitor-baseline-alerts/",
       "_deployed_by_amba": "True"
@@ -155,7 +155,7 @@
               },
               {
                 "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].timeAggregation",
-                "equals": "Total"
+                "equals": "Average"
               },
               {
                 "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.operator",
@@ -244,7 +244,7 @@
                               "minFailingPeriodsToAlert": 2,
                               "numberOfEvaluationPeriods": 2
                             },
-                            "timeAggregation": "Total",
+                            "timeAggregation": "Average",
                             "criterionType": "DynamicThresholdCriterion"
                           }
                         ],

diff --git a/services/Network/virtualNetworkGateways/Deploy-VNETG-EgressPacketDropCount-Alert.json b/services/Network/virtualNetworkGateways/Deploy-VNETG-EgressPacketDropCount-Alert.json
@@ -8,7 +8,7 @@
     "displayName": "Deploy VNetG Egress Packet Drop Count Alert",
     "description": "Policy to audit/deploy Vnet Gateway Egress Packet Drop Count Alert",
     "metadata": {
-      "version": "1.1.0",
+      "version": "1.2.0",
       "category": "Network",
       "source": "https://github.com/Azure/azure-monitor-baseline-alerts/",
       "alzCloudEnvironments": [
@@ -104,8 +104,8 @@
       "MonitorDisable": {
         "type": "String",
         "metadata": {
-          "displayName": "Effect",
-          "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled"
+          "displayName": "Monitoring disabled",
+          "description": "Tag name to disable monitoring. Set to true if monitoring should be disabled"
         },
         "defaultValue": "MonitorDisable"
       }
@@ -182,11 +182,11 @@
               },
               {
                 "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.minFailingPeriodsToAlert",
-                "equals": 2
+                "equals": 4
               },
               {
                 "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.numberOfEvaluationPeriods",
-                "equals": 2
+                "equals": 4
               }
             ]
           },

diff --git a/services/Network/virtualNetworkGateways/Deploy-VNETG-EgressPacketDropMismatch-Alert.json b/services/Network/virtualNetworkGateways/Deploy-VNETG-EgressPacketDropMismatch-Alert.json
@@ -8,7 +8,7 @@
     "displayName": "Deploy VNetG Egress Packet Drop Mismatch Alert",
     "description": "Policy to audit/deploy Vnet Gateway Egress Packet Drop Mismatch Alert",
     "metadata": {
-      "version": "1.1.0",
+      "version": "1.2.0",
       "category": "Network",
       "source": "https://github.com/Azure/azure-monitor-baseline-alerts/",
       "alzCloudEnvironments": [
@@ -104,8 +104,8 @@
       "MonitorDisable": {
         "type": "String",
         "metadata": {
-          "displayName": "Effect",
-          "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled"
+          "displayName": "Monitoring disabled",
+          "description": "Tag name to disable monitoring. Set to true if monitoring should be disabled"
         },
         "defaultValue": "MonitorDisable"
       }
@@ -182,11 +182,11 @@
               },
               {
                 "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.minFailingPeriodsToAlert",
-                "equals": 2
+                "equals": 4
               },
               {
                 "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.numberOfEvaluationPeriods",
-                "equals": 2
+                "equals": 4
               }
             ]
           },

diff --git a/services/Network/virtualNetworkGateways/Deploy-VNETG-IngressPacketDropCount-Alert.json b/services/Network/virtualNetworkGateways/Deploy-VNETG-IngressPacketDropCount-Alert.json
@@ -8,7 +8,7 @@
     "displayName": "Deploy VNetG Ingress Packet Drop Count Alert",
     "description": "Policy to audit/deploy Vnet Gateway Ingress Packet Drop Count Alert",
     "metadata": {
-      "version": "1.1.0",
+      "version": "1.2.0",
       "category": "Network",
       "source": "https://github.com/Azure/azure-monitor-baseline-alerts/",
       "alzCloudEnvironments": [
@@ -104,8 +104,8 @@
       "MonitorDisable": {
         "type": "String",
         "metadata": {
-          "displayName": "Effect",
-          "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled"
+          "displayName": "Monitoring disabled",
+          "description": "Tag name to disable monitoring. Set to true if monitoring should be disabled"
         },
         "defaultValue": "MonitorDisable"
       }
@@ -182,11 +182,11 @@
               },
               {
                 "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.minFailingPeriodsToAlert",
-                "equals": 2
+                "equals": 4
               },
               {
                 "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.numberOfEvaluationPeriods",
-                "equals": 2
+                "equals": 4
               }
             ]
           },

diff --git a/services/Network/virtualNetworkGateways/Deploy-VNETG-IngressPacketDropMismatch-Alert.json b/services/Network/virtualNetworkGateways/Deploy-VNETG-IngressPacketDropMismatch-Alert.json
@@ -8,7 +8,7 @@
     "displayName": "Deploy VNetG Ingress Packet Drop Mismatch Alert",
     "description": "Policy to audit/deploy Vnet Gateway Ingress Packet Drop Mismatch Alert",
     "metadata": {
-      "version": "1.1.0",
+      "version": "1.2.0",
       "category": "Network",
       "source": "https://github.com/Azure/azure-monitor-baseline-alerts/",
       "alzCloudEnvironments": [
@@ -104,8 +104,8 @@
       "MonitorDisable": {
         "type": "String",
         "metadata": {
-          "displayName": "Effect",
-          "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled"
+          "displayName": "Monitoring disabled",
+          "description": "Tag name to disable monitoring. Set to true if monitoring should be disabled"
         },
         "defaultValue": "MonitorDisable"
       }
@@ -182,11 +182,11 @@
               },
               {
                 "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.minFailingPeriodsToAlert",
-                "equals": 2
+                "equals": 4
               },
               {
                 "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.numberOfEvaluationPeriods",
-                "equals": 2
+                "equals": 4
               }
             ]
           },