Skip to content

Commit 1c638f6

Browse files
jinghzhu-msftFredericHeem
authored andcommitted
Rename GrafanaResource as ManagedGrfana (Azure#18270)
1 parent 7aba25d commit 1c638f6

File tree

3 files changed

+22
-20
lines changed

3 files changed

+22
-20
lines changed

specification/dashboard/resource-manager/Microsoft.Dashboard/preview/2021-09-01-preview/examples/Grafana_Create.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"subscriptionId": "00000000-0000-0000-0000-000000000000",
55
"resourceGroupName": "myResourceGroup",
66
"workspaceName": "myWorkspace",
7-
"requestBody": {
7+
"requestBodyParameters": {
88
"sku": {
99
"name": "Standard"
1010
},
@@ -13,7 +13,7 @@
1313
"zoneRedundancy": "Enabled"
1414
},
1515
"identity": {
16-
"type": "systemAssigned"
16+
"type": "SystemAssigned"
1717
},
1818
"tags": {
1919
"Environment": "Dev"

specification/dashboard/resource-manager/Microsoft.Dashboard/preview/2021-09-01-preview/examples/Grafana_Update.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"subscriptionId": "00000000-0000-0000-0000-000000000000",
55
"resourceGroupName": "myResourceGroup",
66
"workspaceName": "myWorkspace",
7-
"requestBody": {
7+
"requestBodyParameters": {
88
"tags": {
99
"Environment": "Dev 2"
1010
}

specification/dashboard/resource-manager/Microsoft.Dashboard/preview/2021-09-01-preview/grafana.json

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"200": {
6868
"description": "OK. Return all resources of workspaces for Grafana under the specified subscription.",
6969
"schema": {
70-
"$ref": "#/definitions/GrafanaResourceListResponse"
70+
"$ref": "#/definitions/ManagedGrafanaListResponse"
7171
}
7272
},
7373
"default": {
@@ -112,7 +112,7 @@
112112
"200": {
113113
"description": "OK. Return all resources of workspaces for Grafana under the given resource group.",
114114
"schema": {
115-
"$ref": "#/definitions/GrafanaResourceListResponse"
115+
"$ref": "#/definitions/ManagedGrafanaListResponse"
116116
}
117117
},
118118
"default": {
@@ -160,7 +160,7 @@
160160
"200": {
161161
"description": "OK. Return the properties of the required workspace for Grafana resource.",
162162
"schema": {
163-
"$ref": "#/definitions/GrafanaResource"
163+
"$ref": "#/definitions/ManagedGrafana"
164164
}
165165
},
166166
"default": {
@@ -203,23 +203,24 @@
203203
},
204204
{
205205
"in": "body",
206-
"name": "body",
206+
"name": "requestBodyParameters",
207+
"required": true,
207208
"schema": {
208-
"$ref": "#/definitions/GrafanaResource"
209+
"$ref": "#/definitions/ManagedGrafana"
209210
}
210211
}
211212
],
212213
"responses": {
213214
"200": {
214215
"description": "OK. Successfully create a workspace for Grafana resource.",
215216
"schema": {
216-
"$ref": "#/definitions/GrafanaResource"
217+
"$ref": "#/definitions/ManagedGrafana"
217218
}
218219
},
219220
"201": {
220221
"description": "Created. The operation was successfully started and will complete asynchronously.",
221222
"schema": {
222-
"$ref": "#/definitions/GrafanaResource"
223+
"$ref": "#/definitions/ManagedGrafana"
223224
}
224225
},
225226
"default": {
@@ -266,17 +267,18 @@
266267
},
267268
{
268269
"in": "body",
269-
"name": "body",
270+
"name": "requestBodyParameters",
271+
"required": true,
270272
"schema": {
271-
"$ref": "#/definitions/GrafanaResourceUpdateParameters"
273+
"$ref": "#/definitions/ManagedGrafanaUpdateParameters"
272274
}
273275
}
274276
],
275277
"responses": {
276278
"200": {
277279
"description": "OK. Successfully update the workspace for Grafana resource.",
278280
"schema": {
279-
"$ref": "#/definitions/GrafanaResource"
281+
"$ref": "#/definitions/ManagedGrafana"
280282
}
281283
},
282284
"default": {
@@ -371,7 +373,7 @@
371373
"name": "CreatedByType"
372374
}
373375
},
374-
"GrafanaResource": {
376+
"ManagedGrafana": {
375377
"type": "object",
376378
"description": "The grafana resource type.",
377379
"x-ms-azure-resource": true,
@@ -397,7 +399,7 @@
397399
},
398400
"properties": {
399401
"description": "Properties specific to the grafana resource.",
400-
"$ref": "#/definitions/GrafanaResourceProperties"
402+
"$ref": "#/definitions/ManagedGrafanaProperties"
401403
},
402404
"identity": {
403405
"description": "The managed identity of the grafana resource.",
@@ -429,21 +431,21 @@
429431
}
430432
}
431433
},
432-
"GrafanaResourceListResponse": {
434+
"ManagedGrafanaListResponse": {
433435
"type": "object",
434436
"properties": {
435437
"value": {
436438
"type": "array",
437439
"items": {
438-
"$ref": "#/definitions/GrafanaResource"
440+
"$ref": "#/definitions/ManagedGrafana"
439441
}
440442
},
441443
"nextLink": {
442444
"type": "string"
443445
}
444446
}
445447
},
446-
"GrafanaResourceProperties": {
448+
"ManagedGrafanaProperties": {
447449
"type": "object",
448450
"description": "Properties specific to the grafana resource.",
449451
"properties": {
@@ -466,7 +468,7 @@
466468
}
467469
}
468470
},
469-
"GrafanaResourceUpdateParameters": {
471+
"ManagedGrafanaUpdateParameters": {
470472
"type": "object",
471473
"description": "The parameters for a PATCH request to a grafana resource.",
472474
"properties": {
@@ -717,7 +719,7 @@
717719
"WorkspaceNameParameter": {
718720
"in": "path",
719721
"name": "workspaceName",
720-
"description": "The name of Azure Managed Grafana.",
722+
"description": "The workspace name of Azure Managed Grafana.",
721723
"required": true,
722724
"type": "string",
723725
"x-ms-parameter-location": "method"

0 commit comments

Comments
 (0)