Update swagger with new properties (Azure#11901)

DeMale · Dec 11, 2020 · b00e106 · b00e106
1 parent 517488a
commit b00e106
Show file tree

Hide file tree

Showing 5 changed files with 83 additions and 14 deletions.
diff --git a/...nager/Microsoft.AlertsManagement/preview/2020-08-04-preview/ResourceHealthAlertRules.json b/...nager/Microsoft.AlertsManagement/preview/2020-08-04-preview/ResourceHealthAlertRules.json
@@ -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"
         }
       },

diff --git a/...Management/preview/2020-08-04-preview/examples/createOrUpdateResourceHealthAlertRule.json b/...Management/preview/2020-08-04-preview/examples/createOrUpdateResourceHealthAlertRule.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"
               }
             ]
           },

diff --git a/...soft.AlertsManagement/preview/2020-08-04-preview/examples/getResourceHealthAlertRule.json b/...soft.AlertsManagement/preview/2020-08-04-preview/examples/getResourceHealthAlertRule.json
@@ -24,7 +24,17 @@
                 "monitorNames": [
                   "root"
                 ],
-                "namespace": "VmGuestHealth"
+                "healthStates": [
+                  {
+                    "name": "Critical",
+                    "severity": 2
+                  },
+                  {
+                    "name": "Warning",
+                    "severity": 3
+                  }
+                ],
+                "namespace": "GuestVmHealth"
               }
             ]
           },

diff --git a/...ft.AlertsManagement/preview/2020-08-04-preview/examples/listResourceHealthAlertRules.json b/...ft.AlertsManagement/preview/2020-08-04-preview/examples/listResourceHealthAlertRules.json
@@ -25,7 +25,17 @@
                     "monitorNames": [
                       "root"
                     ],
-                    "namespace": "VmGuestHealth"
+                    "healthStates": [
+                      {
+                        "name": "Critical",
+                        "severity": 2
+                      },
+                      {
+                        "name": "Warning",
+                        "severity": 3
+                      }
+                    ],
+                    "namespace": "GuestVmHealth"
                   }
                 ]
               },

diff --git a/...ft.AlertsManagement/preview/2020-08-04-preview/examples/patchResourceHealthAlertRule.json b/...ft.AlertsManagement/preview/2020-08-04-preview/examples/patchResourceHealthAlertRule.json
@@ -17,7 +17,17 @@
               "monitorNames": [
                 "root"
               ],
-              "namespace": "VmGuestHealth"
+              "healthStates": [
+                {
+                  "name": "Critical",
+                  "severity": 2
+                },
+                {
+                  "name": "Warning",
+                  "severity": 3
+                }
+              ],
+              "namespace": "GuestVmHealth"
             }
           ]
         },
@@ -52,7 +62,17 @@
                 "monitorNames": [
                   "root"
                 ],
-                "namespace": "VmGuestHealth"
+                "healthStates": [
+                  {
+                    "name": "Critical",
+                    "severity": 2
+                  },
+                  {
+                    "name": "Warning",
+                    "severity": 3
+                  }
+                ],
+                "namespace": "GuestVmHealth"
               }
             ]
           },