Enable AvailabilityZone feature (#6043)

* Add support for AZ * Fix prettier error
Azure · Jan 30, 2022 · 6f2ab22 · 6f2ab22
1 parent 5e51808
commit 6f2ab22
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 9 deletions.
diff --git a/...ource-manager/Microsoft.Dashboard/preview/2021-09-01-preview/examples/Grafana_Create.json b/...ource-manager/Microsoft.Dashboard/preview/2021-09-01-preview/examples/Grafana_Create.json
@@ -9,7 +9,8 @@
         "name": "Standard"
       },
       "properties": {
-        "provisioningState": "Accepted"
+        "provisioningState": "Accepted",
+        "zoneRedundancy": "Enabled"
       },
       "identity": {
         "type": "systemAssigned"
@@ -32,7 +33,8 @@
         "properties": {
           "provisioningState": "Succeeded",
           "grafanaVersion": "7.1",
-          "endpoint": "my.azgrafana.io"
+          "endpoint": "my.azgrafana.io",
+          "zoneRedundancy": "Enabled"
         },
         "identity": {
           "type": "SystemAssigned"
@@ -62,7 +64,8 @@
         "properties": {
           "provisioningState": "Accepted",
           "grafanaVersion": "7.1",
-          "endpoint": "my.azgrafana.io"
+          "endpoint": "my.azgrafana.io",
+          "zoneRedundancy": "Enabled"
         },
         "tags": {
           "Environment": "Dev"

diff --git a/...resource-manager/Microsoft.Dashboard/preview/2021-09-01-preview/examples/Grafana_Get.json b/...resource-manager/Microsoft.Dashboard/preview/2021-09-01-preview/examples/Grafana_Get.json
@@ -17,7 +17,8 @@
         "properties": {
           "provisioningState": "Succeeded",
           "grafanaVersion": "7.1",
-          "endpoint": "my.azgrafana.io"
+          "endpoint": "my.azgrafana.io",
+          "zoneRedundancy": "Enabled"
         },
         "tags": {
           "Environment": "Dev"

diff --git a/...esource-manager/Microsoft.Dashboard/preview/2021-09-01-preview/examples/Grafana_List.json b/...esource-manager/Microsoft.Dashboard/preview/2021-09-01-preview/examples/Grafana_List.json
@@ -17,7 +17,8 @@
             "properties": {
               "provisioningState": "Succeeded",
               "grafanaVersion": "7.1",
-              "endpoint": "my.azgrafana.io"
+              "endpoint": "my.azgrafana.io",
+              "zoneRedundancy": "Enabled"
             },
             "tags": {
               "Environment": "Dev"

diff --git a/.../Microsoft.Dashboard/preview/2021-09-01-preview/examples/Grafana_ListByResourceGroup.json b/.../Microsoft.Dashboard/preview/2021-09-01-preview/examples/Grafana_ListByResourceGroup.json
@@ -18,7 +18,8 @@
             "properties": {
               "provisioningState": "Succeeded",
               "grafanaVersion": "7.1",
-              "endpoint": "my.azgrafana.io"
+              "endpoint": "my.azgrafana.io",
+              "zoneRedundancy": "Enabled"
             },
             "tags": {
               "Environment": "Dev"

diff --git a/...ource-manager/Microsoft.Dashboard/preview/2021-09-01-preview/examples/Grafana_Update.json b/...ource-manager/Microsoft.Dashboard/preview/2021-09-01-preview/examples/Grafana_Update.json
@@ -8,7 +8,10 @@
       "tags": {
         "Environment": "Dev 2"
       },
-      "location": "West US"
+      "location": "West US",
+      "properties": {
+        "zoneRedundancy": "Enabled"
+      }
     }
   },
   "responses": {
@@ -23,7 +26,8 @@
         "properties": {
           "provisioningState": "Succeeded",
           "grafanaVersion": "7.1",
-          "endpoint": "my.azgrafana.io"
+          "endpoint": "my.azgrafana.io",
+          "zoneRedundancy": "Enabled"
         },
         "tags": {
           "Environment": "Dev 2"

diff --git a/...on/dashboard/resource-manager/Microsoft.Dashboard/preview/2021-09-01-preview/grafana.json b/...on/dashboard/resource-manager/Microsoft.Dashboard/preview/2021-09-01-preview/grafana.json
@@ -180,7 +180,7 @@
         "tags": [
           "GrafanaResource"
         ],
-        "summary": "Create a workspace for Grafana resource.",
+        "summary": "Create or update a workspace for Grafana resource. This API is idempotent, so user can either create a new grafana or update an existing grafana.",
         "operationId": "Grafana_Create",
         "consumes": [
           "application/json"
@@ -373,6 +373,7 @@
         },
         "details": {
           "type": "array",
+          "x-ms-identifiers": [],
           "items": {
             "$ref": "#/definitions/ErrorResponseBody"
           }
@@ -457,6 +458,18 @@
           "description": "The endpoint of the Grafana instance.",
           "type": "string",
           "readOnly": true
+        },
+        "zoneRedundancy": {
+          "$ref": "#/definitions/ZoneRedundancy"
+        }
+      }
+    },
+    "GrafanaResourcePropertiesUpdateParameters": {
+      "type": "object",
+      "properties": {
+        "zoneRedundancy": {
+          "description": "The high availability mode of the grafana resource.",
+          "$ref": "#/definitions/ZoneRedundancy"
         }
       }
     },
@@ -476,7 +489,12 @@
           }
         },
         "location": {
+          "description": "The location of the grafana resource.",
           "type": "string"
+        },
+        "properties": {
+          "description": "Properties specific to the grafana resource.",
+          "$ref": "#/definitions/GrafanaResourcePropertiesUpdateParameters"
         }
       }
     },
@@ -560,6 +578,7 @@
         "value": {
           "description": "List of operations supported by the Microsoft.Dashboard provider.",
           "type": "array",
+          "x-ms-identifiers": [],
           "items": {
             "$ref": "#/definitions/OperationResult"
           }
@@ -650,6 +669,18 @@
         }
       }
     },
+    "ZoneRedundancy": {
+      "enum": [
+        "Disabled",
+        "Enabled"
+      ],
+      "default": "Disabled",
+      "type": "string",
+      "x-ms-enum": {
+        "modelAsString": true,
+        "name": "ZoneRedundancy"
+      }
+    },
     "UserAssignedIdentity": {
       "type": "object",
       "properties": {