Skip to content

Commit 3c441a2

Browse files
divya-jaydivyajay
authored and
kayousef
committed
Add specs for microsoft.monitor RP (Azure#20026)
* Add specs for microsoft.monitor RP * Split up operations API spec * Prettier fixes * Fix avocado warning * Delete unused example * Attempt to fix ServiceAPIReadiness * Fix name of body parameter in examples * Updates based on PR comments * Remove second reference to systemData * Switch operations api-version * Empty commit to re-trigger build * Fix description * Fix SDK APIs * Add Canceled to possible values of provisioning state Co-authored-by: Divya Jayaraman <[email protected]>
1 parent 078d394 commit 3c441a2

10 files changed

+1016
-0
lines changed

‎specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/MonitoringAccountsCreate.json

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "703362b3-f278-4e4b-9179-c76eaf41ffc2",
4+
"resourceGroupName": "myResourceGroup",
5+
"monitoringAccountName": "myMonitoringAccount",
6+
"api-version": "2021-06-03-preview",
7+
"monitoringAccountProperties": {
8+
"location": "eastus"
9+
}
10+
},
11+
"responses": {
12+
"200": {
13+
"body": {
14+
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myMonitoringAccount",
15+
"name": "myMonitoringAccount",
16+
"type": "Microsoft.Monitor/accounts",
17+
"location": "eastus",
18+
"tags": {
19+
"tag1": "A",
20+
"tag2": "B"
21+
},
22+
"properties": {
23+
"accountId": "2df515bf-c3ce-4920-84d4-1d9d16542d9f",
24+
"metrics": {
25+
"prometheusQueryEndpoint": "https://myMonitoringAccount-v8hx.eastus.prometheus.monitor.azure.com",
26+
"internalId": "mac_2df515bf-c3ce-4920-84d4-1d9d16542d9f"
27+
},
28+
"provisioningState": "Succeeded",
29+
"defaultIngestionSettings": {
30+
"dataCollectionRuleResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_myMonitoringAccount_eastus_managed/providers/Microsoft.Insights/dataCollectionRules/myMonitoringAccount",
31+
"dataCollectionEndpointResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_myMonitoringAccount_eastus_managed/providers/Microsoft.Insights/dataCollectionEndpoints/myMonitoringAccount"
32+
}
33+
},
34+
"systemData": {
35+
"createdBy": "user1",
36+
"createdByType": "User",
37+
"createdAt": "2021-04-01T12:34:56.1234567Z",
38+
"lastModifiedBy": "user2",
39+
"lastModifiedByType": "User",
40+
"lastModifiedAt": "2021-04-02T12:34:56.1234567Z"
41+
},
42+
"etag": "070057da-0000-0000-0000-5ba70d6c0000"
43+
}
44+
},
45+
"201": {
46+
"body": {
47+
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myMonitoringAccount",
48+
"name": "myMonitoringAccount",
49+
"type": "Microsoft.Monitor/accounts",
50+
"location": "eastus",
51+
"tags": {
52+
"tag1": "A",
53+
"tag2": "B"
54+
},
55+
"properties": {},
56+
"systemData": {
57+
"createdBy": "user1",
58+
"createdByType": "User",
59+
"createdAt": "2021-04-01T12:34:56.1234567Z",
60+
"lastModifiedBy": "user2",
61+
"lastModifiedByType": "User",
62+
"lastModifiedAt": "2021-04-02T12:34:56.1234567Z"
63+
},
64+
"etag": "070057da-0000-0000-0000-5ba70d6c0000"
65+
}
66+
}
67+
}
68+
}

‎specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/MonitoringAccountsDelete.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "703362b3-f278-4e4b-9179-c76eaf41ffc2",
4+
"resourceGroupName": "myResourceGroup",
5+
"monitoringAccountName": "myMonitoringAccount",
6+
"api-version": "2021-06-03-preview"
7+
},
8+
"responses": {
9+
"200": {},
10+
"204": {}
11+
}
12+
}

‎specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/MonitoringAccountsGet.json

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "703362b3-f278-4e4b-9179-c76eaf41ffc2",
4+
"resourceGroupName": "myResourceGroup",
5+
"monitoringAccountName": "myMonitoringAccount",
6+
"api-version": "2021-06-03-preview"
7+
},
8+
"responses": {
9+
"200": {
10+
"body": {
11+
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myMonitoringAccount",
12+
"name": "myMonitoringAccount",
13+
"type": "Microsoft.Monitor/accounts",
14+
"location": "eastus",
15+
"tags": {
16+
"tag1": "A",
17+
"tag2": "B"
18+
},
19+
"properties": {
20+
"accountId": "2df515bf-c3ce-4920-84d4-1d9d16542d9f",
21+
"metrics": {
22+
"prometheusQueryEndpoint": "https://myMonitoringAccount-v8hx.eastus.prometheus.monitor.azure.com",
23+
"internalId": "mac_2df515bf-c3ce-4920-84d4-1d9d16542d9f"
24+
},
25+
"provisioningState": "Succeeded",
26+
"defaultIngestionSettings": {
27+
"dataCollectionRuleResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_myMonitoringAccount_eastus_managed/providers/Microsoft.Insights/dataCollectionRules/myMonitoringAccount",
28+
"dataCollectionEndpointResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_myMonitoringAccount_eastus_managed/providers/Microsoft.Insights/dataCollectionEndpoints/myMonitoringAccount"
29+
}
30+
},
31+
"systemData": {
32+
"createdBy": "user1",
33+
"createdByType": "User",
34+
"createdAt": "2021-04-01T12:34:56.1234567Z",
35+
"lastModifiedBy": "user2",
36+
"lastModifiedByType": "User",
37+
"lastModifiedAt": "2021-04-02T12:34:56.1234567Z"
38+
},
39+
"etag": "070057da-0000-0000-0000-5ba70d6c0000"
40+
}
41+
}
42+
}
43+
}

