Skip to content

Commit 2e59ae8

Browse files
yjsong11Younjin Song
authored and
zman-ms
committed
Add 2023-09-01 to Microsoft.Dashboard (#26325)
* Adds base for updating Microsoft.Dashboard from version preview/2022-10-01-preview to version 2023-09-01 * Updates readme * Updates API version in new specs and examples * minor fixes --------- Co-authored-by: Younjin Song <[email protected]>
1 parent 6c51ecc commit 2e59ae8

23 files changed

+3147
-3
lines changed

‎specification/dashboard/resource-manager/Microsoft.Dashboard/stable/2023-09-01/examples/EnterpriseDetails_Post.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"parameters": {
3+
"api-version": "2023-09-01",
4+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
5+
"resourceGroupName": "myResourceGroup",
6+
"workspaceName": "myWorkspace"
7+
},
8+
"responses": {
9+
"200": {
10+
"body": {
11+
"saasSubscriptionDetails": {
12+
"planId": "amg_globalplan",
13+
"offerId": "amg_test",
14+
"publisherId": "isvtestuklegacy",
15+
"term": {
16+
"termUnit": "P1M",
17+
"startDate": "2022-10-04T00:00:00Z",
18+
"endDate": "2022-11-03T00:00:00Z"
19+
}
20+
},
21+
"marketplaceTrialQuota": {
22+
"availablePromotion": "None",
23+
"grafanaResourceId": "/subscriptions/e1e3b30d-e7ec-4e25-8587-db037bcb9a4d/resourcegroups/amg-local-script-test-rg/providers/microsoft.dashboard/grafana/eus2-enterprise-1001-07",
24+
"trialStartAt": "2022-10-04T01:06:00.447Z",
25+
"trialEndAt": "2022-11-03T01:06:00.447Z"
26+
}
27+
}
28+
}
29+
}
30+
}

‎specification/dashboard/resource-manager/Microsoft.Dashboard/stable/2023-09-01/examples/Grafana_Create.json

