[Hub Generated] Review request for Microsoft.Insights to add version stable/2018-03-01 (#12372)

yashmuel · web-flow · commit 47330bf30c0f · 2021-01-18T09:53:16.000+08:00
* fixed customer feedback

* added reference to new example

* added real reference

* harel PR fixes

* added target resource prop to multi examples

* added suppression to model validation

* fixed prettier check
diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-03-01/examples/UpdateMetricAlert.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-03-01/examples/UpdateMetricAlert.json
@@ -32,7 +32,7 @@
         "autoMitigate": false,
         "actions": [
           {
-            "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/notificationgroups/group2",
+            "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/actiongroups/group2",
             "webHookProperties": {
               "key11": "value11",
               "key12": "value12"
@@ -78,7 +78,7 @@
           "autoMitigate": false,
           "actions": [
             {
-              "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/notificationgroups/group2",
+              "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/actiongroups/group2",
               "webHookProperties": {
                 "key11": "value11",
                 "key12": "value12"
diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-03-01/examples/createOrUpdateDynamicMetricAlertMultipleResource.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-03-01/examples/createOrUpdateDynamicMetricAlertMultipleResource.json
@@ -41,7 +41,7 @@
         "autoMitigate": false,
         "actions": [
           {
-            "actionGroupId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/gigtest/providers/microsoft.insights/notificationgroups/group2",
+            "actionGroupId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/gigtest/providers/microsoft.insights/actiongroups/group2",
             "webHookProperties": {
               "key11": "value11",
               "key12": "value12"
@@ -95,7 +95,7 @@
           "autoMitigate": false,
           "actions": [
             {
-              "actionGroupId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/gigtest/providers/microsoft.insights/notificationgroups/group2",
+              "actionGroupId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/gigtest/providers/microsoft.insights/actiongroups/group2",
               "webHookProperties": {
                 "key11": "value11",
                 "key12": "value12"
diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-03-01/examples/createOrUpdateDynamicMetricAlertSingleResource.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-03-01/examples/createOrUpdateDynamicMetricAlertSingleResource.json
@@ -16,8 +16,6 @@
         ],
         "evaluationFrequency": "PT1M",
         "windowSize": "PT15M",
-        "targetResourceType": "Microsoft.Compute/virtualMachines",
-        "targetResourceRegion": "southcentralus",
         "criteria": {
           "odata.type": "Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria",
           "allOf": [
@@ -41,7 +39,7 @@
         "autoMitigate": false,
         "actions": [
           {
-            "actionGroupId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/gigtest/providers/microsoft.insights/notificationgroups/group2",
+            "actionGroupId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/gigtest/providers/microsoft.insights/actiongroups/group2",
             "webHookProperties": {
               "key11": "value11",
               "key12": "value12"
@@ -95,7 +93,7 @@
           "autoMitigate": false,
           "actions": [
             {
-              "actionGroupId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/gigtest/providers/microsoft.insights/notificationgroups/group2",
+              "actionGroupId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/gigtest/providers/microsoft.insights/actiongroups/group2",
               "webHookProperties": {
                 "key11": "value11",
                 "key12": "value12"
diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-03-01/examples/createOrUpdateMetricAlertMultipleResource.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-03-01/examples/createOrUpdateMetricAlertMultipleResource.json
@@ -37,7 +37,7 @@
         "autoMitigate": false,
         "actions": [
           {
-            "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/notificationgroups/group2",
+            "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/actiongroups/group2",
             "webHookProperties": {
               "key11": "value11",
               "key12": "value12"
@@ -87,7 +87,7 @@
           "autoMitigate": false,
           "actions": [
             {
-              "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/notificationgroups/group2",
+              "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/actiongroups/group2",
               "webHookProperties": {
                 "key11": "value11",
                 "key12": "value12"
diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-03-01/examples/createOrUpdateMetricAlertResourceGroup.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-03-01/examples/createOrUpdateMetricAlertResourceGroup.json
@@ -37,7 +37,7 @@
         "autoMitigate": false,
         "actions": [
           {
-            "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/notificationgroups/group2",
+            "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/actiongroups/group2",
             "webHookProperties": {
               "key11": "value11",
               "key12": "value12"
@@ -87,7 +87,7 @@
           "autoMitigate": false,
           "actions": [
             {
-              "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/notificationgroups/group2",
+              "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/actiongroups/group2",
               "webHookProperties": {
                 "key11": "value11",
                 "key12": "value12"
diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-03-01/examples/createOrUpdateMetricAlertSingleResource.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-03-01/examples/createOrUpdateMetricAlertSingleResource.json
@@ -33,7 +33,7 @@
         "autoMitigate": false,
         "actions": [
           {
-            "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/notificationgroups/group2",
+            "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/actiongroups/group2",
             "webHookProperties": {
               "key11": "value11",
               "key12": "value12"
@@ -79,7 +79,7 @@
           "autoMitigate": false,
           "actions": [
             {
-              "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/notificationgroups/group2",
+              "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/actiongroups/group2",
               "webHookProperties": {
                 "key11": "value11",
                 "key12": "value12"
diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-03-01/examples/createOrUpdateMetricAlertSubscription.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-03-01/examples/createOrUpdateMetricAlertSubscription.json
@@ -36,7 +36,7 @@
         "autoMitigate": false,
         "actions": [
           {
-            "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/notificationgroups/group2",
+            "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/actiongroups/group2",
             "webHookProperties": {
               "key11": "value11",
               "key12": "value12"
@@ -85,7 +85,7 @@
           "autoMitigate": false,
           "actions": [
             {
-              "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/notificationgroups/group2",
+              "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/actiongroups/group2",
               "webHookProperties": {
                 "key11": "value11",
                 "key12": "value12"
diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-03-01/examples/createOrUpdateMetricAlertWithDimensions.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-03-01/examples/createOrUpdateMetricAlertWithDimensions.json
@@ -0,0 +1,127 @@
+{
+  "parameters": {
+    "subscriptionId": "14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7",
+    "resourceGroupName": "gigtest",
+    "ruleName": "MetricAlertOnMultipleDimensions",
+    "api-version": "2018-03-01",
+    "parameters": {
+      "location": "global",
+      "tags": {},
+      "properties": {
+        "description": "This is the description of the rule1",
+        "enabled": true,
+        "severity": 3,
+        "windowSize": "P1D",
+        "evaluationFrequency": "PT1H",
+        "scopes": [
+          "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/gigtest/providers/Microsoft.KeyVault/vaults/keyVaultResource"
+        ],
+        "criteria": {
+          "allOf": [
+            {
+              "metricName": "Availability",
+              "metricNamespace": "Microsoft.KeyVault/vaults",
+              "operator": "GreaterThan",
+              "timeAggregation": "Average",
+              "name": "Metric1",
+              "dimensions": [
+                {
+                  "name": "ActivityName",
+                  "operator": "Include",
+                  "values": [
+                    "*"
+                  ]
+                },
+                {
+                  "name": "StatusCode",
+                  "operator": "Include",
+                  "values": [
+                    "200"
+                  ]
+                }
+              ],
+              "criterionType": "StaticThresholdCriterion",
+              "threshold": 55
+            }
+          ],
+          "odata.type": "Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria"
+        },
+        "actions": [
+          {
+            "actionGroupId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/gigtest/providers/microsoft.insights/actiongroups/group2",
+            "webHookProperties": {
+              "key11": "value11",
+              "key12": "value12"
+            }
+          }
+        ],
+        "autoMitigate": true
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "headers": {},
+      "body": {
+        "id": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/gigtest/providers/providers/microsoft.insights/metricalerts/MetricAlertWithDimensions",
+        "type": "Microsoft.Insights/metricAlerts",
+        "location": "global",
+        "tags": {
+          "hidden-link:/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.Web/sites/leoalerttest": "Resource"
+        },
+        "properties": {
+          "description": "This is the description of the rule1",
+          "severity": 3,
+          "enabled": true,
+          "scopes": [
+            "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/gigtest/providers/Microsoft.KeyVault/vaults/keyVaultResource"
+          ],
+          "evaluationFrequency": "PT1H",
+          "windowSize": "P1D",
+          "targetResourceType": "Microsoft.KeyVault/vaults",
+          "targetResourceRegion": "southcentralus",
+          "criteria": {
+            "odata.type": "Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria",
+            "allOf": [
+              {
+                "metricName": "Availability",
+                "metricNamespace": "Microsoft.KeyVault/vaults",
+                "operator": "GreaterThan",
+                "timeAggregation": "Average",
+                "name": "Metric1",
+                "dimensions": [
+                  {
+                    "name": "ActivityName",
+                    "operator": "Include",
+                    "values": [
+                      "*"
+                    ]
+                  },
+                  {
+                    "name": "StatusCode",
+                    "operator": "Include",
+                    "values": [
+                      "200"
+                    ]
+                  }
+                ],
+                "criterionType": "StaticThresholdCriterion",
+                "threshold": 55
+              }
+            ]
+          },
+          "autoMitigate": false,
+          "actions": [
+            {
+              "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/actiongroups/group2",
+              "webHookProperties": {
+                "key11": "value11",
+                "key12": "value12"
+              }
+            }
+          ]
+        }
+      }
+    }
+  }
+}
diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-03-01/examples/getDynamicMetricAlertMultipleResource.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-03-01/examples/getDynamicMetricAlertMultipleResource.json
@@ -49,7 +49,7 @@
           "autoMitigate": false,
           "actions": [
             {
-              "actionGroupId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/gigtest/providers/microsoft.insights/notificationgroups/group2",
+              "actionGroupId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/gigtest/providers/microsoft.insights/actiongroups/group2",
               "webHookProperties": {
                 "key11": "value11",
                 "key12": "value12"
diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-03-01/examples/getDynamicMetricAlertSingleResource.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-03-01/examples/getDynamicMetricAlertSingleResource.json
@@ -47,7 +47,7 @@
           "autoMitigate": false,
           "actions": [
             {
-              "actionGroupId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/gigtest/providers/microsoft.insights/notificationgroups/group2",
+              "actionGroupId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/gigtest/providers/microsoft.insights/actiongroups/group2",
               "webHookProperties": {
                 "key11": "value11",
                 "key12": "value12"
diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-03-01/examples/getMetricAlertMultipleResource.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-03-01/examples/getMetricAlertMultipleResource.json
@@ -45,7 +45,7 @@
           "autoMitigate": false,
           "actions": [
             {
-              "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/notificationgroups/group2",
+              "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/actiongroups/group2",
               "webHookProperties": {
                 "key11": "value11",
                 "key12": "value12"
diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-03-01/examples/getMetricAlertResourceGroup.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-03-01/examples/getMetricAlertResourceGroup.json
@@ -45,7 +45,7 @@
           "autoMitigate": false,
           "actions": [
             {
-              "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/notificationgroups/group2",
+              "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/actiongroups/group2",
               "webHookProperties": {
                 "key11": "value11",
                 "key12": "value12"
diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-03-01/examples/getMetricAlertSingleResource.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-03-01/examples/getMetricAlertSingleResource.json
@@ -41,7 +41,7 @@
           "autoMitigate": false,
           "actions": [
             {
-              "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/notificationgroups/group2",
+              "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/actiongroups/group2",
               "webHookProperties": {
                 "key11": "value11",
                 "key12": "value12"
diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-03-01/examples/getMetricAlertSubscription.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-03-01/examples/getMetricAlertSubscription.json
@@ -44,7 +44,7 @@
           "autoMitigate": false,
           "actions": [
             {
-              "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/notificationgroups/group2",
+              "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/actiongroups/group2",
               "webHookProperties": {
                 "key11": "value11",
                 "key12": "value12"
diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-03-01/examples/listMetricAlert.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-03-01/examples/listMetricAlert.json
@@ -41,7 +41,7 @@
               },
               "actions": [
                 {
-                  "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/notificationgroups/group2",
+                  "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/actiongroups/group2",
                   "webHookProperties": {
                     "key11": "value11",
                     "key12": "value12"
@@ -82,7 +82,7 @@
               },
               "actions": [
                 {
-                  "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/notificationgroups/group2",
+                  "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/actiongroups/group2",
                   "webHookProperties": {
                     "key11": "value11",
                     "key12": "value12"
diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-03-01/metricAlert_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-03-01/metricAlert_API.json
@@ -241,6 +241,9 @@
           },
           "Create or update a web test alert rule": {
             "$ref": "./examples/createOrUpdateWebTestMetricAlert.json"
+          },
+          "Create or update an alert rules with dimensions": {
+            "$ref": "./examples/createOrUpdateMetricAlertWithDimensions.json"
           }
         }
       },
@@ -474,7 +477,7 @@
             "type": "string",
             "description": "the dictionary of custom properties to include with the post operation. These data are appended to the webhook payload."
           },
-          "description": "The properties of a webhook object."
+          "description": "This field allows specifying custom properties, which would be appended to the alert payload sent as input to the webhook."
         }
       }
     },
@@ -520,11 +523,11 @@
         },
         "targetResourceType": {
           "type": "string",
-          "description": "the resource type of the target resource(s) on which the alert is created/updated. Mandatory for MultipleResourceMultipleMetricCriteria."
+          "description": "the resource type of the target resource(s) on which the alert is created/updated. Mandatory if the scope contains a subscription, resource group, or more than one resource."
         },
         "targetResourceRegion": {
           "type": "string",
-          "description": "the region of the target resource(s) on which the alert is created/updated. Mandatory for MultipleResourceMultipleMetricCriteria."
+          "description": "the region of the target resource(s) on which the alert is created/updated. Mandatory if the scope contains a subscription, resource group, or more than one resource."
         },
         "criteria": {
           "$ref": "#/definitions/MetricAlertCriteria",

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@`
`49`	`49`	`"autoMitigate": false,`
`50`	`50`	`"actions": [`
`51`	`51`	`{`
`52`		`- "actionGroupId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/gigtest/providers/microsoft.insights/notificationgroups/group2",`
	`52`	`+ "actionGroupId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/gigtest/providers/microsoft.insights/actiongroups/group2",`
`53`	`53`	`"webHookProperties": {`
`54`	`54`	`"key11": "value11",`
`55`	`55`	`"key12": "value12"`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@`
`47`	`47`	`"autoMitigate": false,`
`48`	`48`	`"actions": [`
`49`	`49`	`{`
`50`		`- "actionGroupId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/gigtest/providers/microsoft.insights/notificationgroups/group2",`
	`50`	`+ "actionGroupId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/gigtest/providers/microsoft.insights/actiongroups/group2",`
`51`	`51`	`"webHookProperties": {`
`52`	`52`	`"key11": "value11",`
`53`	`53`	`"key12": "value12"`