Skip to content

Commit 14268ab

Browse files
jasondavis-MSjamlaitadelesh
authored
[Hub Generated] Review request for Microsoft.Monitor to add version stable/2023-04-03 (#23107)
* Adds base for updating Microsoft.Monitor from version preview/2021-06-03-preview to version 2023-04-03 * Updates readme * Updates API version in new specs and examples * add publicNetworkAccess * add PrivateEndpointConnections * add PrivateEndpointConnections subclasses * give PrivateEndpointConnectionProperties.ProvisioningState enum vals * give publicNetworkAccess an enum * add privateEndpointConnections and publicNetworkAccess to Create example * add PrivateEndpointConnection and PublicNetworkAccess to other examples * attempt to fix XmsIdentifierValidation linter error * attempt to fix ArrayMustHaveType linter error * attempt to fix XmsEnumValidation and retry XmsIdentifierValidation errors * attempt to fix MISSING_APIS_IN_DEFAULT_TAG * use common-type for PrivateEndpointConnection ref, remove nested fields * update Create and Delete responses for async operations * further async update * Revert "further async update" This reverts commit c9c17da. * Revert "update Create and Delete responses for async operations" This reverts commit c0b1031. * remove 201 from Create, 200 and 204 from Delete, add 202 to Delete * readd 204 to Delete * make corresponding response updates to API * add x-ms-long-running-operation: true to Delete * add x-ms-long-running-operation-options for Delete * try to fix Lro errors * try to fix errors * try to fix errors * attempt fix again * try again * continue * continue * once more * another try * last one for real * last one v2 * just one more * last or second to last one, guaranteed * attempt cleanup * Revert "attempt cleanup" This reverts commit 0fc498f. * reintroduce 201 response for PUT * remove double readme entry * resolve Go SDK duplication schema issue * revert change --------- Co-authored-by: James Lai <jamlai@microsoft.com> Co-authored-by: Chenjie Shi <tadelesh.shi@live.cn>
1 parent 6250fb2 commit 14268ab

11 files changed

+1281
-7
lines changed

‎specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json‎

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "703362b3-f278-4e4b-9179-c76eaf41ffc2",
4+
"resourceGroupName": "myResourceGroup",
5+
"azureMonitorWorkspaceName": "myAzureMonitorWorkspace",
6+
"api-version": "2023-04-03",
7+
"azureMonitorWorkspaceProperties": {
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/myAzureMonitorWorkspace",
15+
"name": "myAzureMonitorWorkspace",
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://myAzureMonitorWorkspace-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_myAzureMonitorWorkspace_eastus_managed/providers/Microsoft.Insights/dataCollectionRules/myAzureMonitorWorkspace",
31+
"dataCollectionEndpointResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_myAzureMonitorWorkspace_eastus_managed/providers/Microsoft.Insights/dataCollectionEndpoints/myAzureMonitorWorkspace"
32+
},
33+
"privateEndpointConnections": [
34+
{
35+
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myAzureMonitorWorkspace/privateEndpointConnections/myPrivateEndpointConnection",
36+
"name": "myPrivateEndpointConnection",
37+
"type": "Microsoft.Monitor/accounts/privateEndpointConnections",
38+
"properties": {
39+
"provisioningState": "Updating",
40+
"privateEndpoint": {
41+
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Network/privateEndpoints/myPrivateEndpointConnection"
42+
},
43+
"groupIds": [
44+
"prometheusMetrics"
45+
],
46+
"privateLinkServiceConnectionState": {
47+
"status": "Approved",
48+
"description": "Auto-approved",
49+
"actionsRequired": "None"
50+
}
51+
}
52+
}
53+
],
54+
"publicNetworkAccess": "Enabled"
55+
},
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+
"201": {
68+
"body": {
69+
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myAzureMonitorWorkspace",
70+
"name": "myAzureMonitorWorkspace",
71+
"type": "Microsoft.Monitor/accounts",
72+
"location": "eastus",
73+
"tags": {
74+
"tag1": "A",
75+
"tag2": "B"
76+
},
77+
"properties": {
78+
"accountId": "2df515bf-c3ce-4920-84d4-1d9d16542d9f",
79+
"metrics": {
80+
"prometheusQueryEndpoint": "https://myAzureMonitorWorkspace-v8hx.eastus.prometheus.monitor.azure.com",
81+
"internalId": "mac_2df515bf-c3ce-4920-84d4-1d9d16542d9f"
82+
},
83+
"provisioningState": "Creating",
84+
"defaultIngestionSettings": {
85+
"dataCollectionRuleResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_myAzureMonitorWorkspace_eastus_managed/providers/Microsoft.Insights/dataCollectionRules/myAzureMonitorWorkspace",
86+
"dataCollectionEndpointResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_myAzureMonitorWorkspace_eastus_managed/providers/Microsoft.Insights/dataCollectionEndpoints/myAzureMonitorWorkspace"
87+
},
88+
"privateEndpointConnections": [
89+
{
90+
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myAzureMonitorWorkspace/privateEndpointConnections/myPrivateEndpointConnection",
91+
"name": "myPrivateEndpointConnection",
92+
"type": "Microsoft.Monitor/accounts/privateEndpointConnections",
93+
"properties": {
94+
"provisioningState": "Succeeded",
95+
"privateEndpoint": {
96+
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Network/privateEndpoints/myPrivateEndpointConnection"
97+
},
98+
"groupIds": [
99+
"prometheusMetrics"
100+
],
101+
"privateLinkServiceConnectionState": {
102+
"status": "Approved",
103+
"description": "Auto-approved",
104+
"actionsRequired": "None"
105+
}
106+
}
107+
}
108+
],
109+
"publicNetworkAccess": "Enabled"
110+
},
111+
"systemData": {
112+
"createdBy": "user1",
113+
"createdByType": "User",
114+
"createdAt": "2021-04-01T12:34:56.1234567Z",
115+
"lastModifiedBy": "user2",
116+
"lastModifiedByType": "User",
117+
"lastModifiedAt": "2021-04-02T12:34:56.1234567Z"
118+
},
119+
"etag": "070057da-0000-0000-0000-5ba70d6c0000"
120+
}
121+
}
122+
}
123+
}

