[Monitor]fix metric alert rule v2 to support web tests (#22468)

* fix metric alert rule v2 to support web tests

* update test case accordingly

Author: VeryEarly

src/Monitor/Monitor.Test/Alerts/AddAzureRmMetricAlertRuleV2Tests.cs

@@ -203,9 +203,6 @@ public void NewMetricAlertRuleV2WithWebtestConditionProcessing()
 
             Func<MetricAlertResource, bool> verify = metricAlert =>
             {
-                Assert.Contains(_cmdlet.TargetResourceId, metricAlert.Scopes);
-                Assert.Contains(webtestCriteria.ComponentId, metricAlert.Scopes);
-
                 Assert.Contains($"hidden-link:{webtestCriteria.WebTestId}", metricAlert.Tags.Keys);
                 Assert.Contains($"hidden-link:{webtestCriteria.ComponentId}", metricAlert.Tags.Keys);
 

src/Monitor/Monitor/Alerts/AddAzureRmMetricAlertRuleV2Command.cs

@@ -16,7 +16,6 @@
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Management.Monitor;
 using Microsoft.Azure.Management.Monitor.Models;
-using Microsoft.Azure.Management.Monitor.Management.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -80,15 +79,13 @@ public class AddAzureRmMetricAlertRuleV2Command : ManagementCmdletBase
         /// <summary>
         /// Gets or sets the TargetResourceType  parameter
         /// </summary>
-        [Parameter(ParameterSetName = CreateAlertByScopes, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The target resource type for rule")]       
-        [ValidateNotNullOrEmpty]
+        [Parameter(ParameterSetName = CreateAlertByScopes, ValueFromPipelineByPropertyName = true, HelpMessage = "The target resource type for rule")]       
         public string TargetResourceType { get; set; }
 
         /// <summary>
         /// Gets or sets the TargetResourceRegion  parameter
         /// </summary>
-        [Parameter(ParameterSetName = CreateAlertByScopes, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The target resource region for rule")]
-        [ValidateNotNullOrEmpty]
+        [Parameter(ParameterSetName = CreateAlertByScopes, ValueFromPipelineByPropertyName = true, HelpMessage = "The target resource region for rule")]
         public string TargetResourceRegion { get; set; }
 
         /// <summary>
@@ -159,42 +156,64 @@ protected override void ProcessRecordInternal()
             }
 
             IDictionary<string, string> tags = null;
-            if (this.TargetResourceScope == null)//Single Resource Metric Alert Rule
+            if (this.Condition.Any(c => c.CriterionType == CriterionType.WebtestLocationAvailabilityCriterion))
             {
-                var scopes = new List<string> {this.TargetResourceId};
-
+                var scopes = this.TargetResourceScope?.ToList<string>() ?? new List<string> { this.TargetResourceId };
                 MetricAlertCriteria criteria;
-
-                if (this.Condition.Any(c => c.CriterionType == CriterionType.WebtestLocationAvailabilityCriterion))
+                if (this.Condition.Count > 1)
                 {
-                    if (this.Condition.Count > 1)
-                    {
-                        throw new ArgumentException("Only single Webtest location availability criterion is supported");
-                    }
+                    throw new ArgumentException("Only single Webtest location availability criterion is supported");
+                }
 
-                    var psWebtestCriteria = this.Condition.First() as PSWebtestLocationAvailabilityCriteria ;
+                var psWebtestCriteria = this.Condition.First() as PSWebtestLocationAvailabilityCriteria;
 
-                    criteria = new WebtestLocationAvailabilityCriteria(psWebtestCriteria.WebTestId, psWebtestCriteria.ComponentId, psWebtestCriteria.FailedLocationCount);
+                criteria = new WebtestLocationAvailabilityCriteria(psWebtestCriteria.WebTestId, psWebtestCriteria.ComponentId, psWebtestCriteria.FailedLocationCount);
+                if (!scopes.Contains(psWebtestCriteria.ComponentId))
+                {
                     scopes.Add(psWebtestCriteria.ComponentId);
+                }
 
-                    tags = new Dictionary<string, string>()
+                tags = new Dictionary<string, string>()
                     {
                         {$"hidden-link:{psWebtestCriteria.WebTestId}", "Resource" },
                         {$"hidden-link:{psWebtestCriteria.ComponentId}", "Resource" }
                     };
+                var metricAlertResource = new MetricAlertResource(
+                        description: this.Description ?? Utilities.GetDefaultDescription("new Metric alert rule"),
+                        severity: this.Severity,
+                        location: "global",
+                        enabled: !this.DisableRule,
+                        scopes: this.TargetResourceScope,
+                        evaluationFrequency: this.Frequency,
+                        windowSize: this.WindowSize,
+                        criteria: criteria,
+                        autoMitigate: this.AutoMitigate,
+                        actions: actions,
+                        tags: tags
+                    );
+                if (ShouldProcess(
+                    target: $"Create/update an alert rule: {this.Name} from resource group: {this.ResourceGroupName}",
+                    action: "Create/update an alert rule"))
+                {
+                    var result = this.MonitorManagementClient.MetricAlerts.CreateOrUpdateAsync(resourceGroupName: this.ResourceGroupName, ruleName: this.Name, parameters: metricAlertResource).Result;
+                    WriteObject(result);
                 }
-                else
+            }
+            else if (this.TargetResourceScope == null)//Single Resource Metric Alert Rule
+            {
+                var scopes = new List<string> {this.TargetResourceId};
+
+                MetricAlertCriteria criteria;
+
+                var metricCriteria = new List<MetricCriteria>();
+                foreach (var metricCondition in this.Condition)
                 {
-                    var metricCriteria = new List<MetricCriteria>();
-                    foreach (var metricCondition in this.Condition)
-                    {
-                        var condition = metricCondition as PSMetricCriteria;
-                        metricCriteria.Add(new MetricCriteria(name: condition.Name, metricName: condition.MetricName, operatorProperty: condition.OperatorProperty.ToString(), timeAggregation: condition.TimeAggregation.ToString(), threshold: condition.Threshold, metricNamespace: condition.MetricNamespace, dimensions: condition.Dimensions, skipMetricValidation: condition.SkipMetricValidation));
-                    }
-                    criteria = new MetricAlertSingleResourceMultipleMetricCriteria(
-                        allOf: metricCriteria
-                    );
+                    var condition = metricCondition as PSMetricCriteria;
+                    metricCriteria.Add(new MetricCriteria(name: condition.Name, metricName: condition.MetricName, operatorProperty: condition.OperatorProperty.ToString(), timeAggregation: condition.TimeAggregation.ToString(), threshold: condition.Threshold, metricNamespace: condition.MetricNamespace, dimensions: condition.Dimensions, skipMetricValidation: condition.SkipMetricValidation));
                 }
+                criteria = new MetricAlertSingleResourceMultipleMetricCriteria(
+                    allOf: metricCriteria
+                );
 
                 var metricAlertResource = new MetricAlertResource(
                         description: this.Description ?? Utilities.GetDefaultDescription("new Metric alert rule"),

src/Monitor/Monitor/ChangeLog.md

@@ -19,6 +19,7 @@
 -->
 
 ## Upcoming Release
+* Fixed `Add-AzMetriAlertRuleV2` and `Get-AzMetricAlertRuleV2` to support web tests criteria [#22350]
 * Added parameter `Dimension` for `Get-AzMetric` to easily filter metrics by dimensions [#22320]
 
 ## Version 4.5.0

src/Monitor/Monitor/OutputClasses/PSMetricAlertRuleV2.cs

@@ -53,6 +53,10 @@ public PSMetricAlertRuleV2(MetricAlertResource metricAlertResource)
             else
             {
                 //Web-Test
+                if (metricAlertResource.Criteria is WebtestLocationAvailabilityCriteria)
+                {
+                    Criteria.Add(new PSWebtestLocationAvailabilityCriteria(metricAlertResource.Criteria as WebtestLocationAvailabilityCriteria));
+                }
             }
             Actions = new Microsoft.Azure.Management.Monitor.Management.Models.ActivityLogAlertActionGroup[metricAlertResource.Actions.Count];
             for(int i = 0; i < metricAlertResource.Actions.Count;i++)

src/Monitor/Monitor/help/Add-AzMetricAlertRuleV2.md

@@ -25,7 +25,7 @@ Add-AzMetricAlertRuleV2 -Name <String> -ResourceGroupName <String> -WindowSize <
 ### CreateAlertByScopes
 ```
 Add-AzMetricAlertRuleV2 -Name <String> -ResourceGroupName <String> -WindowSize <TimeSpan> -Frequency <TimeSpan>
- -TargetResourceScope <String[]> -TargetResourceType <String> -TargetResourceRegion <String>
+ -TargetResourceScope <String[]> [-TargetResourceType <String>] [-TargetResourceRegion <String>]
  -Condition <System.Collections.Generic.List`1[Microsoft.Azure.Commands.Insights.OutputClasses.IPSMultiMetricCriteria]>
  [-AutoMitigate <Boolean>] [-ActionGroup <ActivityLogAlertActionGroup[]>] [-ActionGroupId <String[]>]
  [-DisableRule] [-Description <String>] -Severity <Int32> [-DefaultProfile <IAzureContextContainer>] [-WhatIf]
@@ -346,7 +346,7 @@ Type: System.String
 Parameter Sets: CreateAlertByScopes
 Aliases:
 
-Required: True
+Required: False
 Position: Named
 Default value: None
 Accept pipeline input: True (ByPropertyName)
@@ -376,7 +376,7 @@ Type: System.String
 Parameter Sets: CreateAlertByScopes
 Aliases:
 
-Required: True
+Required: False
 Position: Named
 Default value: None
 Accept pipeline input: True (ByPropertyName)