Rename GrafanaResource as ManagedGrafana (Azure#6597)

* Rename GrafanaResource as ManagedGrafana * Fix oav error
leni-msft · Mar 25, 2022 · 1c4833b · 1c4833b
1 parent 8d7e499
commit 1c4833b
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 45 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
@@ -4,7 +4,7 @@
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "workspaceName": "myWorkspace",
-    "requestBody": {
+    "requestBodyParameters": {
       "sku": {
         "name": "Standard"
       },
@@ -13,7 +13,7 @@
         "zoneRedundancy": "Enabled"
       },
       "identity": {
-        "type": "systemAssigned"
+        "type": "SystemAssigned"
       },
       "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
@@ -4,7 +4,7 @@
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "workspaceName": "myWorkspace",
-    "requestBody": {
+    "requestBodyParameters": {
       "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
@@ -67,7 +67,7 @@
           "200": {
             "description": "OK. Return all resources of workspaces for Grafana under the specified subscription.",
             "schema": {
-              "$ref": "#/definitions/GrafanaResourceListResponse"
+              "$ref": "#/definitions/ManagedGrafanaListResponse"
             }
           },
           "default": {
@@ -112,7 +112,7 @@
           "200": {
             "description": "OK. Return all resources of workspaces for Grafana under the given resource group.",
             "schema": {
-              "$ref": "#/definitions/GrafanaResourceListResponse"
+              "$ref": "#/definitions/ManagedGrafanaListResponse"
             }
           },
           "default": {
@@ -160,7 +160,7 @@
           "200": {
             "description": "OK. Return the properties of the required workspace for Grafana resource.",
             "schema": {
-              "$ref": "#/definitions/GrafanaResource"
+              "$ref": "#/definitions/ManagedGrafana"
             }
           },
           "default": {
@@ -203,23 +203,24 @@
           },
           {
             "in": "body",
-            "name": "body",
+            "name": "requestBodyParameters",
+            "required": true,
             "schema": {
-              "$ref": "#/definitions/GrafanaResource"
+              "$ref": "#/definitions/ManagedGrafana"
             }
           }
         ],
         "responses": {
           "200": {
             "description": "OK. Successfully create a workspace for Grafana resource.",
             "schema": {
-              "$ref": "#/definitions/GrafanaResource"
+              "$ref": "#/definitions/ManagedGrafana"
             }
           },
           "201": {
             "description": "Created. The operation was successfully started and will complete asynchronously.",
             "schema": {
-              "$ref": "#/definitions/GrafanaResource"
+              "$ref": "#/definitions/ManagedGrafana"
             }
           },
           "default": {
@@ -266,17 +267,18 @@
           },
           {
             "in": "body",
-            "name": "body",
+            "name": "requestBodyParameters",
+            "required": true,
             "schema": {
-              "$ref": "#/definitions/GrafanaResourceUpdateParameters"
+              "$ref": "#/definitions/ManagedGrafanaUpdateParameters"
             }
           }
         ],
         "responses": {
           "200": {
             "description": "OK. Successfully update the workspace for Grafana resource.",
             "schema": {
-              "$ref": "#/definitions/GrafanaResource"
+              "$ref": "#/definitions/ManagedGrafana"
             }
           },
           "default": {
@@ -392,7 +394,20 @@
         }
       }
     },
-    "GrafanaResource": {
+    "LastModifiedByType": {
+      "enum": [
+        "User",
+        "Application",
+        "ManagedIdentity",
+        "Key"
+      ],
+      "type": "string",
+      "x-ms-enum": {
+        "modelAsString": true,
+        "name": "LastModifiedByType"
+      }
+    },
+    "ManagedGrafana": {
       "type": "object",
       "description": "The grafana resource type.",
       "x-ms-azure-resource": true,
@@ -418,7 +433,7 @@
         },
         "properties": {
           "description": "Properties specific to the grafana resource.",
-          "$ref": "#/definitions/GrafanaResourceProperties"
+          "$ref": "#/definitions/ManagedGrafanaProperties"
         },
         "identity": {
           "description": "The managed identity of the grafana resource.",
@@ -450,21 +465,21 @@
         }
       }
     },
-    "GrafanaResourceListResponse": {
+    "ManagedGrafanaListResponse": {
       "type": "object",
       "properties": {
         "value": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/GrafanaResource"
+            "$ref": "#/definitions/ManagedGrafana"
           }
         },
         "nextLink": {
           "type": "string"
         }
       }
     },
-    "GrafanaResourceProperties": {
+    "ManagedGrafanaProperties": {
       "type": "object",
       "description": "Properties specific to the grafana resource.",
       "properties": {
@@ -487,7 +502,7 @@
         }
       }
     },
-    "GrafanaResourceUpdateParameters": {
+    "ManagedGrafanaUpdateParameters": {
       "type": "object",
       "description": "The parameters for a PATCH request to a grafana resource.",
       "properties": {
@@ -504,19 +519,6 @@
         }
       }
     },
-    "LastModifiedByType": {
-      "enum": [
-        "User",
-        "Application",
-        "ManagedIdentity",
-        "Key"
-      ],
-      "type": "string",
-      "x-ms-enum": {
-        "modelAsString": true,
-        "name": "LastModifiedByType"
-      }
-    },
     "ManagedIdentity": {
       "description": "The managed identity of a resource.",
       "type": "object",
@@ -703,18 +705,6 @@
         }
       }
     },
-    "ZoneRedundancy": {
-      "enum": [
-        "Disabled",
-        "Enabled"
-      ],
-      "default": "Disabled",
-      "type": "string",
-      "x-ms-enum": {
-        "modelAsString": true,
-        "name": "ZoneRedundancy"
-      }
-    },
     "UserAssignedIdentity": {
       "type": "object",
       "properties": {
@@ -729,6 +719,18 @@
           "readOnly": true
         }
       }
+    },
+    "ZoneRedundancy": {
+      "enum": [
+        "Disabled",
+        "Enabled"
+      ],
+      "default": "Disabled",
+      "type": "string",
+      "x-ms-enum": {
+        "modelAsString": true,
+        "name": "ZoneRedundancy"
+      }
     }
   },
   "securityDefinitions": {
@@ -746,7 +748,7 @@
     "WorkspaceNameParameter": {
       "in": "path",
       "name": "workspaceName",
-      "description": "The name of Azure Managed Grafana.",
+      "description": "The workspace name of Azure Managed Grafana.",
       "required": true,
       "type": "string",
       "x-ms-parameter-location": "method"