‎specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "703362b3-f278-4e4b-9179-c76eaf41ffc2",
4+
"resourceGroupName": "myResourceGroup",
5+
"azureMonitorWorkspaceName": "myAzureMonitorWorkspace",
6+
"api-version": "2023-04-03"
7+
},
8+
"responses": {
9+
"202": {
10+
"headers": {
11+
"Azure-AsyncOperation": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/locations/eastus/operationResults/00000000-0000-0000-0000-000000000000/AzureMonitorWorkspace/default?api-version=2023-04-03",
12+
"Location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/locations/eastus/operationStatus/default/operationId/00000000-0000-0000-0000-000000000000?api-version=2023-04-03"
13+
}
14+
},
15+
"204": {}
16+
}
17+
}

‎specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesGet.json‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "703362b3-f278-4e4b-9179-c76eaf41ffc2",
4+
"resourceGroupName": "myResourceGroup",
5+
"azureMonitorWorkspaceName": "myAzureMonitorWorkspace",
6+
"api-version": "2023-04-03"
7+
},
8+
"responses": {
9+
"200": {
10+
"body": {
11+
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myAzureMonitorWorkspace",
12+
"name": "myAzureMonitorWorkspace",
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://myAzureMonitorWorkspace-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_myAzureMonitorWorkspace_eastus_managed/providers/Microsoft.Insights/dataCollectionRules/myAzureMonitorWorkspace",
28+
"dataCollectionEndpointResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_myAzureMonitorWorkspace_eastus_managed/providers/Microsoft.Insights/dataCollectionEndpoints/myAzureMonitorWorkspace"
29+
},
30+
"privateEndpointConnections": [
31+
{
32+
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myAzureMonitorWorkspace/privateEndpointConnections/myPrivateEndpointConnection",
33+
"name": "myPrivateEndpointConnection",
34+
"type": "Microsoft.Monitor/accounts/privateEndpointConnections",
35+
"properties": {
36+
"provisioningState": "Succeeded",
37+
"privateEndpoint": {
38+
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Network/privateEndpoints/myPrivateEndpointConnection"
39+
},
40+
"groupIds": [
41+
"prometheusMetrics"
42+
],
43+
"privateLinkServiceConnectionState": {
44+
"status": "Approved",
45+
"description": "Auto-approved",
46+
"actionsRequired": "None"
47+
}
48+
}
49+
}
50+
],
51+
"publicNetworkAccess": "Enabled"
52+
},
53+
"systemData": {
54+
"createdBy": "user1",
55+
"createdByType": "User",
56+
"createdAt": "2021-04-01T12:34:56.1234567Z",
57+
"lastModifiedBy": "user2",
58+
"lastModifiedByType": "User",
59+
"lastModifiedAt": "2021-04-02T12:34:56.1234567Z"
60+
},
61+
"etag": "070057da-0000-0000-0000-5ba70d6c0000"
62+
}
63+
}
64+
}
65+
}

