diff --git a/docs/content/patterns/specialized/avs/_index.md b/docs/content/patterns/specialized/avs/_index.md index 565f19b79..a8cdfb6a5 100644 --- a/docs/content/patterns/specialized/avs/_index.md +++ b/docs/content/patterns/specialized/avs/_index.md @@ -7,7 +7,7 @@ geekdocCollapseSection: true It is crucial to monitor the resource utilization in order to take timely action. This solution helps in setting up Azure Monitor alerts for Azure VMware Solution Private Cloud. Action owners will receive email notifications if utilization metrics exceeds set threshold. -**Current Version:** +**Current Version:** v1.0.0 (Mar 4, 2024) ## Alerts Table @@ -17,7 +17,9 @@ Table below shows the Alerts configured after the deployment. | Name | Threshold(s) (Severity) | Signal Type | Frequency | # Alert Rules | |-----------------------------------|-------------------------|--------------------|-----------------|---------------| | CPU Usage per Cluster | 80 (2) | EffectiveCpuAverage| Every 5 minutes | 1 | +| CPU Usage per Cluster (Critical) | 95 (0) | EffectiveCpuAverage| Every 5 minutes | 1 | | Memory Usage per Cluster | 80 (2) | UsageAverage | Every 5 minutes | 1 | +| Memory Usage per Cluster (Critical) | 95 (0) | UsageAverage | Every 5 minutes | 1 | | Storage Usage per Datastore | 70 (2) | DiskUsedPercentage | Every 5 minutes | 1 | | Storage Usage per Datastore (Critical) | 75 (0) | DiskUsedPercentage | Every 5 minutes | 1 | | Service Health Alerts | N/A | ServiceHealth | N/A | 1 | diff --git a/services/Automation/automationAccounts/Deploy-AA-TotalJob-Alert.json b/services/Automation/automationAccounts/Deploy-AA-TotalJob-Alert.json index e35780e0f..482106042 100644 --- a/services/Automation/automationAccounts/Deploy-AA-TotalJob-Alert.json +++ b/services/Automation/automationAccounts/Deploy-AA-TotalJob-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy Automation Account TotalJob Alert", "description": "Policy to audit/deploy Automation Account TotalJob Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Automation", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -155,6 +155,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Cdn/profiles/Deploy-CDNP-OriginHealthPercentage-Alert.json b/services/Cdn/profiles/Deploy-CDNP-OriginHealthPercentage-Alert.json index 7c4820b51..0a93ef521 100644 --- a/services/Cdn/profiles/Deploy-CDNP-OriginHealthPercentage-Alert.json +++ b/services/Cdn/profiles/Deploy-CDNP-OriginHealthPercentage-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy Frontdoor CDN Profile Origin Health Percentage Alert", "description": "Policy to audit/deploy FrontDoor Origin Health Percentage Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "Category": "Networking", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "_deployed_by_amba": "True" @@ -131,6 +131,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "LessThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Cdn/profiles/Deploy-CDNP-OriginLatency-Alert.json b/services/Cdn/profiles/Deploy-CDNP-OriginLatency-Alert.json index 0586091a7..55efdc96b 100644 --- a/services/Cdn/profiles/Deploy-CDNP-OriginLatency-Alert.json +++ b/services/Cdn/profiles/Deploy-CDNP-OriginLatency-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy Frontdoor CDN Profile Origin Latency Alert", "description": "Policy to audit/deploy Frontdoor CDN Profile Origin Latency Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Networking", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -147,6 +147,42 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.alertSensitivity", + "equals": "Medium" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.minFailingPeriodsToAlert", + "equals": 2 + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.numberOfEvaluationPeriods", + "equals": 2 } ] }, diff --git a/services/Cdn/profiles/Deploy-CDNP-Percentage4XX-Alert.json b/services/Cdn/profiles/Deploy-CDNP-Percentage4XX-Alert.json index 856897330..18eff7671 100644 --- a/services/Cdn/profiles/Deploy-CDNP-Percentage4XX-Alert.json +++ b/services/Cdn/profiles/Deploy-CDNP-Percentage4XX-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy Frontdoor CDN Profile Percentage4XX Alert", "description": "Policy to audit/deploy Frontdoor CDN Profile Percentage4XX Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Networking", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -147,6 +147,42 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.alertSensitivity", + "equals": "Medium" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.minFailingPeriodsToAlert", + "equals": 2 + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.numberOfEvaluationPeriods", + "equals": 2 } ] }, diff --git a/services/Cdn/profiles/Deploy-CDNP-Percentage5XX-Alert.json b/services/Cdn/profiles/Deploy-CDNP-Percentage5XX-Alert.json index 8eda78734..5341f8474 100644 --- a/services/Cdn/profiles/Deploy-CDNP-Percentage5XX-Alert.json +++ b/services/Cdn/profiles/Deploy-CDNP-Percentage5XX-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy Frontdoor CDN Profile Percentage5XX Alert", "description": "Policy to audit/deploy Frontdoor CDN Profile Percentage5XX Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Networking", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -147,6 +147,42 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.alertSensitivity", + "equals": "Medium" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.minFailingPeriodsToAlert", + "equals": 2 + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.numberOfEvaluationPeriods", + "equals": 2 } ] }, diff --git a/services/Compute/virtualMachines/Deploy-VM-AvailableMemory-Alert.json b/services/Compute/virtualMachines/Deploy-VM-AvailableMemory-Alert.json index 38531c391..7daf79a92 100644 --- a/services/Compute/virtualMachines/Deploy-VM-AvailableMemory-Alert.json +++ b/services/Compute/virtualMachines/Deploy-VM-AvailableMemory-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy VM Available Memory Alert", "description": "Policy to audit/deploy VM Available Memory Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Compute", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -155,6 +155,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].operator", + "equals": "LessThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Compute/virtualMachines/Deploy-VM-DataDiskReadLatency-Alert.json b/services/Compute/virtualMachines/Deploy-VM-DataDiskReadLatency-Alert.json index 7e07eb7d1..51cd3119b 100644 --- a/services/Compute/virtualMachines/Deploy-VM-DataDiskReadLatency-Alert.json +++ b/services/Compute/virtualMachines/Deploy-VM-DataDiskReadLatency-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy VM Data Disk Read Latency Alert", "description": "Policy to audit/deploy VM dataDiskReadLatency Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Compute", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -250,6 +250,46 @@ { "field": "Microsoft.Insights/scheduledqueryrules/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].threshold", + "equals": "[[parameters('threshold')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].operator", + "equals": "[[parameters('operator')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].timeAggregation", + "equals": "[[parameters('timeAggregation')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.numberOfEvaluationPeriods", + "equals": "[[parameters('evaluationPeriods')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.minFailingPeriodsToAlert", + "equals": "[[parameters('failingPeriods')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].query", + "equals": "InsightsMetrics| where Origin == \"vm.azm.ms\"| where Namespace == \"LogicalDisk\" and Name == \"ReadLatencyMs\"| extend Disk=tostring(todynamic(Tags)[\"vm.azm.ms/mountId\"])|where Disk !in ('C:','/')| summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, Disk" } ] }, diff --git a/services/Compute/virtualMachines/Deploy-VM-DataDiskSpace-Alert.json b/services/Compute/virtualMachines/Deploy-VM-DataDiskSpace-Alert.json index 3dde68637..c1b60edd8 100644 --- a/services/Compute/virtualMachines/Deploy-VM-DataDiskSpace-Alert.json +++ b/services/Compute/virtualMachines/Deploy-VM-DataDiskSpace-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy VM Data Disk Space Alert", "description": "Policy to audit/deploy VM data Disk Space Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Compute", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -240,6 +240,46 @@ { "field": "Microsoft.Insights/scheduledqueryrules/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].threshold", + "equals": "[[parameters('threshold')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].operator", + "equals": "[[parameters('operator')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].timeAggregation", + "equals": "[[parameters('timeAggregation')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.numberOfEvaluationPeriods", + "equals": "[[parameters('evaluationPeriods')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.minFailingPeriodsToAlert", + "equals": "[[parameters('failingPeriods')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].query", + "equals": "InsightsMetrics| where Origin == \"vm.azm.ms\"| where Namespace == \"LogicalDisk\" and Name == \"FreeSpacePercentage\"| extend Disk=tostring(todynamic(Tags)[\"vm.azm.ms/mountId\"])|where Disk !in ('C:','/')| summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, Disk" } ] }, diff --git a/services/Compute/virtualMachines/Deploy-VM-DataDiskWriteLatency-Alert.json b/services/Compute/virtualMachines/Deploy-VM-DataDiskWriteLatency-Alert.json index 418e91397..4ac4bc84f 100644 --- a/services/Compute/virtualMachines/Deploy-VM-DataDiskWriteLatency-Alert.json +++ b/services/Compute/virtualMachines/Deploy-VM-DataDiskWriteLatency-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy VM Data Disk Write Latency Alert", "description": "Policy to audit/deploy VM dataDiskWriteLatency Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Compute", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -250,6 +250,46 @@ { "field": "Microsoft.Insights/scheduledqueryrules/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].threshold", + "equals": "[[parameters('threshold')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].operator", + "equals": "[[parameters('operator')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].timeAggregation", + "equals": "[[parameters('timeAggregation')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.numberOfEvaluationPeriods", + "equals": "[[parameters('evaluationPeriods')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.minFailingPeriodsToAlert", + "equals": "[[parameters('failingPeriods')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].query", + "equals": "InsightsMetrics| where Origin == \"vm.azm.ms\"| where Namespace == \"LogicalDisk\" and Name == \"WriteLatencyMs\"| extend Disk=tostring(todynamic(Tags)[\"vm.azm.ms/mountId\"])|where Disk !in ('C:','/')| summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, Disk" } ] }, diff --git a/services/Compute/virtualMachines/Deploy-VM-HeartBeat-Alert.json b/services/Compute/virtualMachines/Deploy-VM-HeartBeat-Alert.json index 35e36c6e9..270d4f3bf 100644 --- a/services/Compute/virtualMachines/Deploy-VM-HeartBeat-Alert.json +++ b/services/Compute/virtualMachines/Deploy-VM-HeartBeat-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy VM HeartBeat Alert", "description": "Policy to audit/deploy VM HeartBeat Alert for all VMs in the subscription", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Compute", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -230,6 +230,46 @@ { "field": "Microsoft.Insights/scheduledqueryrules/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].threshold", + "equals": "[[parameters('threshold')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].operator", + "equals": "[[parameters('operator')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].timeAggregation", + "equals": "[[parameters('timeAggregation')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.numberOfEvaluationPeriods", + "equals": "[[parameters('evaluationPeriods')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.minFailingPeriodsToAlert", + "equals": "[[parameters('failingPeriods')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].query", + "equals": "Heartbeat| summarize TimeGenerated=max(TimeGenerated) by Computer, _ResourceId| extend Duration = datetime_diff('minute',now(),TimeGenerated)| summarize AggregatedValue = min(Duration) by Computer, bin(TimeGenerated,5m), _ResourceId" } ] }, diff --git a/services/Compute/virtualMachines/Deploy-VM-HeartBeatAlertRG.json b/services/Compute/virtualMachines/Deploy-VM-HeartBeatAlertRG.json index 042e7524d..35286cadf 100644 --- a/services/Compute/virtualMachines/Deploy-VM-HeartBeatAlertRG.json +++ b/services/Compute/virtualMachines/Deploy-VM-HeartBeatAlertRG.json @@ -8,7 +8,7 @@ "displayName": "Deploy VM HeartBeat Alert", "description": "Policy to audit/deploy VM HeartBeat Alert for VMs in the resource group", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Compute", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -197,6 +197,46 @@ { "field": "Microsoft.Insights/scheduledqueryrules/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].threshold", + "equals": "[[parameters('threshold')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].operator", + "equals": "[[parameters('operator')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].timeAggregation", + "equals": "[[parameters('timeAggregation')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.numberOfEvaluationPeriods", + "equals": "1" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.minFailingPeriodsToAlert", + "equals": "1" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].query", + "equals": "Heartbeat| summarize TimeGenerated=max(TimeGenerated) by Computer, _ResourceId| extend Duration = datetime_diff('minute',now(),TimeGenerated)| summarize AggregatedValue = min(Duration) by Computer, bin(TimeGenerated,5m), _ResourceId" } ] }, diff --git a/services/Compute/virtualMachines/Deploy-VM-NetworkIn-Alert.json b/services/Compute/virtualMachines/Deploy-VM-NetworkIn-Alert.json index e7d4d2938..3a0b1a807 100644 --- a/services/Compute/virtualMachines/Deploy-VM-NetworkIn-Alert.json +++ b/services/Compute/virtualMachines/Deploy-VM-NetworkIn-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy VM Network Read Alert", "description": "Policy to audit/deploy VM Nework Read Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Compute", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -250,6 +250,46 @@ { "field": "Microsoft.Insights/scheduledqueryrules/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].threshold", + "equals": "[[parameters('threshold')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].operator", + "equals": "[[parameters('operator')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].timeAggregation", + "equals": "[[parameters('timeAggregation')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.numberOfEvaluationPeriods", + "equals": "[[parameters('evaluationPeriods')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.minFailingPeriodsToAlert", + "equals": "[[parameters('failingPeriods')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].query", + "equals": "InsightsMetrics| where Origin == \"vm.azm.ms\"| where Namespace == \"Network\" and Name == \"ReadBytesPerSecond\"| extend NetworkInterface=tostring(todynamic(Tags)[\"vm.azm.ms/networkDeviceId\"])|summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, NetworkInterface" } ] }, diff --git a/services/Compute/virtualMachines/Deploy-VM-NetworkOut-Alert.json b/services/Compute/virtualMachines/Deploy-VM-NetworkOut-Alert.json index 67cc0299b..48685b18f 100644 --- a/services/Compute/virtualMachines/Deploy-VM-NetworkOut-Alert.json +++ b/services/Compute/virtualMachines/Deploy-VM-NetworkOut-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy VM Network Write Alert", "description": "Policy to audit/deploy VM Network Out Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Compute", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -250,6 +250,46 @@ { "field": "Microsoft.Insights/scheduledqueryrules/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].threshold", + "equals": "[[parameters('threshold')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].operator", + "equals": "[[parameters('operator')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].timeAggregation", + "equals": "[[parameters('timeAggregation')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.numberOfEvaluationPeriods", + "equals": "[[parameters('evaluationPeriods')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.minFailingPeriodsToAlert", + "equals": "[[parameters('failingPeriods')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].query", + "equals": "InsightsMetrics| where Origin == \"vm.azm.ms\"| where Namespace == \"Network\" and Name == \"WriteBytesPerSecond\"| extend NetworkInterface=tostring(todynamic(Tags)[\"vm.azm.ms/networkDeviceId\"])|summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, NetworkInterface" } ] }, diff --git a/services/Compute/virtualMachines/Deploy-VM-OSDiskReadLatency-Alert.json b/services/Compute/virtualMachines/Deploy-VM-OSDiskReadLatency-Alert.json index 9c48a0533..8011ce319 100644 --- a/services/Compute/virtualMachines/Deploy-VM-OSDiskReadLatency-Alert.json +++ b/services/Compute/virtualMachines/Deploy-VM-OSDiskReadLatency-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy VM OS Disk Read Latency Alert", "description": "Policy to audit/deploy VM OSDiskreadLatency Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Compute", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -251,6 +251,46 @@ { "field": "Microsoft.Insights/scheduledqueryrules/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].threshold", + "equals": "[[parameters('threshold')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].operator", + "equals": "[[parameters('operator')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].timeAggregation", + "equals": "[[parameters('timeAggregation')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.numberOfEvaluationPeriods", + "equals": "[[parameters('evaluationPeriods')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.minFailingPeriodsToAlert", + "equals": "[[parameters('failingPeriods')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].query", + "equals": "InsightsMetrics| where Origin == \"vm.azm.ms\"| where Namespace == \"LogicalDisk\" and Name == \"ReadLatencyMs\"| extend Disk=tostring(todynamic(Tags)[\"vm.azm.ms/mountId\"])| summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, Disk" } ] }, diff --git a/services/Compute/virtualMachines/Deploy-VM-OSDiskSpace-Alert.json b/services/Compute/virtualMachines/Deploy-VM-OSDiskSpace-Alert.json index 3bac9b4ce..30dcb98bd 100644 --- a/services/Compute/virtualMachines/Deploy-VM-OSDiskSpace-Alert.json +++ b/services/Compute/virtualMachines/Deploy-VM-OSDiskSpace-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy VM OS Disk Space Alert", "description": "Policy to audit/deploy VM OSDiskSpace Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Compute", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -251,6 +251,46 @@ { "field": "Microsoft.Insights/scheduledqueryrules/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].threshold", + "equals": "[[parameters('threshold')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].operator", + "equals": "[[parameters('operator')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].timeAggregation", + "equals": "[[parameters('timeAggregation')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.numberOfEvaluationPeriods", + "equals": "[[parameters('evaluationPeriods')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.minFailingPeriodsToAlert", + "equals": "[[parameters('failingPeriods')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].query", + "equals": "InsightsMetrics| where Origin == \"vm.azm.ms\"| where Namespace == \"LogicalDisk\" and Name == \"FreeSpacePercentage\"| extend Disk=tostring(todynamic(Tags)[\"vm.azm.ms/mountId\"])| summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, Disk" } ] }, diff --git a/services/Compute/virtualMachines/Deploy-VM-OSDiskWriteLatency-Alert.json b/services/Compute/virtualMachines/Deploy-VM-OSDiskWriteLatency-Alert.json index 44efff461..7e57c2c31 100644 --- a/services/Compute/virtualMachines/Deploy-VM-OSDiskWriteLatency-Alert.json +++ b/services/Compute/virtualMachines/Deploy-VM-OSDiskWriteLatency-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy VM OS Disk Write Latency Alert", "description": "Policy to audit/deploy VM OSDiskwriteLatency Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Compute", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -251,6 +251,46 @@ { "field": "Microsoft.Insights/scheduledqueryrules/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].threshold", + "equals": "[[parameters('threshold')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].operator", + "equals": "[[parameters('operator')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].timeAggregation", + "equals": "[[parameters('timeAggregation')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.numberOfEvaluationPeriods", + "equals": "[[parameters('evaluationPeriods')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.minFailingPeriodsToAlert", + "equals": "[[parameters('failingPeriods')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].query", + "equals": "InsightsMetrics| where Origin == \"vm.azm.ms\"| where Namespace == \"LogicalDisk\" and Name == \"WriteLatencyMs\"| extend Disk=tostring(todynamic(Tags)[\"vm.azm.ms/mountId\"])| summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, Disk" } ] }, diff --git a/services/Compute/virtualMachines/Deploy-VM-PercentCPU-Alert.json b/services/Compute/virtualMachines/Deploy-VM-PercentCPU-Alert.json index c1b6aa34d..c6afe9e93 100644 --- a/services/Compute/virtualMachines/Deploy-VM-PercentCPU-Alert.json +++ b/services/Compute/virtualMachines/Deploy-VM-PercentCPU-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy VM CPU Alert", "description": "Policy to audit/deploy VM CPU Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Compute", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -222,6 +222,46 @@ { "field": "Microsoft.Insights/scheduledqueryrules/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].threshold", + "equals": "[[parameters('threshold')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].operator", + "equals": "[[parameters('operator')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].timeAggregation", + "equals": "[[parameters('timeAggregation')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.numberOfEvaluationPeriods", + "equals": "1" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.minFailingPeriodsToAlert", + "equals": "[[parameters('failingPeriods')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].query", + "equals": "InsightsMetrics| where Origin == \"vm.azm.ms\"| where Namespace == \"Processor\" and Name == \"UtilizationPercentage\"| summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId" } ] }, diff --git a/services/Compute/virtualMachines/Deploy-VM-PercentMemory-Alert.json b/services/Compute/virtualMachines/Deploy-VM-PercentMemory-Alert.json index 28c9ba154..64601d55b 100644 --- a/services/Compute/virtualMachines/Deploy-VM-PercentMemory-Alert.json +++ b/services/Compute/virtualMachines/Deploy-VM-PercentMemory-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy VM Memory Alert", "description": "Policy to audit/deploy VM Memory Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Compute", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -230,6 +230,46 @@ { "field": "Microsoft.Insights/scheduledqueryrules/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/scheduledqueryrules/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].threshold", + "equals": "[[parameters('threshold')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].operator", + "equals": "[[parameters('operator')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].timeAggregation", + "equals": "[[parameters('timeAggregation')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.numberOfEvaluationPeriods", + "equals": "[[parameters('evaluationPeriods')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.minFailingPeriodsToAlert", + "equals": "[[parameters('failingPeriods')]" + }, + { + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].query", + "equals": "InsightsMetrics| where Origin == \"vm.azm.ms\"|where Namespace == \"Memory\" and Name == \"AvailableMB\"| extend TotalMemory = toreal(todynamic(Tags)[\"vm.azm.ms/memorySizeMB\"]) | extend AvailableMemoryPercentage = (toreal(Val) / TotalMemory) * 100.0| summarize AggregatedValue = avg(AvailableMemoryPercentage) by bin(TimeGenerated, 15m), Computer, _ResourceId" } ] }, diff --git a/services/KeyVault/vaults/Deploy-KV-Availability-Alert.json b/services/KeyVault/vaults/Deploy-KV-Availability-Alert.json index b8e3d7171..f3878819c 100644 --- a/services/KeyVault/vaults/Deploy-KV-Availability-Alert.json +++ b/services/KeyVault/vaults/Deploy-KV-Availability-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy KeyVault Availability Alert", "description": "Policy to audit/deploy KeyVault Availability Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Key Vault", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -155,6 +155,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "LessThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/KeyVault/vaults/Deploy-KV-Capacity-Alert.json b/services/KeyVault/vaults/Deploy-KV-Capacity-Alert.json index 140ec928c..fc96986a0 100644 --- a/services/KeyVault/vaults/Deploy-KV-Capacity-Alert.json +++ b/services/KeyVault/vaults/Deploy-KV-Capacity-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy KeyVault Capacity Alert", "description": "Policy to audit/deploy KeyVault Capacity Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Key Vault", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -155,6 +155,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/KeyVault/vaults/Deploy-KV-Latency-Alert.json b/services/KeyVault/vaults/Deploy-KV-Latency-Alert.json index d12294c78..c55b2814e 100644 --- a/services/KeyVault/vaults/Deploy-KV-Latency-Alert.json +++ b/services/KeyVault/vaults/Deploy-KV-Latency-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy KeyVault Latency Alert", "description": "Policy to audit/deploy KeyVault Latency Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Key Vault", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -155,6 +155,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/KeyVault/vaults/Deploy-KV-Requests-Alert.json b/services/KeyVault/vaults/Deploy-KV-Requests-Alert.json index 581de5a27..b74c2cb09 100644 --- 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.0.1", + "version": "1.1.0", "category": "Key Vault", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -147,6 +147,42 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.alertSensitivity", + "equals": "Medium" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.minFailingPeriodsToAlert", + "equals": 2 + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.numberOfEvaluationPeriods", + "equals": 2 } ] }, diff --git a/services/Network/applicationGateways/Deploy-AGW-ApplicationGatewayTotalTime-Alert.json b/services/Network/applicationGateways/Deploy-AGW-ApplicationGatewayTotalTime-Alert.json index f813e4476..682fd0b65 100644 --- 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.0.1", + "version": "1.1.0", "Category": "Networking", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "_deployed_by_amba": "True" @@ -136,6 +136,42 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Total" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.alertSensitivity", + "equals": "Medium" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.minFailingPeriodsToAlert", + "equals": 2 + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.numberOfEvaluationPeriods", + "equals": 2 } ] }, diff --git a/services/Network/applicationGateways/Deploy-AGW-BackendLastByteResponseTime-Alert.json b/services/Network/applicationGateways/Deploy-AGW-BackendLastByteResponseTime-Alert.json index 01a3ae3c0..64a264473 100644 --- 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.0.1", + "version": "1.1.0", "Category": "Networking", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "_deployed_by_amba": "True" @@ -136,6 +136,42 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Total" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.alertSensitivity", + "equals": "Medium" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.minFailingPeriodsToAlert", + "equals": 2 + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.numberOfEvaluationPeriods", + "equals": 2 } ] }, diff --git a/services/Network/applicationGateways/Deploy-AGW-CPUUtil-Alert.json b/services/Network/applicationGateways/Deploy-AGW-CPUUtil-Alert.json index e9f4bea00..9c7aa0b79 100644 --- a/services/Network/applicationGateways/Deploy-AGW-CPUUtil-Alert.json +++ b/services/Network/applicationGateways/Deploy-AGW-CPUUtil-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy AGW CPU Utilization Alert", "description": "Policy to audit/deploy Azure Application Gateway CPU Utilization Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "Category": "Networking", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "_deployed_by_amba": "True" @@ -135,6 +135,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/applicationGateways/Deploy-AGW-CapacityUnits-Alert.json b/services/Network/applicationGateways/Deploy-AGW-CapacityUnits-Alert.json index e8c68021f..8d414affb 100644 --- a/services/Network/applicationGateways/Deploy-AGW-CapacityUnits-Alert.json +++ b/services/Network/applicationGateways/Deploy-AGW-CapacityUnits-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy AGW Capacity Units Alert", "description": "Policy to audit/deploy Azure Application Gateway CapacityUnits Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "Category": "Networking", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "_deployed_by_amba": "True" @@ -135,6 +135,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/applicationGateways/Deploy-AGW-ComputeUnits-Alert.json b/services/Network/applicationGateways/Deploy-AGW-ComputeUnits-Alert.json index 43b4deefc..44c947f41 100644 --- a/services/Network/applicationGateways/Deploy-AGW-ComputeUnits-Alert.json +++ b/services/Network/applicationGateways/Deploy-AGW-ComputeUnits-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy AGW Compute Units Alert", "description": "Policy to audit/deploy Azure Application Gateway ComputeUnits Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "Category": "Networking", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "_deployed_by_amba": "True" @@ -135,6 +135,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/applicationGateways/Deploy-AGW-FailedRequests-Alert.json b/services/Network/applicationGateways/Deploy-AGW-FailedRequests-Alert.json index 41b07f40f..f4dd6d22b 100644 --- a/services/Network/applicationGateways/Deploy-AGW-FailedRequests-Alert.json +++ b/services/Network/applicationGateways/Deploy-AGW-FailedRequests-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy AGW FailedRequests Alert", "description": "Policy to audit/deploy Azure Application Gateway FailedRequests Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "Category": "Networking", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "_deployed_by_amba": "True" @@ -123,6 +123,42 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Total" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.alertSensitivity", + "equals": "Medium" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.minFailingPeriodsToAlert", + "equals": 2 + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.numberOfEvaluationPeriods", + "equals": 2 } ] }, diff --git a/services/Network/applicationGateways/Deploy-AGW-ResponseStatus-Alert.json b/services/Network/applicationGateways/Deploy-AGW-ResponseStatus-Alert.json index b443e2005..ebb21f531 100644 --- a/services/Network/applicationGateways/Deploy-AGW-ResponseStatus-Alert.json +++ b/services/Network/applicationGateways/Deploy-AGW-ResponseStatus-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy AGW ResponseStatus Alert", "description": "Policy to audit/deploy Azure Application Gateway ResponseStatus Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "Category": "Networking", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "_deployed_by_amba": "True" @@ -132,6 +132,42 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Total" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.alertSensitivity", + "equals": "Medium" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.minFailingPeriodsToAlert", + "equals": 2 + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.numberOfEvaluationPeriods", + "equals": 2 } ] }, diff --git a/services/Network/applicationGateways/Deploy-AGW-UnhealthyHostCount-Alert.json b/services/Network/applicationGateways/Deploy-AGW-UnhealthyHostCount-Alert.json index 0610a57e6..ff5aa99b8 100644 --- a/services/Network/applicationGateways/Deploy-AGW-UnhealthyHostCount-Alert.json +++ b/services/Network/applicationGateways/Deploy-AGW-UnhealthyHostCount-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy AGW Unhealthy Host Count Alert", "description": "Policy to audit/deploy Azure Application Gateway Unhealthy Host Count Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "Category": "Networking", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "_deployed_by_amba": "True" @@ -131,6 +131,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/azureFirewalls/Deploy-AFW-FirewallHealth-Alert.json b/services/Network/azureFirewalls/Deploy-AFW-FirewallHealth-Alert.json index c914d16b0..335f92f66 100644 --- a/services/Network/azureFirewalls/Deploy-AFW-FirewallHealth-Alert.json +++ b/services/Network/azureFirewalls/Deploy-AFW-FirewallHealth-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy AFW FirewallHealth Alert", "description": "Policy to audit/deploy Azure Firewall FirewallHealth Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -155,6 +155,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "LessThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/azureFirewalls/Deploy-AFW-SNATPortUtilization-Alert.json b/services/Network/azureFirewalls/Deploy-AFW-SNATPortUtilization-Alert.json index b3384e16d..cfedc6b91 100644 --- a/services/Network/azureFirewalls/Deploy-AFW-SNATPortUtilization-Alert.json +++ b/services/Network/azureFirewalls/Deploy-AFW-SNATPortUtilization-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy AFW SNATPortUtilization Alert", "description": "Policy to audit/deploy Azure Firewall SNATPortUtilization Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -155,6 +155,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/expressRouteCircuits/Deploy-ERCIR-ARPAvailability-Alert.json b/services/Network/expressRouteCircuits/Deploy-ERCIR-ARPAvailability-Alert.json index eb943d18d..1c91070a4 100644 --- a/services/Network/expressRouteCircuits/Deploy-ERCIR-ARPAvailability-Alert.json +++ b/services/Network/expressRouteCircuits/Deploy-ERCIR-ARPAvailability-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy ExpressRoute Circuits Arp Availability Alert", "description": "Policy to audit/deploy ExpressRoute Circuits Arp Availability Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -155,6 +155,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "LessThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/expressRouteCircuits/Deploy-ERCIR-BGPAvailability-Alert.json b/services/Network/expressRouteCircuits/Deploy-ERCIR-BGPAvailability-Alert.json index 42a99d008..5af9833d7 100644 --- a/services/Network/expressRouteCircuits/Deploy-ERCIR-BGPAvailability-Alert.json +++ b/services/Network/expressRouteCircuits/Deploy-ERCIR-BGPAvailability-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy ExpressRoute Circuits Bgp Availability Alert", "description": "Policy to audit/deploy ExpressRoute Circuits Bgp Availability Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -155,6 +155,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "LessThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/expressRouteCircuits/Deploy-ERCIR-QOSDropsBitsIn-Alert.json b/services/Network/expressRouteCircuits/Deploy-ERCIR-QOSDropsBitsIn-Alert.json index 1b1ba940f..7236416d6 100644 --- a/services/Network/expressRouteCircuits/Deploy-ERCIR-QOSDropsBitsIn-Alert.json +++ b/services/Network/expressRouteCircuits/Deploy-ERCIR-QOSDropsBitsIn-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy ExpressRoute Circuits QosDropBitsInPerSecond Alert", "description": "Policy to audit/deploy ExpressRoute Circuits QosDropBitsInPerSecond Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -147,6 +147,42 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.alertSensitivity", + "equals": "Medium" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.minFailingPeriodsToAlert", + "equals": 2 + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.numberOfEvaluationPeriods", + "equals": 2 } ] }, diff --git a/services/Network/expressRouteCircuits/Deploy-ERCIR-QOSDropsBitsOut-Alert.json b/services/Network/expressRouteCircuits/Deploy-ERCIR-QOSDropsBitsOut-Alert.json index 5a169ba5d..4ab54e895 100644 --- a/services/Network/expressRouteCircuits/Deploy-ERCIR-QOSDropsBitsOut-Alert.json +++ b/services/Network/expressRouteCircuits/Deploy-ERCIR-QOSDropsBitsOut-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy ExpressRoute Circuits QosDropBitsOutPerSecond Alert", "description": "Policy to audit/deploy ExpressRoute Circuits QosDropBitsOutPerSecond Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -147,6 +147,42 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.alertSensitivity", + "equals": "Medium" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.minFailingPeriodsToAlert", + "equals": 2 + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.numberOfEvaluationPeriods", + "equals": 2 } ] }, diff --git a/services/Network/expressRouteGateways/Deploy-ERG-BitsInPerSecond-Alert.json b/services/Network/expressRouteGateways/Deploy-ERG-BitsInPerSecond-Alert.json index b84c1fd37..b42e1471d 100644 --- a/services/Network/expressRouteGateways/Deploy-ERG-BitsInPerSecond-Alert.json +++ b/services/Network/expressRouteGateways/Deploy-ERG-BitsInPerSecond-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy ERG ExpressRoute Bits In Alert", "description": "Policy to audit/deploy ER Gateway Connection BitsInPerSecond Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -155,6 +155,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "LessThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/expressRouteGateways/Deploy-ERG-BitsOutPerSecond-Alert.json b/services/Network/expressRouteGateways/Deploy-ERG-BitsOutPerSecond-Alert.json index 860143dc8..57467b2a6 100644 --- a/services/Network/expressRouteGateways/Deploy-ERG-BitsOutPerSecond-Alert.json +++ b/services/Network/expressRouteGateways/Deploy-ERG-BitsOutPerSecond-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy ERG ExpressRoute Bits Out Alert", "description": "Policy to audit/deploy ER Gateway Connection BitsOutPerSecond Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -155,6 +155,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "LessThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/expressRouteGateways/Deploy-ERG-CPUUtilization-Alert.json b/services/Network/expressRouteGateways/Deploy-ERG-CPUUtilization-Alert.json index ca17d34c1..37d2eb679 100644 --- a/services/Network/expressRouteGateways/Deploy-ERG-CPUUtilization-Alert.json +++ b/services/Network/expressRouteGateways/Deploy-ERG-CPUUtilization-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy ERG ExpressRoute CPU Utilization Alert", "description": "Policy to audit/deploy ER Gateway Express Route CPU Utilization Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -155,6 +155,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/expressRoutePorts/Deploy-ERP-BitsInPerSecond-Alert.json b/services/Network/expressRoutePorts/Deploy-ERP-BitsInPerSecond-Alert.json index 25b9548c2..eee484fe5 100644 --- a/services/Network/expressRoutePorts/Deploy-ERP-BitsInPerSecond-Alert.json +++ b/services/Network/expressRoutePorts/Deploy-ERP-BitsInPerSecond-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy ER Direct ExpressRoute Bits In Alert", "description": "Policy to audit/deploy ER Direct Connection BitsInPerSecond Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "Category": "Networking", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "_deployed_by_amba": "True" @@ -131,6 +131,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "LessThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/expressRoutePorts/Deploy-ERP-BitsOutPerSecond-Alert.json b/services/Network/expressRoutePorts/Deploy-ERP-BitsOutPerSecond-Alert.json index de6e4c914..50b7a4301 100644 --- a/services/Network/expressRoutePorts/Deploy-ERP-BitsOutPerSecond-Alert.json +++ b/services/Network/expressRoutePorts/Deploy-ERP-BitsOutPerSecond-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy ER Direct ExpressRoute Bits Out Alert", "description": "Policy to audit/deploy ER Direct Connection BitsOutPerSecond Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "Category": "Networking", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "_deployed_by_amba": "True" @@ -131,6 +131,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "LessThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/expressRoutePorts/Deploy-ERP-LineProtocol-Alert.json b/services/Network/expressRoutePorts/Deploy-ERP-LineProtocol-Alert.json index f3ca4c0e8..f3916de85 100644 --- a/services/Network/expressRoutePorts/Deploy-ERP-LineProtocol-Alert.json +++ b/services/Network/expressRoutePorts/Deploy-ERP-LineProtocol-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy ER Direct ExpressRoute LineProtocol Alert", "description": "Policy to audit/deploy ER Direct LineProtocol Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "Category": "Networking", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "_deployed_by_amba": "True" @@ -131,6 +131,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "LessThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/expressRoutePorts/Deploy-ERP-RxLightLevelHigh-Alert.json b/services/Network/expressRoutePorts/Deploy-ERP-RxLightLevelHigh-Alert.json index aadfd0ffd..6381e849b 100644 --- a/services/Network/expressRoutePorts/Deploy-ERP-RxLightLevelHigh-Alert.json +++ b/services/Network/expressRoutePorts/Deploy-ERP-RxLightLevelHigh-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy ER Direct ExpressRoute RxLightLevel High Alert", "description": "Policy to audit/deploy ER Direct RxLightLevel High Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "Category": "Networking", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "_deployed_by_amba": "True" @@ -135,6 +135,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/expressRoutePorts/Deploy-ERP-RxLightLevelLow-Alert.json b/services/Network/expressRoutePorts/Deploy-ERP-RxLightLevelLow-Alert.json index 4e82b77c5..de3a8ade0 100644 --- a/services/Network/expressRoutePorts/Deploy-ERP-RxLightLevelLow-Alert.json +++ b/services/Network/expressRoutePorts/Deploy-ERP-RxLightLevelLow-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy ER Direct ExpressRoute RxLightLevel Low Alert", "description": "Policy to audit/deploy ER Direct RxLightLevel Low Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "Category": "Networking", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "_deployed_by_amba": "True" @@ -135,6 +135,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "LessThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/expressRoutePorts/Deploy-ERP-TxLightLevelHigh-Alert.json b/services/Network/expressRoutePorts/Deploy-ERP-TxLightLevelHigh-Alert.json index 76d70491a..184bafc47 100644 --- a/services/Network/expressRoutePorts/Deploy-ERP-TxLightLevelHigh-Alert.json +++ b/services/Network/expressRoutePorts/Deploy-ERP-TxLightLevelHigh-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy ER Direct ExpressRoute TxLightLevel High Alert", "description": "Policy to audit/deploy ER Direct TxLightLevel High Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "Category": "Networking", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "_deployed_by_amba": "True" @@ -135,6 +135,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/expressRoutePorts/Deploy-ERP-TxLightLevelLow-Alert.json b/services/Network/expressRoutePorts/Deploy-ERP-TxLightLevelLow-Alert.json index 0bacbc56c..d0ec275b7 100644 --- a/services/Network/expressRoutePorts/Deploy-ERP-TxLightLevelLow-Alert.json +++ b/services/Network/expressRoutePorts/Deploy-ERP-TxLightLevelLow-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy ER Direct ExpressRoute TxLightLevel Low Alert", "description": "Policy to audit/deploy ER Direct TxLightLevel Low Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "Category": "Networking", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "_deployed_by_amba": "True" @@ -135,6 +135,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "LessThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/frontdoors/Deploy-FD-BackendHealth-Alert.json b/services/Network/frontdoors/Deploy-FD-BackendHealth-Alert.json index 07dc091e6..3318488c8 100644 --- a/services/Network/frontdoors/Deploy-FD-BackendHealth-Alert.json +++ b/services/Network/frontdoors/Deploy-FD-BackendHealth-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy Frontdoor Backend Health Percentage Alert", "description": "Policy to audit/deploy FrontDoor Backend Health Percentage Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "Category": "Networking", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "_deployed_by_amba": "True" @@ -131,6 +131,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "LessThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/frontdoors/Deploy-FD-BackendRequestLatency-Alert.json b/services/Network/frontdoors/Deploy-FD-BackendRequestLatency-Alert.json index 91f8d35b5..a88f349f7 100644 --- a/services/Network/frontdoors/Deploy-FD-BackendRequestLatency-Alert.json +++ b/services/Network/frontdoors/Deploy-FD-BackendRequestLatency-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy Frontdoor Backend Request Latency Alert", "description": "Policy to audit/deploy Frontdoor Backend Request Latency Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Networking", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -147,6 +147,42 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.alertSensitivity", + "equals": "Medium" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.minFailingPeriodsToAlert", + "equals": 2 + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.numberOfEvaluationPeriods", + "equals": 2 } ] }, diff --git a/services/Network/loadBalancers/Deploy-LB-DatapathAvailability-Alert.json b/services/Network/loadBalancers/Deploy-LB-DatapathAvailability-Alert.json index 5e4411099..781c59307 100644 --- a/services/Network/loadBalancers/Deploy-LB-DatapathAvailability-Alert.json +++ b/services/Network/loadBalancers/Deploy-LB-DatapathAvailability-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy ALB Data Path Availability Alert", "description": "Policy to audit/deploy Azure Load Balancer Data Path Availability Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "Category": "Networking", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "_deployed_by_amba": "True" @@ -135,6 +135,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "LessThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/loadBalancers/Deploy-LB-GlobalBackendAvailability-Alert.json b/services/Network/loadBalancers/Deploy-LB-GlobalBackendAvailability-Alert.json index 430d726ce..5bf254ff0 100644 --- a/services/Network/loadBalancers/Deploy-LB-GlobalBackendAvailability-Alert.json +++ b/services/Network/loadBalancers/Deploy-LB-GlobalBackendAvailability-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy ALB Global Backend Availability Alert", "description": "Policy to audit/deploy Azure Load Balancer Global Backend Availability Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "Category": "Networking", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "_deployed_by_amba": "True" @@ -135,6 +135,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "LessThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/loadBalancers/Deploy-LB-HealthProbeStatus-Alert.json b/services/Network/loadBalancers/Deploy-LB-HealthProbeStatus-Alert.json index 92caa818e..2f271824c 100644 --- a/services/Network/loadBalancers/Deploy-LB-HealthProbeStatus-Alert.json +++ b/services/Network/loadBalancers/Deploy-LB-HealthProbeStatus-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy ALB Health Probe Status Alert", "description": "Policy to audit/deploy Azure Load Balancer Health Probe Status Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "Category": "Networking", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "_deployed_by_amba": "True" @@ -139,6 +139,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "LessThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/loadBalancers/Deploy-LB-UsedSNATPorts-Alert.json b/services/Network/loadBalancers/Deploy-LB-UsedSNATPorts-Alert.json index 7a7b5a814..2b32d62f8 100644 --- a/services/Network/loadBalancers/Deploy-LB-UsedSNATPorts-Alert.json +++ b/services/Network/loadBalancers/Deploy-LB-UsedSNATPorts-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy ALB Used SNAT Ports Alert", "description": "Policy to audit/deploy Azure Load Balancer Used SNAT Ports Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "Category": "Networking", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "_deployed_by_amba": "True" @@ -131,6 +131,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/privateDnsZones/Deploy-PDNSZ-CapacityUtilization-Alert.json b/services/Network/privateDnsZones/Deploy-PDNSZ-CapacityUtilization-Alert.json index 67af85797..ee6c91666 100644 --- a/services/Network/privateDnsZones/Deploy-PDNSZ-CapacityUtilization-Alert.json +++ b/services/Network/privateDnsZones/Deploy-PDNSZ-CapacityUtilization-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy PDNSZ Capacity Utilization Alert", "description": "Policy to audit/deploy Private DNS Zone Capacity Utilization Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -155,6 +155,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Maximum" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "GreaterThanOrEqual" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/privateDnsZones/Deploy-PDNSZ-QueryVolume-Alert.json b/services/Network/privateDnsZones/Deploy-PDNSZ-QueryVolume-Alert.json index 2314996b1..e1c74ce8f 100644 --- a/services/Network/privateDnsZones/Deploy-PDNSZ-QueryVolume-Alert.json +++ b/services/Network/privateDnsZones/Deploy-PDNSZ-QueryVolume-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy PDNSZ Query Volume Alert", "description": "Policy to audit/deploy Private DNS Zone Query Volume Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -155,6 +155,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Total" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "GreaterThanOrEqual" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/privateDnsZones/Deploy-PDNSZ-RecordSetCapacity-Alert.json b/services/Network/privateDnsZones/Deploy-PDNSZ-RecordSetCapacity-Alert.json index 57886bdf1..1082e2f07 100644 --- a/services/Network/privateDnsZones/Deploy-PDNSZ-RecordSetCapacity-Alert.json +++ b/services/Network/privateDnsZones/Deploy-PDNSZ-RecordSetCapacity-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy PDNSZ Record Set Capacity Alert", "description": "Policy to audit/deploy Private DNS Zone Record Set Capacity Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -155,6 +155,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Maximum" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "GreaterThanOrEqual" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/privateDnsZones/Deploy-PDNSZ-RegistrationCapacityUtilization-Alert.json b/services/Network/privateDnsZones/Deploy-PDNSZ-RegistrationCapacityUtilization-Alert.json index 7f13f8d22..aa7c884d7 100644 --- a/services/Network/privateDnsZones/Deploy-PDNSZ-RegistrationCapacityUtilization-Alert.json +++ b/services/Network/privateDnsZones/Deploy-PDNSZ-RegistrationCapacityUtilization-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy PDNSZ Registration Capacity Utilization Alert", "description": "Policy to audit/deploy Private DNS Zone Registration Capacity Utilization Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -155,6 +155,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Maximum" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "GreaterThanOrEqual" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/publicIPAddresses/Deploy-PIP-BytesInDDOSAttack-Alert.json b/services/Network/publicIPAddresses/Deploy-PIP-BytesInDDOSAttack-Alert.json index 227d339be..763ec7be5 100644 --- a/services/Network/publicIPAddresses/Deploy-PIP-BytesInDDOSAttack-Alert.json +++ b/services/Network/publicIPAddresses/Deploy-PIP-BytesInDDOSAttack-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy PIP Bytes in DDoS Attack Alert", "description": "Policy to audit/deploy PIP Bytes in DDoS Attack Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -155,6 +155,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Maximum" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/publicIPAddresses/Deploy-PIP-DDOSAttack-Alert.json b/services/Network/publicIPAddresses/Deploy-PIP-DDOSAttack-Alert.json index 7e2ce5c14..cda28bcfd 100644 --- a/services/Network/publicIPAddresses/Deploy-PIP-DDOSAttack-Alert.json +++ b/services/Network/publicIPAddresses/Deploy-PIP-DDOSAttack-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy PIP DDoS Attack Alert", "description": "Policy to audit/deploy PIP DDoS Attack Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -155,6 +155,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Maximum" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/publicIPAddresses/Deploy-PIP-PacketsInDDOS-Alert.json b/services/Network/publicIPAddresses/Deploy-PIP-PacketsInDDOS-Alert.json index 4a9d491bb..fe9563e0d 100644 --- a/services/Network/publicIPAddresses/Deploy-PIP-PacketsInDDOS-Alert.json +++ b/services/Network/publicIPAddresses/Deploy-PIP-PacketsInDDOS-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy PIP Packets in DDoS Attack Alert", "description": "Policy to audit/deploy PIP Packets in DDoS Attack Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -155,6 +155,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Total" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].operator", + "equals": "GreaterThanOrEqual" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/publicIPAddresses/Deploy-PIP-VIPAvailability-Alert.json b/services/Network/publicIPAddresses/Deploy-PIP-VIPAvailability-Alert.json index a415131df..006e75b61 100644 --- a/services/Network/publicIPAddresses/Deploy-PIP-VIPAvailability-Alert.json +++ b/services/Network/publicIPAddresses/Deploy-PIP-VIPAvailability-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy PIP VIP Availability Alert", "description": "Policy to audit/deploy PIP VIP Availability Alert", "metadata": { - "version": "1.0.2", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -159,6 +159,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "LessThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/trafficmanagerprofiles/Deploy-TM-EndpointHealth-Alert.json b/services/Network/trafficmanagerprofiles/Deploy-TM-EndpointHealth-Alert.json index e9c2303e9..33b2ceae7 100644 --- a/services/Network/trafficmanagerprofiles/Deploy-TM-EndpointHealth-Alert.json +++ b/services/Network/trafficmanagerprofiles/Deploy-TM-EndpointHealth-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy Traffic Manager Endpoint Health Alert", "description": "Policy to audit/deploy FTraffic Manager Endpoint Health Health Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "Category": "Networking", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "_deployed_by_amba": "True" @@ -131,6 +131,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "LessThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/virtualNetworkGateways/Deploy-VNETG-BandwidthUtilization-Alert.json b/services/Network/virtualNetworkGateways/Deploy-VNETG-BandwidthUtilization-Alert.json index 4740f0e9e..554b9087c 100644 --- a/services/Network/virtualNetworkGateways/Deploy-VNETG-BandwidthUtilization-Alert.json +++ b/services/Network/virtualNetworkGateways/Deploy-VNETG-BandwidthUtilization-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy VNetG Tunnel Bandwidth Alert", "description": "Policy to audit/deploy Virtual Network Gateway Tunnel Bandwidth Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -159,6 +159,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].operator", + "equals": "LessThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/virtualNetworkGateways/Deploy-VNETG-ERGBitsPerSecond-Alert.json b/services/Network/virtualNetworkGateways/Deploy-VNETG-ERGBitsPerSecond-Alert.json index 5a421a4fb..60ad1c9e1 100644 --- a/services/Network/virtualNetworkGateways/Deploy-VNETG-ERGBitsPerSecond-Alert.json +++ b/services/Network/virtualNetworkGateways/Deploy-VNETG-ERGBitsPerSecond-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy VNetG ExpressRoute Bits Per Second Alert", "description": "Policy to audit/deploy Virtual Network Gateway Express Route Bits Per Second Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -159,6 +159,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].operator", + "equals": "LessThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/virtualNetworkGateways/Deploy-VNETG-ERGCPUUtilization-Alert.json b/services/Network/virtualNetworkGateways/Deploy-VNETG-ERGCPUUtilization-Alert.json index 7e0f9c54e..b115e8703 100644 --- a/services/Network/virtualNetworkGateways/Deploy-VNETG-ERGCPUUtilization-Alert.json +++ b/services/Network/virtualNetworkGateways/Deploy-VNETG-ERGCPUUtilization-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy VNetG ExpressRoute CPU Utilization Alert", "description": "Policy to audit/deploy Virtual Network Gateway Express Route CPU Utilization Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -159,6 +159,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/virtualNetworkGateways/Deploy-VNETG-Egress-Alert.json b/services/Network/virtualNetworkGateways/Deploy-VNETG-Egress-Alert.json index 12306147a..739fa0cb4 100644 --- a/services/Network/virtualNetworkGateways/Deploy-VNETG-Egress-Alert.json +++ b/services/Network/virtualNetworkGateways/Deploy-VNETG-Egress-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy VNetG Tunnel Egress Alert", "description": "Policy to audit/deploy Virtual Network Gateway Tunnel Egress Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -159,6 +159,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].operator", + "equals": "LessThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/virtualNetworkGateways/Deploy-VNETG-EgressPacketDropCount-Alert.json b/services/Network/virtualNetworkGateways/Deploy-VNETG-EgressPacketDropCount-Alert.json index a95315603..49a92f9ac 100644 --- 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.0.1", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -151,6 +151,42 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.alertSensitivity", + "equals": "Medium" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.minFailingPeriodsToAlert", + "equals": 2 + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.numberOfEvaluationPeriods", + "equals": 2 } ] }, diff --git a/services/Network/virtualNetworkGateways/Deploy-VNETG-EgressPacketDropMismatch-Alert.json b/services/Network/virtualNetworkGateways/Deploy-VNETG-EgressPacketDropMismatch-Alert.json index c6c05f610..5bdd9f8a7 100644 --- 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.0.1", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -151,6 +151,42 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.alertSensitivity", + "equals": "Medium" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.minFailingPeriodsToAlert", + "equals": 2 + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.numberOfEvaluationPeriods", + "equals": 2 } ] }, diff --git a/services/Network/virtualNetworkGateways/Deploy-VNETG-Ingress-Alert.json b/services/Network/virtualNetworkGateways/Deploy-VNETG-Ingress-Alert.json index 7b2df5707..976c4150b 100644 --- a/services/Network/virtualNetworkGateways/Deploy-VNETG-Ingress-Alert.json +++ b/services/Network/virtualNetworkGateways/Deploy-VNETG-Ingress-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy VNetG Tunnel Ingress Alert", "description": "Policy to audit/deploy Virtual Network Gateway Tunnel Ingress Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -159,6 +159,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].operator", + "equals": "LessThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/virtualNetworkGateways/Deploy-VNETG-IngressPacketDropCount-Alert.json b/services/Network/virtualNetworkGateways/Deploy-VNETG-IngressPacketDropCount-Alert.json index 9dd5cabbf..460c9b30c 100644 --- 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.0.1", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -151,6 +151,42 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.alertSensitivity", + "equals": "Medium" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.minFailingPeriodsToAlert", + "equals": 2 + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.numberOfEvaluationPeriods", + "equals": 2 } ] }, diff --git a/services/Network/virtualNetworkGateways/Deploy-VNETG-IngressPacketDropMismatch-Alert.json b/services/Network/virtualNetworkGateways/Deploy-VNETG-IngressPacketDropMismatch-Alert.json index 1065a3e92..b2097323f 100644 --- 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.0.1", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -151,6 +151,42 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.alertSensitivity", + "equals": "Medium" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.minFailingPeriodsToAlert", + "equals": 2 + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.numberOfEvaluationPeriods", + "equals": 2 } ] }, diff --git a/services/Network/virtualNetworks/Deploy-VNET-DDOSAttack-Alert.json b/services/Network/virtualNetworks/Deploy-VNET-DDOSAttack-Alert.json index 84b96392b..ab3b661f5 100644 --- a/services/Network/virtualNetworks/Deploy-VNET-DDOSAttack-Alert.json +++ b/services/Network/virtualNetworks/Deploy-VNET-DDOSAttack-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy VNet DDoS Attack Alert", "description": "Policy to audit/deploy Virtual Network DDoS Attack Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -155,6 +155,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Maximum" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/vpnGateways/Deploy-VPNG-BGPPeerStatus-Alert.json b/services/Network/vpnGateways/Deploy-VPNG-BGPPeerStatus-Alert.json index a22d7e81b..050211129 100644 --- a/services/Network/vpnGateways/Deploy-VPNG-BGPPeerStatus-Alert.json +++ b/services/Network/vpnGateways/Deploy-VPNG-BGPPeerStatus-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy VPNG BGP Peer Status Alert", "description": "Policy to audit/deploy VPN Gateway BGP Peer Status Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -155,6 +155,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Total" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].operator", + "equals": "LessThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/vpnGateways/Deploy-VPNG-BandwidthUtilization-Alert.json b/services/Network/vpnGateways/Deploy-VPNG-BandwidthUtilization-Alert.json index 6d536fbe9..0f14de858 100644 --- a/services/Network/vpnGateways/Deploy-VPNG-BandwidthUtilization-Alert.json +++ b/services/Network/vpnGateways/Deploy-VPNG-BandwidthUtilization-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy VPNG Bandwidth Utilization Alert", "description": "Policy to audit/deploy VPN Gateway Bandwidth Utilization Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -155,6 +155,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].operator", + "equals": "LessThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/vpnGateways/Deploy-VPNG-Egress-Alert.json b/services/Network/vpnGateways/Deploy-VPNG-Egress-Alert.json index 94676ec3b..a97980ef9 100644 --- a/services/Network/vpnGateways/Deploy-VPNG-Egress-Alert.json +++ b/services/Network/vpnGateways/Deploy-VPNG-Egress-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy VPNG Egress Alert", "description": "Policy to audit/deploy VPN Gateway Egress Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -155,6 +155,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].operator", + "equals": "LessThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/vpnGateways/Deploy-VPNG-EgressPacketDropCount-Alert.json b/services/Network/vpnGateways/Deploy-VPNG-EgressPacketDropCount-Alert.json index 0779147b2..193896d4e 100644 --- a/services/Network/vpnGateways/Deploy-VPNG-EgressPacketDropCount-Alert.json +++ b/services/Network/vpnGateways/Deploy-VPNG-EgressPacketDropCount-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy VPNG Egress Packet Drop Count Alert", "description": "Policy to audit/deploy VPN Gateway Egress Packet Drop Count Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -147,6 +147,42 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.alertSensitivity", + "equals": "Medium" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.minFailingPeriodsToAlert", + "equals": 2 + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.numberOfEvaluationPeriods", + "equals": 2 } ] }, diff --git a/services/Network/vpnGateways/Deploy-VPNG-EgressPacketDropMismatch-Alert.json b/services/Network/vpnGateways/Deploy-VPNG-EgressPacketDropMismatch-Alert.json index 8d7638781..8bac1c5ce 100644 --- a/services/Network/vpnGateways/Deploy-VPNG-EgressPacketDropMismatch-Alert.json +++ b/services/Network/vpnGateways/Deploy-VPNG-EgressPacketDropMismatch-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy VPNG Egress Packet Drop Mismatch Alert", "description": "Policy to audit/deploy VPN Gateway Egress Packet Drop Mismatch Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -147,6 +147,42 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.alertSensitivity", + "equals": "Medium" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.minFailingPeriodsToAlert", + "equals": 2 + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.numberOfEvaluationPeriods", + "equals": 2 } ] }, diff --git a/services/Network/vpnGateways/Deploy-VPNG-Ingress-Alert.json b/services/Network/vpnGateways/Deploy-VPNG-Ingress-Alert.json index dfab5ba01..f7ad8c88e 100644 --- a/services/Network/vpnGateways/Deploy-VPNG-Ingress-Alert.json +++ b/services/Network/vpnGateways/Deploy-VPNG-Ingress-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy VPNG Ingress Alert", "description": "Policy to audit/deploy VPN Gateway Ingress Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -155,6 +155,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].operator", + "equals": "LessThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Network/vpnGateways/Deploy-VPNG-IngressPacketDropCount-Alert.json b/services/Network/vpnGateways/Deploy-VPNG-IngressPacketDropCount-Alert.json index a5ec83b1a..7630eb103 100644 --- a/services/Network/vpnGateways/Deploy-VPNG-IngressPacketDropCount-Alert.json +++ b/services/Network/vpnGateways/Deploy-VPNG-IngressPacketDropCount-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy VPNG Ingress Packet Drop Count Alert", "description": "Policy to audit/deploy VPN Gateway Ingress Packet Drop Count Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -147,6 +147,42 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.alertSensitivity", + "equals": "Medium" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.minFailingPeriodsToAlert", + "equals": 2 + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.numberOfEvaluationPeriods", + "equals": 2 } ] }, diff --git a/services/Network/vpnGateways/Deploy-VPNG-IngressPacketDropMismatch-Alert.json b/services/Network/vpnGateways/Deploy-VPNG-IngressPacketDropMismatch-Alert.json index a52ff8772..0866f9bc3 100644 --- a/services/Network/vpnGateways/Deploy-VPNG-IngressPacketDropMismatch-Alert.json +++ b/services/Network/vpnGateways/Deploy-VPNG-IngressPacketDropMismatch-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy VPNG Ingress Packet Drop Mismatch Alert", "description": "Policy to audit/deploy VPN Gateway Ingress Packet Drop Mismatch Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -147,6 +147,42 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.alertSensitivity", + "equals": "Medium" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.minFailingPeriodsToAlert", + "equals": 2 + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.numberOfEvaluationPeriods", + "equals": 2 } ] }, diff --git a/services/Storage/storageAccounts/Deploy-SA-Availability-Alert.json b/services/Storage/storageAccounts/Deploy-SA-Availability-Alert.json index 90ee8ad6f..f6048f9d7 100644 --- a/services/Storage/storageAccounts/Deploy-SA-Availability-Alert.json +++ b/services/Storage/storageAccounts/Deploy-SA-Availability-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy SA Availability Alert", "description": "Policy to audit/deploy SA Availability Alert", "metadata": { - "version": "1.0.2", + "version": "1.1.0", "category": "Storage", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -155,6 +155,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "LessThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Web/serverFarms/Deploy-WSF-CPUPercentage-Alert.json b/services/Web/serverFarms/Deploy-WSF-CPUPercentage-Alert.json index ce061a26a..d0970eb04 100644 --- a/services/Web/serverFarms/Deploy-WSF-CPUPercentage-Alert.json +++ b/services/Web/serverFarms/Deploy-WSF-CPUPercentage-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy App Service Plan CPU Percentage Alert", "description": "Policy to audit/deploy App Service Plan CPU Percentage Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "Category": "Web Services", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "_deployed_by_amba": "True" @@ -131,6 +131,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] }, diff --git a/services/Web/serverFarms/Deploy-WSF-DiskQueueLength-Alert.json b/services/Web/serverFarms/Deploy-WSF-DiskQueueLength-Alert.json index 91432e1fb..25df27871 100644 --- a/services/Web/serverFarms/Deploy-WSF-DiskQueueLength-Alert.json +++ b/services/Web/serverFarms/Deploy-WSF-DiskQueueLength-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy App Service Plan Disk Queue Length Alert", "description": "Policy to audit/deploy App Service Plan Disk Queue Length Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Web Services", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -147,6 +147,42 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.alertSensitivity", + "equals": "Medium" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.minFailingPeriodsToAlert", + "equals": 2 + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.numberOfEvaluationPeriods", + "equals": 2 } ] }, diff --git a/services/Web/serverFarms/Deploy-WSF-HttpQueueLength-Alert.json b/services/Web/serverFarms/Deploy-WSF-HttpQueueLength-Alert.json index b4aa30ca4..4db109eae 100644 --- a/services/Web/serverFarms/Deploy-WSF-HttpQueueLength-Alert.json +++ b/services/Web/serverFarms/Deploy-WSF-HttpQueueLength-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy App Service Plan Http Queue Length Alert", "description": "Policy to audit/deploy App Service Plan Http Queue Length Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "category": "Web Services", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "alzCloudEnvironments": [ @@ -147,6 +147,42 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.alertSensitivity", + "equals": "Medium" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.minFailingPeriodsToAlert", + "equals": 2 + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.numberOfEvaluationPeriods", + "equals": 2 } ] }, diff --git a/services/Web/serverFarms/Deploy-WSF-MemoryPercentage-Alert.json b/services/Web/serverFarms/Deploy-WSF-MemoryPercentage-Alert.json index 246525fa0..6250eeecd 100644 --- a/services/Web/serverFarms/Deploy-WSF-MemoryPercentage-Alert.json +++ b/services/Web/serverFarms/Deploy-WSF-MemoryPercentage-Alert.json @@ -8,7 +8,7 @@ "displayName": "Deploy App Service Plan Memory Percentage Alert", "description": "Policy to audit/deploy App Service Plan Memory Percentage Alert", "metadata": { - "version": "1.0.1", + "version": "1.1.0", "Category": "Web Services", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "_deployed_by_amba": "True" @@ -131,6 +131,34 @@ { "field": "Microsoft.Insights/metricAlerts/enabled", "equals": "[[parameters('enabled')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency", + "equals": "[[parameters('evaluationFrequency')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/windowSize", + "equals": "[[parameters('windowSize')]" + }, + { + "field": "Microsoft.Insights/metricalerts/severity", + "equals": "[[parameters('severity')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/autoMitigate", + "equals": "[[parameters('autoMitigate')]" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation", + "equals": "Average" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.operator", + "equals": "GreaterThan" + }, + { + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria.allOf[*].StaticThresholdCriterion.threshold", + "equals": "[[parameters('threshold')]" } ] },