Lines changed: 176 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,176 @@
1+
{
2+
"parameters": {
3+
"api-version": "2023-09-01",
4+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
5+
"resourceGroupName": "myResourceGroup",
6+
"workspaceName": "myWorkspace",
7+
"requestBodyParameters": {
8+
"sku": {
9+
"name": "Standard"
10+
},
11+
"properties": {
12+
"publicNetworkAccess": "Enabled",
13+
"zoneRedundancy": "Enabled",
14+
"apiKey": "Enabled",
15+
"deterministicOutboundIP": "Enabled",
16+
"grafanaConfigurations": {
17+
"smtp": {
18+
"enabled": true,
19+
"host": "smtp.sendemail.com:587",
20+
"user": "username",
21+
"password": "<password>",
22+
"fromAddress": "[email protected]",
23+
"fromName": "emailsender",
24+
"startTLSPolicy": "OpportunisticStartTLS",
25+
"skipVerify": true
26+
}
27+
},
28+
"grafanaIntegrations": {
29+
"azureMonitorWorkspaceIntegrations": [
30+
{
31+
"azureMonitorWorkspaceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/providers/microsoft.monitor/accounts/myAzureMonitorWorkspace"
32+
}
33+
]
34+
},
35+
"enterpriseConfigurations": {
36+
"marketplacePlanId": "myPlanId",
37+
"marketplaceAutoRenew": "Enabled"
38+
},
39+
"grafanaPlugins": {
40+
"sample-plugin-id": {}
41+
},
42+
"grafanaMajorVersion": "9"
43+
},
44+
"identity": {
45+
"type": "SystemAssigned"
46+
},
47+
"tags": {
48+
"Environment": "Dev"
49+
},
50+
"location": "West US"
51+
}
52+
},
53+
"responses": {
54+
"200": {
55+
"body": {
56+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/grafana/myWorkspace",
57+
"name": "myWorkspace",
58+
"type": "Microsoft.Dashboard/grafana",
59+
"sku": {
60+
"name": "Standard"
61+
},
62+
"properties": {
63+
"provisioningState": "Succeeded",
64+
"grafanaVersion": "9.4.5",
65+
"endpoint": "https://myworkspace-abcdefghijklmnop.wus.grafana.azure.com",
66+
"zoneRedundancy": "Enabled",
67+
"apiKey": "Enabled",
68+
"deterministicOutboundIP": "Enabled",
69+
"outboundIPs": [
70+
"192.168.0.1",
71+
"192.168.0.2"
72+
],
73+
"publicNetworkAccess": "Enabled",
74+
"autoGeneratedDomainNameLabelScope": "TenantReuse",
75+
"grafanaConfigurations": {
76+
"smtp": {
77+
"enabled": true,
78+
"host": "smtp.sendemail.com:587",
79+
"user": "username",
80+
"fromAddress": "[email protected]",
81+
"fromName": "emailsender",
82+
"startTLSPolicy": "OpportunisticStartTLS",
83+
"skipVerify": true
84+
}
85+
},
86+
"grafanaIntegrations": {
87+
"azureMonitorWorkspaceIntegrations": [
88+
{
89+
"azureMonitorWorkspaceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/providers/microsoft.monitor/accounts/myAzureMonitorWorkspace"
90+
}
91+
]
92+
},
93+
"enterpriseConfigurations": {
94+
"marketplacePlanId": "myPlanId",
95+
"marketplaceAutoRenew": "Enabled"
96+
},
97+
"grafanaPlugins": {
98+
"sample-plugin-id": {
99+
"pluginId": "sample-plugin-id"
100+
}
101+
},
102+
"grafanaMajorVersion": "9"
103+
},
104+
"identity": {
105+
"type": "SystemAssigned"
106+
},
107+
"tags": {
108+
"Environment": "Dev"
109+
},
110+
"location": "West US",
111+
"systemData": {
112+
"createdBy": "string",
113+
"createdByType": "User",
114+
"createdAt": "2020-02-03T01:01:01.1075056Z",
115+
"lastModifiedBy": "string",
116+
"lastModifiedByType": "User",
117+
"lastModifiedAt": "2020-02-04T02:03:01.1974346Z"
118+
}
119+
}
120+
},
121+
"201": {
122+
"headers": {
123+
"Azure-AsyncOperation": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Dashboard/locations/eastus2/operationStatuses/sample-op-status?api-version=2023-09-01"
124+
},
125+
"body": {
126+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/grafana/myWorkspace",
127+
"name": "myWorkspace",
128+
"type": "Microsoft.Dashboard/grafana",
129+
"sku": {
130+
"name": "Standard"
131+
},
132+
"properties": {
133+
"provisioningState": "Accepted",
134+
"grafanaVersion": "9.4.5",
135+
"endpoint": "https://myworkspace-abcdefghijklmnop.wus.grafana.azure.com",
136+
"zoneRedundancy": "Enabled",
137+
"apiKey": "Enabled",
138+
"deterministicOutboundIP": "Enabled",
139+
"publicNetworkAccess": "Enabled",
140+
"autoGeneratedDomainNameLabelScope": "TenantReuse",
141+
"grafanaConfigurations": {
142+
"smtp": {
143+
"enabled": true,
144+
"host": "smtp.sendemail.com:587",
145+
"user": "username",
146+
"fromAddress": "[email protected]",
147+
"fromName": "emailsender",
148+
"startTLSPolicy": "OpportunisticStartTLS",
149+
"skipVerify": true
150+
}
151+
},
152+
"grafanaIntegrations": {
153+
"azureMonitorWorkspaceIntegrations": [
154+
{
155+
"azureMonitorWorkspaceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/providers/microsoft.monitor/accounts/myAzureMonitorWorkspace"
156+
}
157+
]
158+
},
159+
"grafanaMajorVersion": "9"
160+
},
161+
"tags": {
162+
"Environment": "Dev"
163+
},
164+
"location": "West US",
165+
"systemData": {
166+
"createdBy": "string",
167+
"createdByType": "User",
168+
"createdAt": "2020-02-03T01:01:01.1075056Z",
169+
"lastModifiedBy": "string",
170+
"lastModifiedByType": "User",
171+
"lastModifiedAt": "2020-02-04T02:03:01.1974346Z"
172+
}
173+
}
174+
}
175+
}
176+
}

‎specification/dashboard/resource-manager/Microsoft.Dashboard/stable/2023-09-01/examples/Grafana_Delete.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"parameters": {
3+
"api-version": "2023-09-01",
4+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
5+
"resourceGroupName": "myResourceGroup",
6+
"workspaceName": "myWorkspace"
7+
},
8+
"responses": {
9+
"200": {},
10+
"202": {
11+
"headers": {
12+
"Azure-AsyncOperation": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Dashboard/locations/eastus2/operationStatuses/sample-op-status?api-version=2023-09-01"
13+
}
14+
},
15+
"204": {}
16+
}
17+
}

‎specification/dashboard/resource-manager/Microsoft.Dashboard/stable/2023-09-01/examples/Grafana_FetchAvailablePlugins.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"parameters": {
3+
"api-version": "2023-09-01",
4+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
5+
"resourceGroupName": "myResourceGroup",
6+
"workspaceName": "myWorkspace"
7+
},
8+
"responses": {
9+
"200": {
10+
"body": {
11+
"value": [
12+
{
13+
"name": "Plugin A",
14+
"pluginId": "plugin-a"
15+
},
16+
{
17+
"name": "Plugin B",
18+
"pluginId": "plugin-b"
19+
}
20+
]
21+
}
22+
}
23+
}
24+
}