‎specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/MonitoringAccountsListByResourceGroup.json

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "703362b3-f278-4e4b-9179-c76eaf41ffc2",
4+
"resourceGroupName": "myResourceGroup",
5+
"api-version": "2021-06-03-preview"
6+
},
7+
"responses": {
8+
"200": {
9+
"body": {
10+
"value": [
11+
{
12+
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myMonitoringAccount",
13+
"name": "myMonitoringAccount",
14+
"type": "Microsoft.Monitor/accounts",
15+
"location": "eastus",
16+
"tags": {
17+
"tag1": "A",
18+
"tag2": "B"
19+
},
20+
"properties": {
21+
"accountId": "2df515bf-c3ce-4920-84d4-1d9d16542d9f",
22+
"metrics": {
23+
"prometheusQueryEndpoint": "https://mymonitoringaccount-abcd.eastus.prometheus.monitor.azure.com",
24+
"internalId": "mac_2df515bf-c3ce-4920-84d4-1d9d16542d9f"
25+
},
26+
"provisioningState": "Succeeded",
27+
"defaultIngestionSettings": {
28+
"dataCollectionRuleResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_myMonitoringAccount_eastus_managed/providers/Microsoft.Insights/dataCollectionRules/myMonitoringAccount",
29+
"dataCollectionEndpointResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_myMonitoringAccount_eastus_managed/providers/Microsoft.Insights/dataCollectionEndpoints/myMonitoringAccount"
30+
}
31+
},
32+
"systemData": {
33+
"createdBy": "user1",
34+
"createdByType": "User",
35+
"createdAt": "2021-04-01T12:34:56.1234567Z",
36+
"lastModifiedBy": "user2",
37+
"lastModifiedByType": "User",
38+
"lastModifiedAt": "2021-04-02T12:34:56.1234567Z"
39+
},
40+
"etag": "070057da-0000-0000-0000-5ba70d6c0000"
41+
},
42+
{
43+
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/herMonitoringAccount",
44+
"name": "herMonitoringAccount",
45+
"type": "Microsoft.Monitor/accounts",
46+
"location": "westus",
47+
"tags": {
48+
"tag1": "A",
49+
"tag2": "B"
50+
},
51+
"properties": {
52+
"accountId": "823220c6-0415-44d8-bfb2-d5c1c9ea1172",
53+
"metrics": {
54+
"prometheusQueryEndpoint": "https://hermonitoringaccount-xywz.eastus.prometheus.monitor.azure.com",
55+
"internalId": "mac_823220c6-0415-44d8-bfb2-d5c1c9ea1172"
56+
},
57+
"provisioningState": "Succeeded",
58+
"defaultIngestionSettings": {
59+
"dataCollectionRuleResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_herMonitoringAccount_eastus_managed/providers/Microsoft.Insights/dataCollectionRules/herMonitoringAccount",
60+
"dataCollectionEndpointResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_herMonitoringAccount_eastus_managed/providers/Microsoft.Insights/dataCollectionEndpoints/herMonitoringAccount"
61+
}
62+
},
63+
"systemData": {
64+
"createdBy": "user1",
65+
"createdByType": "User",
66+
"createdAt": "2021-04-01T12:34:56.1234567Z",
67+
"lastModifiedBy": "user2",
68+
"lastModifiedByType": "User",
69+
"lastModifiedAt": "2021-04-02T12:34:56.1234567Z"
70+
},
71+
"etag": "070057da-0000-0000-0000-5ba70d6c0000"
72+
}
73+
],
74+
"nextLink": null
75+
}
76+
}
77+
}
78+
}

