Rename GrafanaResource as ManagedGrfana (#18270)

Azure · Mar 17, 2022 · 0a52f4d · 0a52f4d
1 parent 642761c
commit 0a52f4d
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 20 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": {
@@ -371,7 +373,7 @@
         "name": "CreatedByType"
       }
     },
-    "GrafanaResource": {
+    "ManagedGrafana": {
       "type": "object",
       "description": "The grafana resource type.",
       "x-ms-azure-resource": true,
@@ -397,7 +399,7 @@
         },
         "properties": {
           "description": "Properties specific to the grafana resource.",
-          "$ref": "#/definitions/GrafanaResourceProperties"
+          "$ref": "#/definitions/ManagedGrafanaProperties"
         },
         "identity": {
           "description": "The managed identity of the grafana resource.",
@@ -429,21 +431,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": {
@@ -466,7 +468,7 @@
         }
       }
     },
-    "GrafanaResourceUpdateParameters": {
+    "ManagedGrafanaUpdateParameters": {
       "type": "object",
       "description": "The parameters for a PATCH request to a grafana resource.",
       "properties": {
@@ -717,7 +719,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"