Merge remote-tracking branch 'upstream/master'

Author: zhaomuzhi

.azure-pipelines/azure-pipelines-data-container.yml

@@ -39,4 +39,3 @@ steps:
     repository: $(CONTAINER_REGISTRY_REPOSITORY_NAME)
     tags: |
       latest
-      $(IMAGE_TAG_PREFIX)$(Build.BuildNumber)

.github/PULL_REQUEST_TEMPLATE.md

@@ -48,6 +48,6 @@ If there are following updates in the PR, ensure to request an approval from API
 - [ ] Updating API in stable version with Breaking Change Validation errors
 - [ ] Updating API(s) in preview over 1 year
 
-**Action**: to initiate an evaluation of the breaking change, create a new intake using the [template for breaking changes](https://msazure.visualstudio.com/One/_workitems/create/Scenario?templateId=d1c215ec-5d6a-4cb3-a193-95ddd0a1ba96&ownerId=85bb92fb-21fe-41ca-9309-47f2c5f57515). Addition details on the process and office hours are on the [Breaking change Wiki](https://dev.azure.com/msazure/AzureWiki/_wiki/wikis/AzureWiki.wiki/37684/Breaking-Changes).
+**Action**: to initiate an evaluation of the breaking change, create a new intake using the [template for breaking changes](https://aka.ms/Breakingchangetemplate). Addition details on the process and office hours are on the [Breaking change Wiki](https://dev.azure.com/msazure/AzureWiki/_wiki/wikis/AzureWiki.wiki/37684/Breaking-Changes).
 
-Please follow the link to find more details on [PR review process](https://aka.ms/SwaggerPRReview).
+Please follow the link to find more details on [PR review process](https://aka.ms/SwaggerPRReview).

.github/comment.yml

@@ -19,7 +19,7 @@
 - rule:
     type: label
     label: BreakingChangeReviewRequired
-    onLabeledComments: "Hi @${PRAuthor}, one or multiple breaking change(s) is detected in your PR. Please check out the breaking change(s), and provide business justification in the PR comment and @ PR assignee why you must have these change(s), and how external customer impact can be mitigated. Please ensure to follow [breaking change policy](https://aka.ms/AzBreakingChangesPolicy) to request breaking change review and approval before proceeding swagger PR review. </br>**Action**: To initiate an evaluation of the breaking change, create a new intake using the [template for breaking changes](https://msazure.visualstudio.com/One/_workitems/create/Scenario?templateId=d1c215ec-5d6a-4cb3-a193-95ddd0a1ba96&ownerId=85bb92fb-21fe-41ca-9309-47f2c5f57515). Addition details on the process and office hours are on the [Breaking change Wiki](https://dev.azure.com/msazure/AzureWiki/_wiki/wikis/AzureWiki.wiki/37684/Breaking-Changes).</br> If you think it is false positive breaking change, please provide the reasons in the PR comment, report to Swagger Tooling Team via https://aka.ma/swaggerfeedback."
+    onLabeledComments: "Hi @${PRAuthor}, one or multiple breaking change(s) is detected in your PR. Please check out the breaking change(s), and provide business justification in the PR comment and @ PR assignee why you must have these change(s), and how external customer impact can be mitigated. Please ensure to follow [breaking change policy](https://aka.ms/AzBreakingChangesPolicy) to request breaking change review and approval before proceeding swagger PR review. </br>**Action**: To initiate an evaluation of the breaking change, create a new intake using the [template for breaking changes](https://aka.ms/Breakingchangetemplate). Addition details on the process and office hours are on the [Breaking change Wiki](https://dev.azure.com/msazure/AzureWiki/_wiki/wikis/AzureWiki.wiki/37684/Breaking-Changes).</br> If you think it is false positive breaking change, please provide the reasons in the PR comment, report to Swagger Tooling Team via https://aka.ma/swaggerfeedback."
 
 - rule:
     type: label

.github/pull_request_assignment.yml

@@ -20,7 +20,6 @@
     reviewers:
       - anuchandy
       - jhendrixMSFT
-      - lmazuel
       - tjprescott
 
 

CODEOWNERS

@@ -78,3 +78,4 @@
 /specification/trafficmanager/ @allencal @hrkulkarmsft
 /specification/web/ @naveedaz @Azure/azure-app-service-control-plane
 /profile/ @shahabhijeet
+/specification/**/*.md @lirenhe

custom-words.txt

@@ -1014,6 +1014,7 @@ mbaldwin
 Mbps
 MCAS
 MDATP
+mebibytes
 mediaservices
 Mesos
 messagingplan

…ation/sdkautomation/sdk_customization.md documentation/sdkautomation/README.mddocumentation/sdkautomation/sdk_customization.md renamed to documentation/sdkautomation/README.md documentation/sdkautomation/sdk_customization.md renamed to documentation/sdkautomation/README.md

@@ -457,7 +457,7 @@
         "namespace": {
           "type": "string",
           "enum": [
-            "VmGuestHealth"
+            "GuestVmHealth"
           ],
           "x-ms-enum": {
             "name": "HealthAlertsNamespace",
@@ -472,17 +472,27 @@
       "description": "The rule criterion that defines the conditions of the alert rule."
     },
     "VmGuestHealthAlertCriterion": {
-      "x-ms-discriminator-value": "VmGuestHealth",
+      "x-ms-discriminator-value": "GuestVmHealth",
       "type": "object",
       "allOf": [
         {
           "$ref": "#/definitions/HealthAlertCriterion"
         }
       ],
       "properties": {
-        "healthMonitorName": {
-          "type": "string",
-          "description": "Name of health monitor on which to define alert"
+        "monitorNames": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Names of health monitor on which to define alert"
+        },
+        "monitorTypes": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Names of health monitor type on which to define alert"
         },
         "healthStates": {
           "type": "array",
@@ -493,7 +503,7 @@
         }
       },
       "required": [
-        "healthMonitorName"
+        "healthStates"
       ],
       "description": "Specifies the health alert criteria to alert on."
     },
@@ -502,10 +512,19 @@
       "properties": {
         "healthStateName": {
           "type": "string",
-          "description": "Health state"
+          "description": "Health state name",
+          "enum": [
+            "Warning",
+            "Critical"
+          ],
+          "x-ms-enum": {
+            "name": "HealthStateName",
+            "modelAsString": true
+          }
         },
         "severity": {
-          "type": "string",
+          "type": "integer",
+          "format": "int64",
           "description": "Severity of alert fired"
         }
       },

specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/preview/2020-08-04-preview/ResourceHealthAlertRules.json

@@ -18,7 +18,17 @@
               "monitorNames": [
                 "root"
               ],
-              "namespace": "VmGuestHealth"
+              "healthStates": [
+                {
+                  "name": "Critical",
+                  "severity": 2
+                },
+                {
+                  "name": "Warning",
+                  "severity": 3
+                }
+              ],
+              "namespace": "GuestVmHealth"
             }
           ]
         },
@@ -51,7 +61,7 @@
             "allOf": [
               {
                 "monitorNames": "root",
-                "namespace": "VmGuestHealth"
+                "namespace": "GuestVmHealth"
               }
             ]
           },

specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/preview/2020-08-04-preview/examples/createOrUpdateResourceHealthAlertRule.json

@@ -24,7 +24,17 @@
                 "monitorNames": [
                   "root"
                 ],
-                "namespace": "VmGuestHealth"
+                "healthStates": [
+                  {
+                    "name": "Critical",
+                    "severity": 2
+                  },
+                  {
+                    "name": "Warning",
+                    "severity": 3
+                  }
+                ],
+                "namespace": "GuestVmHealth"
               }
             ]
           },