Skip to content

Commit

Permalink
[Hub Generated] Review request for Microsoft.Monitor to add version s…
Browse files Browse the repository at this point in the history
…table/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 <[email protected]>
Co-authored-by: Chenjie Shi <[email protected]>
  • Loading branch information
3 people authored Apr 18, 2023
1 parent 6250fb2 commit 14268ab
Show file tree
Hide file tree
Showing 11 changed files with 1,281 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
{
"parameters": {
"subscriptionId": "703362b3-f278-4e4b-9179-c76eaf41ffc2",
"resourceGroupName": "myResourceGroup",
"azureMonitorWorkspaceName": "myAzureMonitorWorkspace",
"api-version": "2023-04-03",
"azureMonitorWorkspaceProperties": {
"location": "eastus"
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myAzureMonitorWorkspace",
"name": "myAzureMonitorWorkspace",
"type": "Microsoft.Monitor/accounts",
"location": "eastus",
"tags": {
"tag1": "A",
"tag2": "B"
},
"properties": {
"accountId": "2df515bf-c3ce-4920-84d4-1d9d16542d9f",
"metrics": {
"prometheusQueryEndpoint": "https://myAzureMonitorWorkspace-v8hx.eastus.prometheus.monitor.azure.com",
"internalId": "mac_2df515bf-c3ce-4920-84d4-1d9d16542d9f"
},
"provisioningState": "Succeeded",
"defaultIngestionSettings": {
"dataCollectionRuleResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_myAzureMonitorWorkspace_eastus_managed/providers/Microsoft.Insights/dataCollectionRules/myAzureMonitorWorkspace",
"dataCollectionEndpointResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_myAzureMonitorWorkspace_eastus_managed/providers/Microsoft.Insights/dataCollectionEndpoints/myAzureMonitorWorkspace"
},
"privateEndpointConnections": [
{
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myAzureMonitorWorkspace/privateEndpointConnections/myPrivateEndpointConnection",
"name": "myPrivateEndpointConnection",
"type": "Microsoft.Monitor/accounts/privateEndpointConnections",
"properties": {
"provisioningState": "Updating",
"privateEndpoint": {
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Network/privateEndpoints/myPrivateEndpointConnection"
},
"groupIds": [
"prometheusMetrics"
],
"privateLinkServiceConnectionState": {
"status": "Approved",
"description": "Auto-approved",
"actionsRequired": "None"
}
}
}
],
"publicNetworkAccess": "Enabled"
},
"systemData": {
"createdBy": "user1",
"createdByType": "User",
"createdAt": "2021-04-01T12:34:56.1234567Z",
"lastModifiedBy": "user2",
"lastModifiedByType": "User",
"lastModifiedAt": "2021-04-02T12:34:56.1234567Z"
},
"etag": "070057da-0000-0000-0000-5ba70d6c0000"
}
},
"201": {
"body": {
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myAzureMonitorWorkspace",
"name": "myAzureMonitorWorkspace",
"type": "Microsoft.Monitor/accounts",
"location": "eastus",
"tags": {
"tag1": "A",
"tag2": "B"
},
"properties": {
"accountId": "2df515bf-c3ce-4920-84d4-1d9d16542d9f",
"metrics": {
"prometheusQueryEndpoint": "https://myAzureMonitorWorkspace-v8hx.eastus.prometheus.monitor.azure.com",
"internalId": "mac_2df515bf-c3ce-4920-84d4-1d9d16542d9f"
},
"provisioningState": "Creating",
"defaultIngestionSettings": {
"dataCollectionRuleResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_myAzureMonitorWorkspace_eastus_managed/providers/Microsoft.Insights/dataCollectionRules/myAzureMonitorWorkspace",
"dataCollectionEndpointResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_myAzureMonitorWorkspace_eastus_managed/providers/Microsoft.Insights/dataCollectionEndpoints/myAzureMonitorWorkspace"
},
"privateEndpointConnections": [
{
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myAzureMonitorWorkspace/privateEndpointConnections/myPrivateEndpointConnection",
"name": "myPrivateEndpointConnection",
"type": "Microsoft.Monitor/accounts/privateEndpointConnections",
"properties": {
"provisioningState": "Succeeded",
"privateEndpoint": {
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Network/privateEndpoints/myPrivateEndpointConnection"
},
"groupIds": [
"prometheusMetrics"
],
"privateLinkServiceConnectionState": {
"status": "Approved",
"description": "Auto-approved",
"actionsRequired": "None"
}
}
}
],
"publicNetworkAccess": "Enabled"
},
"systemData": {
"createdBy": "user1",
"createdByType": "User",
"createdAt": "2021-04-01T12:34:56.1234567Z",
"lastModifiedBy": "user2",
"lastModifiedByType": "User",
"lastModifiedAt": "2021-04-02T12:34:56.1234567Z"
},
"etag": "070057da-0000-0000-0000-5ba70d6c0000"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"parameters": {
"subscriptionId": "703362b3-f278-4e4b-9179-c76eaf41ffc2",
"resourceGroupName": "myResourceGroup",
"azureMonitorWorkspaceName": "myAzureMonitorWorkspace",
"api-version": "2023-04-03"
},
"responses": {
"202": {
"headers": {
"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",
"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"
}
},
"204": {}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
{
"parameters": {
"subscriptionId": "703362b3-f278-4e4b-9179-c76eaf41ffc2",
"resourceGroupName": "myResourceGroup",
"azureMonitorWorkspaceName": "myAzureMonitorWorkspace",
"api-version": "2023-04-03"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myAzureMonitorWorkspace",
"name": "myAzureMonitorWorkspace",
"type": "Microsoft.Monitor/accounts",
"location": "eastus",
"tags": {
"tag1": "A",
"tag2": "B"
},
"properties": {
"accountId": "2df515bf-c3ce-4920-84d4-1d9d16542d9f",
"metrics": {
"prometheusQueryEndpoint": "https://myAzureMonitorWorkspace-v8hx.eastus.prometheus.monitor.azure.com",
"internalId": "mac_2df515bf-c3ce-4920-84d4-1d9d16542d9f"
},
"provisioningState": "Succeeded",
"defaultIngestionSettings": {
"dataCollectionRuleResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_myAzureMonitorWorkspace_eastus_managed/providers/Microsoft.Insights/dataCollectionRules/myAzureMonitorWorkspace",
"dataCollectionEndpointResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_myAzureMonitorWorkspace_eastus_managed/providers/Microsoft.Insights/dataCollectionEndpoints/myAzureMonitorWorkspace"
},
"privateEndpointConnections": [
{
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myAzureMonitorWorkspace/privateEndpointConnections/myPrivateEndpointConnection",
"name": "myPrivateEndpointConnection",
"type": "Microsoft.Monitor/accounts/privateEndpointConnections",
"properties": {
"provisioningState": "Succeeded",
"privateEndpoint": {
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Network/privateEndpoints/myPrivateEndpointConnection"
},
"groupIds": [
"prometheusMetrics"
],
"privateLinkServiceConnectionState": {
"status": "Approved",
"description": "Auto-approved",
"actionsRequired": "None"
}
}
}
],
"publicNetworkAccess": "Enabled"
},
"systemData": {
"createdBy": "user1",
"createdByType": "User",
"createdAt": "2021-04-01T12:34:56.1234567Z",
"lastModifiedBy": "user2",
"lastModifiedByType": "User",
"lastModifiedAt": "2021-04-02T12:34:56.1234567Z"
},
"etag": "070057da-0000-0000-0000-5ba70d6c0000"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
{
"parameters": {
"subscriptionId": "703362b3-f278-4e4b-9179-c76eaf41ffc2",
"resourceGroupName": "myResourceGroup",
"api-version": "2023-04-03"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myAzureMonitorWorkspace",
"name": "myAzureMonitorWorkspace",
"type": "Microsoft.Monitor/accounts",
"location": "eastus",
"tags": {
"tag1": "A",
"tag2": "B"
},
"properties": {
"accountId": "2df515bf-c3ce-4920-84d4-1d9d16542d9f",
"metrics": {
"prometheusQueryEndpoint": "https://myAzureMonitorWorkspace-abcd.eastus.prometheus.monitor.azure.com",
"internalId": "mac_2df515bf-c3ce-4920-84d4-1d9d16542d9f"
},
"provisioningState": "Succeeded",
"defaultIngestionSettings": {
"dataCollectionRuleResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_myAzureMonitorWorkspace_eastus_managed/providers/Microsoft.Insights/dataCollectionRules/myAzureMonitorWorkspace",
"dataCollectionEndpointResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_myAzureMonitorWorkspace_eastus_managed/providers/Microsoft.Insights/dataCollectionEndpoints/myAzureMonitorWorkspace"
},
"privateEndpointConnections": [
{
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myAzureMonitorWorkspace/privateEndpointConnections/myPrivateEndpointConnection",
"name": "myPrivateEndpointConnection",
"type": "Microsoft.Monitor/accounts/privateEndpointConnections",
"properties": {
"provisioningState": "Succeeded",
"privateEndpoint": {
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Network/privateEndpoints/myPrivateEndpointConnection"
},
"groupIds": [
"prometheusMetrics"
],
"privateLinkServiceConnectionState": {
"status": "Approved",
"description": "Auto-approved",
"actionsRequired": "None"
}
}
}
],
"publicNetworkAccess": "Enabled"
},
"systemData": {
"createdBy": "user1",
"createdByType": "User",
"createdAt": "2021-04-01T12:34:56.1234567Z",
"lastModifiedBy": "user2",
"lastModifiedByType": "User",
"lastModifiedAt": "2021-04-02T12:34:56.1234567Z"
},
"etag": "070057da-0000-0000-0000-5ba70d6c0000"
},
{
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/herAzureMonitorWorkspace",
"name": "herAzureMonitorWorkspace",
"type": "Microsoft.Monitor/accounts",
"location": "westus",
"tags": {
"tag1": "A",
"tag2": "B"
},
"properties": {
"accountId": "823220c6-0415-44d8-bfb2-d5c1c9ea1172",
"metrics": {
"prometheusQueryEndpoint": "https://herAzureMonitorWorkspace-xywz.eastus.prometheus.monitor.azure.com",
"internalId": "mac_823220c6-0415-44d8-bfb2-d5c1c9ea1172"
},
"provisioningState": "Succeeded",
"defaultIngestionSettings": {
"dataCollectionRuleResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_herAzureMonitorWorkspace_eastus_managed/providers/Microsoft.Insights/dataCollectionRules/herAzureMonitorWorkspace",
"dataCollectionEndpointResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_herAzureMonitorWorkspace_eastus_managed/providers/Microsoft.Insights/dataCollectionEndpoints/herAzureMonitorWorkspace"
},
"privateEndpointConnections": [
{
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myAzureMonitorWorkspace/privateEndpointConnections/myPrivateEndpointConnection",
"name": "myPrivateEndpointConnection",
"type": "Microsoft.Monitor/accounts/privateEndpointConnections",
"properties": {
"provisioningState": "Succeeded",
"privateEndpoint": {
"id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Network/privateEndpoints/myPrivateEndpointConnection"
},
"groupIds": [
"prometheusMetrics"
],
"privateLinkServiceConnectionState": {
"status": "Approved",
"description": "Auto-approved",
"actionsRequired": "None"
}
}
}
],
"publicNetworkAccess": "Enabled"
},
"systemData": {
"createdBy": "user1",
"createdByType": "User",
"createdAt": "2021-04-01T12:34:56.1234567Z",
"lastModifiedBy": "user2",
"lastModifiedByType": "User",
"lastModifiedAt": "2021-04-02T12:34:56.1234567Z"
},
"etag": "070057da-0000-0000-0000-5ba70d6c0000"
}
],
"nextLink": null
}
}
}
}
Loading

0 comments on commit 14268ab

Please sign in to comment.