‎specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/MonitoringAccountsListBySubscription.json

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "703362b3-f278-4e4b-9179-c76eaf41ffc2",
4+
"api-version": "2021-06-03-preview"
5+
},
6+
"responses": {
7+
"200": {
8+
"body": {
9+
"value": [
10+
{
11+
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myMonitoringAccount",
12+
"name": "myMonitoringAccount",
13+
"type": "Microsoft.Monitor/accounts",
14+
"location": "eastus",
15+
"tags": {
16+
"tag1": "A",
17+
"tag2": "B"
18+
},
19+
"properties": {
20+
"accountId": "2df515bf-c3ce-4920-84d4-1d9d16542d9f",
21+
"metrics": {
22+
"prometheusQueryEndpoint": "https://myMonitoringAccount-v8hx.eastus.prometheus.monitor.azure.com",
23+
"internalId": "mac_2df515bf-c3ce-4920-84d4-1d9d16542d9f"
24+
},
25+
"provisioningState": "Succeeded",
26+
"defaultIngestionSettings": {
27+
"dataCollectionRuleResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_myMonitoringAccount_eastus_managed/providers/Microsoft.Insights/dataCollectionRules/myMonitoringAccount",
28+
"dataCollectionEndpointResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_myMonitoringAccount_eastus_managed/providers/Microsoft.Insights/dataCollectionEndpoints/myMonitoringAccount"
29+
}
30+
},
31+
"systemData": {
32+
"createdBy": "user1",
33+
"createdByType": "User",
34+
"createdAt": "2021-04-01T12:34:56.1234567Z",
35+
"lastModifiedBy": "user2",
36+
"lastModifiedByType": "User",
37+
"lastModifiedAt": "2021-04-02T12:34:56.1234567Z"
38+
},
39+
"etag": "070057da-0000-0000-0000-5ba70d6c0000"
40+
},
41+
{
42+
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/herResourceGroup/providers/Microsoft.Monitor/accounts/herMonitoringAccount",
43+
"name": "herMonitoringAccount",
44+
"type": "Microsoft.Monitor/accounts",
45+
"location": "westus",
46+
"tags": {
47+
"tag1": "A",
48+
"tag2": "B"
49+
},
50+
"properties": {
51+
"accountId": "823220c6-0415-44d8-bfb2-d5c1c9ea1172",
52+
"metrics": {
53+
"prometheusQueryEndpoint": "https://hermonitoringaccount-xywz.eastus.prometheus.monitor.azure.com",
54+
"internalId": "mac_823220c6-0415-44d8-bfb2-d5c1c9ea1172"
55+
},
56+
"provisioningState": "Succeeded",
57+
"defaultIngestionSettings": {
58+
"dataCollectionRuleResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_herMonitoringAccount_eastus_managed/providers/Microsoft.Insights/dataCollectionRules/herMonitoringAccount",
59+
"dataCollectionEndpointResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_herMonitoringAccount_eastus_managed/providers/Microsoft.Insights/dataCollectionEndpoints/herMonitoringAccount"
60+
}
61+
},
62+
"systemData": {
63+
"createdBy": "user1",
64+
"createdByType": "User",
65+
"createdAt": "2021-04-01T12:34:56.1234567Z",
66+
"lastModifiedBy": "user2",
67+
"lastModifiedByType": "User",
68+
"lastModifiedAt": "2021-04-02T12:34:56.1234567Z"
69+
},
70+
"etag": "070057da-0000-0000-0000-5ba70d6c0000"
71+
}
72+
],
73+
"nextLink": null
74+
}
75+
}
76+
}
77+
}

‎specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/MonitoringAccountsUpdate.json

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "703362b3-f278-4e4b-9179-c76eaf41ffc2",
4+
"resourceGroupName": "myResourceGroup",
5+
"monitoringAccountName": "myMonitoringAccount",
6+
"api-version": "2021-06-03-preview",
7+
"monitoringAccountProperties": {
8+
"tags": {
9+
"tag1": "A",
10+
"tag2": "B",
11+
"tag3": "C"
12+
}
13+
}
14+
},
15+
"responses": {
16+
"200": {
17+
"body": {
18+
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myMonitoringAccount",
19+
"name": "myMonitoringAccount",
20+
"type": "Microsoft.Monitor/accounts",
21+
"location": "eastus",
22+
"tags": {
23+
"tag1": "A",
24+
"tag2": "B",
25+
"tag3": "C"
26+
},
27+
"properties": {
28+
"accountId": "2df515bf-c3ce-4920-84d4-1d9d16542d9f",
29+
"metrics": {
30+
"prometheusQueryEndpoint": "https://myMonitoringAccount-v8hx.eastus.prometheus.monitor.azure.com",
31+
"internalId": "mac_2df515bf-c3ce-4920-84d4-1d9d16542d9f"
32+
},
33+
"provisioningState": "Succeeded",
34+
"defaultIngestionSettings": {
35+
"dataCollectionRuleResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_myMonitoringAccount_eastus_managed/providers/Microsoft.Insights/dataCollectionRules/myMonitoringAccount",
36+
"dataCollectionEndpointResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_myMonitoringAccount_eastus_managed/providers/Microsoft.Insights/dataCollectionEndpoints/myMonitoringAccount"
37+
}
38+
},
39+
"systemData": {
40+
"createdBy": "user1",
41+
"createdByType": "User",
42+
"createdAt": "2021-04-01T12:34:56.1234567Z",
43+
"lastModifiedBy": "user2",
44+
"lastModifiedByType": "User",
45+
"lastModifiedAt": "2021-04-02T12:34:56.1234567Z"
46+
},
47+
"etag": "070057da-0000-0000-0000-5ba70d6c0000"
48+
}
49+
}
50+
}
51+
}

0 commit comments

Comments
 (0)