‎specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesListByResourceGroup.json‎

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "703362b3-f278-4e4b-9179-c76eaf41ffc2",
4+
"resourceGroupName": "myResourceGroup",
5+
"api-version": "2023-04-03"
6+
},
7+
"responses": {
8+
"200": {
9+
"body": {
10+
"value": [
11+
{
12+
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myAzureMonitorWorkspace",
13+
"name": "myAzureMonitorWorkspace",
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://myAzureMonitorWorkspace-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_myAzureMonitorWorkspace_eastus_managed/providers/Microsoft.Insights/dataCollectionRules/myAzureMonitorWorkspace",
29+
"dataCollectionEndpointResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_myAzureMonitorWorkspace_eastus_managed/providers/Microsoft.Insights/dataCollectionEndpoints/myAzureMonitorWorkspace"
30+
},
31+
"privateEndpointConnections": [
32+
{
33+
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myAzureMonitorWorkspace/privateEndpointConnections/myPrivateEndpointConnection",
34+
"name": "myPrivateEndpointConnection",
35+
"type": "Microsoft.Monitor/accounts/privateEndpointConnections",
36+
"properties": {
37+
"provisioningState": "Succeeded",
38+
"privateEndpoint": {
39+
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Network/privateEndpoints/myPrivateEndpointConnection"
40+
},
41+
"groupIds": [
42+
"prometheusMetrics"
43+
],
44+
"privateLinkServiceConnectionState": {
45+
"status": "Approved",
46+
"description": "Auto-approved",
47+
"actionsRequired": "None"
48+
}
49+
}
50+
}
51+
],
52+
"publicNetworkAccess": "Enabled"
53+
},
54+
"systemData": {
55+
"createdBy": "user1",
56+
"createdByType": "User",
57+
"createdAt": "2021-04-01T12:34:56.1234567Z",
58+
"lastModifiedBy": "user2",
59+
"lastModifiedByType": "User",
60+
"lastModifiedAt": "2021-04-02T12:34:56.1234567Z"
61+
},
62+
"etag": "070057da-0000-0000-0000-5ba70d6c0000"
63+
},
64+
{
65+
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/herAzureMonitorWorkspace",
66+
"name": "herAzureMonitorWorkspace",
67+
"type": "Microsoft.Monitor/accounts",
68+
"location": "westus",
69+
"tags": {
70+
"tag1": "A",
71+
"tag2": "B"
72+
},
73+
"properties": {
74+
"accountId": "823220c6-0415-44d8-bfb2-d5c1c9ea1172",
75+
"metrics": {
76+
"prometheusQueryEndpoint": "https://herAzureMonitorWorkspace-xywz.eastus.prometheus.monitor.azure.com",
77+
"internalId": "mac_823220c6-0415-44d8-bfb2-d5c1c9ea1172"
78+
},
79+
"provisioningState": "Succeeded",
80+
"defaultIngestionSettings": {
81+
"dataCollectionRuleResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_herAzureMonitorWorkspace_eastus_managed/providers/Microsoft.Insights/dataCollectionRules/herAzureMonitorWorkspace",
82+
"dataCollectionEndpointResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_herAzureMonitorWorkspace_eastus_managed/providers/Microsoft.Insights/dataCollectionEndpoints/herAzureMonitorWorkspace"
83+
},
84+
"privateEndpointConnections": [
85+
{
86+
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myAzureMonitorWorkspace/privateEndpointConnections/myPrivateEndpointConnection",
87+
"name": "myPrivateEndpointConnection",
88+
"type": "Microsoft.Monitor/accounts/privateEndpointConnections",
89+
"properties": {
90+
"provisioningState": "Succeeded",
91+
"privateEndpoint": {
92+
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Network/privateEndpoints/myPrivateEndpointConnection"
93+
},
94+
"groupIds": [
95+
"prometheusMetrics"
96+
],
97+
"privateLinkServiceConnectionState": {
98+
"status": "Approved",
99+
"description": "Auto-approved",
100+
"actionsRequired": "None"
101+
}
102+
}
103+
}
104+
],
105+
"publicNetworkAccess": "Enabled"
106+
},
107+
"systemData": {
108+
"createdBy": "user1",
109+
"createdByType": "User",
110+
"createdAt": "2021-04-01T12:34:56.1234567Z",
111+
"lastModifiedBy": "user2",
112+
"lastModifiedByType": "User",
113+
"lastModifiedAt": "2021-04-02T12:34:56.1234567Z"
114+
},
115+
"etag": "070057da-0000-0000-0000-5ba70d6c0000"
116+
}
117+
],
118+
"nextLink": null
119+
}
120+
}
121+
}
122+
}

0 commit comments

Comments
 (0)