‎specification/dashboard/resource-manager/Microsoft.Dashboard/stable/2023-09-01/examples/Grafana_Get.json

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
{
2+
"parameters": {
3+
"api-version": "2023-09-01",
4+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
5+
"resourceGroupName": "myResourceGroup",
6+
"workspaceName": "myWorkspace"
7+
},
8+
"responses": {
9+
"200": {
10+
"body": {
11+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/grafana/myWorkspace",
12+
"name": "myWorkspace",
13+
"type": "Microsoft.Dashboard/grafana",
14+
"sku": {
15+
"name": "Standard"
16+
},
17+
"properties": {
18+
"provisioningState": "Succeeded",
19+
"grafanaVersion": "9.4.5",
20+
"endpoint": "https://myworkspace-abcdefghijklmnop.wus.grafana.azure.com",
21+
"zoneRedundancy": "Enabled",
22+
"apiKey": "Enabled",
23+
"deterministicOutboundIP": "Enabled",
24+
"outboundIPs": [
25+
"192.168.0.1",
26+
"192.168.0.2"
27+
],
28+
"publicNetworkAccess": "Enabled",
29+
"autoGeneratedDomainNameLabelScope": "TenantReuse",
30+
"grafanaConfigurations": {
31+
"smtp": {
32+
"enabled": true,
33+
"host": "smtp.sendemail.com:587",
34+
"user": "username",
35+
"fromAddress": "[email protected]",
36+
"fromName": "emailsender",
37+
"startTLSPolicy": "OpportunisticStartTLS",
38+
"skipVerify": true
39+
}
40+
},
41+
"grafanaIntegrations": {
42+
"azureMonitorWorkspaceIntegrations": [
43+
{
44+
"azureMonitorWorkspaceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/providers/microsoft.monitor/accounts/myAzureMonitorWorkspace"
45+
}
46+
]
47+
},
48+
"enterpriseConfigurations": {
49+
"marketplacePlanId": "myPlanId",
50+
"marketplaceAutoRenew": "Enabled"
51+
},
52+
"grafanaPlugins": {
53+
"sample-plugin-id": {
54+
"pluginId": "sample-plugin-id"
55+
}
56+
},
57+
"grafanaMajorVersion": "9"
58+
},
59+
"tags": {
60+
"Environment": "Dev"
61+
},
62+
"location": "West US",
63+
"systemData": {
64+
"createdBy": "string",
65+
"createdByType": "User",
66+
"createdAt": "2020-02-03T01:01:01.1075056Z",
67+
"lastModifiedBy": "string",
68+
"lastModifiedByType": "User",
69+
"lastModifiedAt": "2020-02-04T02:03:01.1974346Z"
70+
}
71+
}
72+
}
73+
}
74+
}

‎specification/dashboard/resource-manager/Microsoft.Dashboard/stable/2023-09-01/examples/Grafana_List.json

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
{
2+
"parameters": {
3+
"api-version": "2023-09-01",
4+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
5+
"resourceGroupName": "myResourceGroup"
6+
},
7+
"responses": {
8+
"200": {
9+
"body": {
10+
"value": [
11+
{
12+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/grafana/myWorkspace",
13+
"name": "myWorkspace",
14+
"type": "Microsoft.Dashboard/grafana",
15+
"sku": {
16+
"name": "Standard"
17+
},
18+
"properties": {
19+
"provisioningState": "Succeeded",
20+
"grafanaVersion": "9.4.5",
21+
"endpoint": "https://myworkspace-abcdefghijklmnop.wus.grafana.azure.com",
22+
"zoneRedundancy": "Enabled",
23+
"apiKey": "Enabled",
24+
"deterministicOutboundIP": "Enabled",
25+
"outboundIPs": [
26+
"192.168.0.1",
27+
"192.168.0.2"
28+
],
29+
"publicNetworkAccess": "Enabled",
30+
"autoGeneratedDomainNameLabelScope": "TenantReuse",
31+
"grafanaConfigurations": {
32+
"smtp": {
33+
"enabled": true,
34+
"host": "smtp.sendemail.com:587",
35+
"user": "username",
36+
"fromAddress": "[email protected]",
37+
"fromName": "emailsender",
38+
"startTLSPolicy": "OpportunisticStartTLS",
39+
"skipVerify": true
40+
}
41+
},
42+
"grafanaIntegrations": {
43+
"azureMonitorWorkspaceIntegrations": [
44+
{
45+
"azureMonitorWorkspaceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/providers/microsoft.monitor/accounts/myAzureMonitorWorkspace"
46+
}
47+
]
48+
},
49+
"enterpriseConfigurations": {
50+
"marketplacePlanId": "myPlanId",
51+
"marketplaceAutoRenew": "Enabled"
52+
},
53+
"grafanaPlugins": {
54+
"sample-plugin-id": {
55+
"pluginId": "sample-plugin-id"
56+
}
57+
},
58+
"grafanaMajorVersion": "9"
59+
},
60+
"tags": {
61+
"Environment": "Dev"
62+
},
63+
"location": "West US"
64+
}
65+
]
66+
}
67+
}
68+
}
69+
}

0 commit comments

Comments
 (0)