From aea270e56a393c954f3fd66d6a1c1533d4bba5a5 Mon Sep 17 00:00:00 2001 From: jasondavis-MS <122496947+jasondavis-MS@users.noreply.github.com> Date: Wed, 15 Mar 2023 13:55:31 -0400 Subject: [PATCH 01/43] Adds base for updating Microsoft.Monitor from version preview/2021-06-03-preview to version 2023-04-03 --- .../AzureMonitorWorkspacesCreate.json | 68 +++ .../AzureMonitorWorkspacesDelete.json | 12 + .../examples/AzureMonitorWorkspacesGet.json | 43 ++ ...eMonitorWorkspacesListByResourceGroup.json | 78 +++ ...reMonitorWorkspacesListBySubscription.json | 77 +++ .../AzureMonitorWorkspacesUpdate.json | 51 ++ .../2023-04-03/examples/OperationsGet.json | 68 +++ .../2023-04-03/monitoringAccounts_API.json | 519 ++++++++++++++++++ .../stable/2023-04-03/operations_API.json | 89 +++ 9 files changed, 1005 insertions(+) create mode 100644 specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json create mode 100644 specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json create mode 100644 specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesGet.json create mode 100644 specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesListByResourceGroup.json create mode 100644 specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesListBySubscription.json create mode 100644 specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesUpdate.json create mode 100644 specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/OperationsGet.json create mode 100644 specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json create mode 100644 specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/operations_API.json diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json new file mode 100644 index 000000000000..98c36548705f --- /dev/null +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json @@ -0,0 +1,68 @@ +{ + "parameters": { + "subscriptionId": "703362b3-f278-4e4b-9179-c76eaf41ffc2", + "resourceGroupName": "myResourceGroup", + "azureMonitorWorkspaceName": "myAzureMonitorWorkspace", + "api-version": "2021-06-03-preview", + "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" + } + }, + "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": {}, + "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" + } + } + } +} diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json new file mode 100644 index 000000000000..e6d32ec73e1e --- /dev/null +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "subscriptionId": "703362b3-f278-4e4b-9179-c76eaf41ffc2", + "resourceGroupName": "myResourceGroup", + "azureMonitorWorkspaceName": "myAzureMonitorWorkspace", + "api-version": "2021-06-03-preview" + }, + "responses": { + "200": {}, + "204": {} + } +} diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesGet.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesGet.json new file mode 100644 index 000000000000..727dc24b4859 --- /dev/null +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesGet.json @@ -0,0 +1,43 @@ +{ + "parameters": { + "subscriptionId": "703362b3-f278-4e4b-9179-c76eaf41ffc2", + "resourceGroupName": "myResourceGroup", + "azureMonitorWorkspaceName": "myAzureMonitorWorkspace", + "api-version": "2021-06-03-preview" + }, + "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" + } + }, + "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" + } + } + } +} diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesListByResourceGroup.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesListByResourceGroup.json new file mode 100644 index 000000000000..161291ad1a36 --- /dev/null +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesListByResourceGroup.json @@ -0,0 +1,78 @@ +{ + "parameters": { + "subscriptionId": "703362b3-f278-4e4b-9179-c76eaf41ffc2", + "resourceGroupName": "myResourceGroup", + "api-version": "2021-06-03-preview" + }, + "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" + } + }, + "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" + } + }, + "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 + } + } + } +} diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesListBySubscription.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesListBySubscription.json new file mode 100644 index 000000000000..487b89c4b819 --- /dev/null +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesListBySubscription.json @@ -0,0 +1,77 @@ +{ + "parameters": { + "subscriptionId": "703362b3-f278-4e4b-9179-c76eaf41ffc2", + "api-version": "2021-06-03-preview" + }, + "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-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" + } + }, + "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/herResourceGroup/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" + } + }, + "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 + } + } + } +} diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesUpdate.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesUpdate.json new file mode 100644 index 000000000000..f1c1d020b7cb --- /dev/null +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesUpdate.json @@ -0,0 +1,51 @@ +{ + "parameters": { + "subscriptionId": "703362b3-f278-4e4b-9179-c76eaf41ffc2", + "resourceGroupName": "myResourceGroup", + "azureMonitorWorkspaceName": "myAzureMonitorWorkspace", + "api-version": "2021-06-03-preview", + "azureMonitorWorkspaceProperties": { + "tags": { + "tag1": "A", + "tag2": "B", + "tag3": "C" + } + } + }, + "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", + "tag3": "C" + }, + "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" + } + }, + "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" + } + } + } +} diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/OperationsGet.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/OperationsGet.json new file mode 100644 index 000000000000..2fbefeed797f --- /dev/null +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/OperationsGet.json @@ -0,0 +1,68 @@ +{ + "parameters": { + "api-version": "2021-06-03-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "microsoft.monitor/accounts/read", + "display": { + "provider": "Microsoft Monitoring", + "resource": "Azure Monitor Workspaces", + "operation": "Read Azure Monitor Workspaces", + "description": "Read any Azure Monitor Workspace" + }, + "isDataAction": false, + "origin": "user, system" + }, + { + "name": "microsoft.monitor/accounts/write", + "display": { + "provider": "Microsoft Monitoring", + "resource": "Azure Monitor Workspaces", + "operation": "Create or Update Azure Monitor Workspaces", + "description": "Create or Update any Azure Monitor Workspace" + }, + "isDataAction": false, + "origin": "user, system" + }, + { + "name": "microsoft.monitor/accounts/delete", + "display": { + "provider": "Microsoft Monitoring", + "resource": "Azure Monitor Workspaces", + "operation": "Delete Azure Monitor Workspaces", + "description": "Delete any Azure Monitor Workspace" + }, + "isDataAction": false, + "origin": "user, system" + }, + { + "name": "microsoft.monitor/accounts/metrics/read", + "display": { + "provider": "Microsoft Monitoring", + "resource": "Azure Monitor Workspaces", + "operation": "Read Azure Monitor Workspace metrics", + "description": "Read Azure Monitor Workspace metrics" + }, + "isDataAction": false, + "origin": "user, system" + }, + { + "name": "microsoft.monitor/accounts/data/metrics/read", + "display": { + "provider": "Microsoft Monitoring", + "resource": "Azure Monitor Workspaces", + "operation": "Read Metrics Data", + "description": "Read metrics data in any Azure Monitor Workspace" + }, + "isDataAction": true, + "origin": "user, system" + } + ] + } + } + } +} diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json new file mode 100644 index 000000000000..86745aa2fac0 --- /dev/null +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json @@ -0,0 +1,519 @@ +{ + "swagger": "2.0", + "info": { + "title": "Azure Monitor Workspaces Control Plane API", + "description": "Provides operations for working with Azure Monitor Workspaces", + "version": "2021-06-03-preview", + "x-ms-code-generation-settings": { + "name": "MonitorManagementClient" + }, + "contact": { + "email": "obsaccounts@microsoft.com" + } + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "flow": "implicit", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "scopes": { + "user_impersonation": "impersonate your user account" + }, + "description": "Azure Active Directory OAuth2 Flow" + } + }, + "tags": [ + { + "name": "AzureMonitorWorkspaces", + "description": "A management operation for microsoft.monitor/accounts" + } + ], + "paths": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Monitor/accounts": { + "get": { + "tags": [ + "AzureMonitorWorkspaces" + ], + "description": "Lists all workspaces in the specified resource group", + "operationId": "AzureMonitorWorkspaces_ListByResourceGroup", + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Request completed successfully", + "schema": { + "$ref": "#/definitions/AzureMonitorWorkspaceResourceListResult" + } + }, + "default": { + "description": "Error", + "schema": { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "List monitor workspaces by resource group": { + "$ref": "./examples/AzureMonitorWorkspacesListByResourceGroup.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Monitor/accounts": { + "get": { + "tags": [ + "AzureMonitorWorkspaces" + ], + "description": "Lists all workspaces in the specified subscription", + "operationId": "AzureMonitorWorkspaces_ListBySubscription", + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Request completed successfully", + "schema": { + "$ref": "#/definitions/AzureMonitorWorkspaceResourceListResult" + } + }, + "default": { + "description": "Error", + "schema": { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "List workspaces by subscription": { + "$ref": "./examples/AzureMonitorWorkspacesListBySubscription.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Monitor/accounts/{azureMonitorWorkspaceName}": { + "get": { + "tags": [ + "AzureMonitorWorkspaces" + ], + "description": "Returns the specific Azure Monitor workspace", + "operationId": "AzureMonitorWorkspaces_Get", + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/AzureMonitorWorkspaceNameParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Request completed successfully", + "schema": { + "$ref": "#/definitions/AzureMonitorWorkspaceResource" + } + }, + "default": { + "description": "Error", + "schema": { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Get workspace": { + "$ref": "./examples/AzureMonitorWorkspacesGet.json" + } + } + }, + "put": { + "tags": [ + "AzureMonitorWorkspaces" + ], + "description": "Create or update a workspace", + "operationId": "AzureMonitorWorkspaces_Create", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/AzureMonitorWorkspaceNameParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "in": "body", + "name": "azureMonitorWorkspaceProperties", + "description": "Properties that need to be specified to create a new workspace", + "required": true, + "schema": { + "$ref": "#/definitions/AzureMonitorWorkspaceResource" + } + } + ], + "responses": { + "200": { + "description": "Azure Monitor workspace was successfully updated", + "schema": { + "$ref": "#/definitions/AzureMonitorWorkspaceResource" + } + }, + "201": { + "description": "Azure Monitor workspace was successfully created", + "schema": { + "$ref": "#/definitions/AzureMonitorWorkspaceResource" + } + }, + "default": { + "description": "Error", + "schema": { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Create or update workspace": { + "$ref": "./examples/AzureMonitorWorkspacesCreate.json" + } + } + }, + "patch": { + "tags": [ + "AzureMonitorWorkspaces" + ], + "description": "Updates part of a workspace", + "operationId": "AzureMonitorWorkspaces_Update", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/AzureMonitorWorkspaceNameParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "in": "body", + "name": "azureMonitorWorkspaceProperties", + "description": "The payload", + "schema": { + "$ref": "#/definitions/AzureMonitorWorkspaceResourceForUpdate" + } + } + ], + "responses": { + "200": { + "description": "Monitor workspace was successfully updated", + "schema": { + "$ref": "#/definitions/AzureMonitorWorkspaceResource" + } + }, + "default": { + "description": "Error", + "schema": { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Update workspace": { + "$ref": "./examples/AzureMonitorWorkspacesUpdate.json" + } + } + }, + "delete": { + "tags": [ + "AzureMonitorWorkspaces" + ], + "description": "Delete a workspace", + "operationId": "AzureMonitorWorkspaces_Delete", + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/AzureMonitorWorkspaceNameParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Workspace was successfully deleted" + }, + "204": { + "description": "Workspace did not exist" + }, + "default": { + "description": "Error", + "schema": { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Delete workspace": { + "$ref": "./examples/AzureMonitorWorkspacesDelete.json" + } + } + } + } + }, + "definitions": { + "Metrics": { + "description": "Information about metrics for the workspace", + "type": "object", + "properties": { + "prometheusQueryEndpoint": { + "description": "The Prometheus query endpoint for the workspace", + "type": "string", + "readOnly": true, + "x-ms-mutability": [ + "read" + ] + }, + "internalId": { + "description": "An internal identifier for the metrics container. Only to be used by the system", + "type": "string", + "readOnly": true, + "x-ms-mutability": [ + "read" + ] + } + } + }, + "IngestionSettings": { + "description": "Settings for data ingestion", + "type": "object", + "properties": { + "dataCollectionRuleResourceId": { + "description": "The Azure resource Id of the default data collection rule for this workspace.", + "type": "string", + "readOnly": true, + "x-ms-mutability": [ + "read" + ] + }, + "dataCollectionEndpointResourceId": { + "description": "The Azure resource Id of the default data collection endpoint for this workspace.", + "type": "string", + "readOnly": true, + "x-ms-mutability": [ + "read" + ] + } + } + }, + "AzureMonitorWorkspace": { + "description": "Properties of an Azure Monitor workspace", + "type": "object", + "properties": { + "accountId": { + "description": "The immutable ID of the Azure Monitor workspace. This property is read-only.", + "type": "string", + "readOnly": true, + "x-ms-mutability": [ + "read" + ] + }, + "metrics": { + "description": "Information about metrics for the Azure Monitor workspace", + "allOf": [ + { + "$ref": "#/definitions/Metrics" + } + ], + "readOnly": true, + "x-ms-mutability": [ + "read" + ] + }, + "provisioningState": { + "description": "The provisioning state of the Azure Monitor workspace. Set to Succeeded if everything is healthy.", + "enum": [ + "Creating", + "Succeeded", + "Deleting", + "Failed", + "Canceled" + ], + "type": "string", + "readOnly": true, + "x-ms-enum": { + "name": "ProvisioningState", + "modelAsString": true + }, + "x-ms-mutability": [ + "read" + ] + }, + "defaultIngestionSettings": { + "description": "The Data Collection Rule and Endpoint used for ingestion by default.", + "allOf": [ + { + "$ref": "#/definitions/IngestionSettings" + } + ], + "readOnly": true, + "x-ms-mutability": [ + "read" + ] + } + } + }, + "AzureMonitorWorkspaceResource": { + "description": "An Azure Monitor Workspace definition", + "required": [ + "location" + ], + "type": "object", + "properties": { + "properties": { + "description": "Resource properties", + "allOf": [ + { + "$ref": "#/definitions/AzureMonitorWorkspace" + } + ], + "x-ms-client-flatten": true + }, + "etag": { + "description": "Resource entity tag (ETag)", + "type": "string", + "readOnly": true, + "x-ms-mutability": [ + "read" + ] + } + }, + "allOf": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/TrackedResource" + } + ], + "x-ms-azure-resource": true + }, + "AzureMonitorWorkspaceResourceListResult": { + "description": "A pageable list of resources", + "required": [ + "value" + ], + "type": "object", + "properties": { + "value": { + "description": "A list of resources", + "type": "array", + "items": { + "$ref": "#/definitions/AzureMonitorWorkspaceResource" + } + }, + "nextLink": { + "description": "The URL to use for getting the next set of results", + "type": "string" + } + } + }, + "AzureMonitorWorkspaceResourceForUpdate": { + "description": "Definition of ARM tracked top level resource properties for update operation", + "type": "object", + "properties": { + "tags": { + "description": "Resource tags", + "type": "object", + "additionalProperties": { + "type": "string" + } + } + } + } + }, + "parameters": { + "AzureMonitorWorkspaceNameParameter": { + "in": "path", + "name": "azureMonitorWorkspaceName", + "description": "The name of the Azure Monitor workspace. The name is case insensitive", + "required": true, + "type": "string", + "pattern": "^(?!-)[a-zA-Z0-9-]+[^-]$", + "x-ms-parameter-location": "method" + } + } +} diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/operations_API.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/operations_API.json new file mode 100644 index 000000000000..f348f37459cc --- /dev/null +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/operations_API.json @@ -0,0 +1,89 @@ +{ + "swagger": "2.0", + "info": { + "title": "Azure Monitor Workspaces Control Plane API", + "description": "Provides operations for working with Azure Monitor Workspaces", + "version": "2021-06-03-preview", + "x-ms-code-generation-settings": { + "name": "MonitorManagementClient" + }, + "contact": { + "email": "obsaccounts@microsoft.com" + } + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "flow": "implicit", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "scopes": { + "user_impersonation": "impersonate your user account" + }, + "description": "Azure Active Directory OAuth2 Flow" + } + }, + "tags": [ + { + "name": "Operations", + "description": "List available operations API" + } + ], + "paths": { + "/providers/Microsoft.Monitor/operations": { + "get": { + "tags": [ + "Operations" + ], + "description": "Lists available Operations for this Resource Provider", + "operationId": "MonitorOperations_List", + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Success", + "schema": { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/OperationListResult" + } + }, + "default": { + "description": "Error", + "schema": { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "Get operations list": { + "$ref": "./examples/OperationsGet.json" + } + } + } + } + } +} From 896a3a3694f6a01591a81efdf29fd9cf6c62d25b Mon Sep 17 00:00:00 2001 From: jasondavis-MS <122496947+jasondavis-MS@users.noreply.github.com> Date: Wed, 15 Mar 2023 13:55:35 -0400 Subject: [PATCH 02/43] Updates readme --- .../monitor/resource-manager/readme.md | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/specification/monitor/resource-manager/readme.md b/specification/monitor/resource-manager/readme.md index 32aa8d7539f9..2b7fbdad1b1f 100644 --- a/specification/monitor/resource-manager/readme.md +++ b/specification/monitor/resource-manager/readme.md @@ -31,17 +31,27 @@ title: MonitorClient ``` yaml description: Monitor Management Client openapi-type: arm -tag: package-preview-2023-04 +tag: package-2023-04 directive: - suppress: Example Validations reason: 'There are open issues (bugs) in the validator affecting some of the examples and since there is no way to selectively disable the validation for a particular example or paths, all of the example validation is being turned off.' ``` + +### Tag: package-2023-04 + +These settings apply only when `--tag=package-2023-04` is specified on the command line. + +```yaml $(tag) == 'package-2023-04' +input-file: + - Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json + - Microsoft.Monitor/stable/2023-04-03/operations_API.json +``` ### Tag: package-preview-2023-04 These settings apply only when `--tag=package-preview-2023-04` is specified on the command line. -```yaml $(tag) == 'package-preview-2023-04' +``` yaml $(tag) == 'package-preview-2023-04' input-file: - Microsoft.Insights/stable/2022-10-01/autoscale_API.json - Microsoft.Insights/stable/2015-04-01/operations_API.json @@ -90,6 +100,7 @@ These settings apply only when `--tag=package-2023-03-01-preview-only` is specif input-file: - Microsoft.Insights/preview/2023-03-01-preview/tenantActionGroups_API.json ``` + ### Tag: package-2023-01-only These settings apply only when `--tag=package-2023-01-only` is specified on the command line @@ -99,15 +110,15 @@ input-file: - Microsoft.Insights/stable/2023-01-01/actionGroups_API.json ``` - ### Tag: package-preview-2023-01 These settings apply only when `--tag=package-preview-2023-01` is specified on the command line. -```yaml $(tag) == 'package-preview-2023-01' +``` yaml $(tag) == 'package-preview-2023-01' input-file: - Microsoft.Insights/preview/2023-01-01-preview/activityLogAlerts_API.json ``` + ### Tag: package-2022-08-01-preview-only These settings apply only when `--tag=package-2022-08-01-preview-only` is specified on the command line @@ -116,11 +127,12 @@ These settings apply only when `--tag=package-2022-08-01-preview-only` is specif input-file: - Microsoft.Insights/preview/2022-08-01-preview/scheduledQueryRule_API.json ``` + ### Tag: package-preview-2023-03 These settings apply only when `--tag=package-preview-2023-03` is specified on the command line. -```yaml $(tag) == 'package-preview-2023-03' +``` yaml $(tag) == 'package-preview-2023-03' input-file: - Microsoft.Insights/stable/2022-10-01/autoscale_API.json - Microsoft.Insights/stable/2015-04-01/operations_API.json @@ -1318,4 +1330,4 @@ input-file: - Microsoft.Insights/preview/2017-05-01-preview/diagnosticsSettingsCategories_API.json - Microsoft.Insights/stable/2015-04-01/eventCategories_API.json - Microsoft.Insights/stable/2015-04-01/operations_API.json -``` \ No newline at end of file +``` From 3c6fffce0c72aba04862c9ec3afb8d7ed677bd2d Mon Sep 17 00:00:00 2001 From: jasondavis-MS <122496947+jasondavis-MS@users.noreply.github.com> Date: Wed, 15 Mar 2023 13:55:39 -0400 Subject: [PATCH 03/43] Updates API version in new specs and examples --- .../2023-04-03/examples/AzureMonitorWorkspacesCreate.json | 2 +- .../2023-04-03/examples/AzureMonitorWorkspacesDelete.json | 2 +- .../stable/2023-04-03/examples/AzureMonitorWorkspacesGet.json | 2 +- .../examples/AzureMonitorWorkspacesListByResourceGroup.json | 2 +- .../examples/AzureMonitorWorkspacesListBySubscription.json | 2 +- .../2023-04-03/examples/AzureMonitorWorkspacesUpdate.json | 2 +- .../stable/2023-04-03/examples/OperationsGet.json | 2 +- .../stable/2023-04-03/monitoringAccounts_API.json | 2 +- .../Microsoft.Monitor/stable/2023-04-03/operations_API.json | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json index 98c36548705f..7ccb24d52694 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json @@ -3,7 +3,7 @@ "subscriptionId": "703362b3-f278-4e4b-9179-c76eaf41ffc2", "resourceGroupName": "myResourceGroup", "azureMonitorWorkspaceName": "myAzureMonitorWorkspace", - "api-version": "2021-06-03-preview", + "api-version": "2023-04-03", "azureMonitorWorkspaceProperties": { "location": "eastus" } diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json index e6d32ec73e1e..64e5ca273ac0 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json @@ -3,7 +3,7 @@ "subscriptionId": "703362b3-f278-4e4b-9179-c76eaf41ffc2", "resourceGroupName": "myResourceGroup", "azureMonitorWorkspaceName": "myAzureMonitorWorkspace", - "api-version": "2021-06-03-preview" + "api-version": "2023-04-03" }, "responses": { "200": {}, diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesGet.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesGet.json index 727dc24b4859..42e09d5c7899 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesGet.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesGet.json @@ -3,7 +3,7 @@ "subscriptionId": "703362b3-f278-4e4b-9179-c76eaf41ffc2", "resourceGroupName": "myResourceGroup", "azureMonitorWorkspaceName": "myAzureMonitorWorkspace", - "api-version": "2021-06-03-preview" + "api-version": "2023-04-03" }, "responses": { "200": { diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesListByResourceGroup.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesListByResourceGroup.json index 161291ad1a36..963b4df544cd 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesListByResourceGroup.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesListByResourceGroup.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "703362b3-f278-4e4b-9179-c76eaf41ffc2", "resourceGroupName": "myResourceGroup", - "api-version": "2021-06-03-preview" + "api-version": "2023-04-03" }, "responses": { "200": { diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesListBySubscription.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesListBySubscription.json index 487b89c4b819..15e641c25eb3 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesListBySubscription.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesListBySubscription.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "703362b3-f278-4e4b-9179-c76eaf41ffc2", - "api-version": "2021-06-03-preview" + "api-version": "2023-04-03" }, "responses": { "200": { diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesUpdate.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesUpdate.json index f1c1d020b7cb..7c3a6971d27d 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesUpdate.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesUpdate.json @@ -3,7 +3,7 @@ "subscriptionId": "703362b3-f278-4e4b-9179-c76eaf41ffc2", "resourceGroupName": "myResourceGroup", "azureMonitorWorkspaceName": "myAzureMonitorWorkspace", - "api-version": "2021-06-03-preview", + "api-version": "2023-04-03", "azureMonitorWorkspaceProperties": { "tags": { "tag1": "A", diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/OperationsGet.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/OperationsGet.json index 2fbefeed797f..c76a7437121c 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/OperationsGet.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/OperationsGet.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-06-03-preview" + "api-version": "2023-04-03" }, "responses": { "200": { diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json index 86745aa2fac0..f9bf6ef9a1f9 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json @@ -3,7 +3,7 @@ "info": { "title": "Azure Monitor Workspaces Control Plane API", "description": "Provides operations for working with Azure Monitor Workspaces", - "version": "2021-06-03-preview", + "version": "2023-04-03", "x-ms-code-generation-settings": { "name": "MonitorManagementClient" }, diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/operations_API.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/operations_API.json index f348f37459cc..f1b5bc72d34f 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/operations_API.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/operations_API.json @@ -3,7 +3,7 @@ "info": { "title": "Azure Monitor Workspaces Control Plane API", "description": "Provides operations for working with Azure Monitor Workspaces", - "version": "2021-06-03-preview", + "version": "2023-04-03", "x-ms-code-generation-settings": { "name": "MonitorManagementClient" }, From 2e2eaef708d836b658750a48d07fb9726400bb64 Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Fri, 17 Mar 2023 15:01:10 -0400 Subject: [PATCH 04/43] add publicNetworkAccess --- .../stable/2023-04-03/monitoringAccounts_API.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json index f9bf6ef9a1f9..4a5de7ad9b1f 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json @@ -436,6 +436,14 @@ "x-ms-mutability": [ "read" ] + }, + "publicNetworkAccess": { + "description": "Gets or sets allow or disallow public network access to workspace", + "type": "string", + "readOnly": true, + "x-ms-mutability": [ + "read" + ] } } }, From 4f7a00921b775998c88cd48c41189a8672f635c6 Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Fri, 17 Mar 2023 16:12:38 -0400 Subject: [PATCH 05/43] add PrivateEndpointConnections --- .../2023-04-03/monitoringAccounts_API.json | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json index 4a5de7ad9b1f..f338d4eae6f5 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json @@ -382,6 +382,48 @@ } } }, + "PrivateEndpointConnection": { + "description": "Private endpoint connection denoting the underlying private endpoint, its connection status, and its properties", + "type": "object", + "properties": { + "id": { + "description": "Fully qualified resource ID", + "type": "string", + "readOnly": true, + "x-ms-mutability": [ + "read" + ] + }, + "name": { + "description": "The name of the resource", + "type": "string", + "readOnly": true, + "x-ms-mutability": [ + "read" + ] + }, + "type": { + "description": "The type of the resource", + "type": "string", + "readOnly": true, + "x-ms-mutability": [ + "read" + ] + }, + "properties": { + "description": "The properties of the private endpoint connection", + "allOf": [ + { + "$ref": "#/definitions/PrivateEndpointConnectionProperties" + } + ], + "readOnly": true, + "x-ms-mutability": [ + "read" + ] + } + } + }, "AzureMonitorWorkspace": { "description": "Properties of an Azure Monitor workspace", "type": "object", @@ -437,6 +479,19 @@ "read" ] }, + "privateEndpointConnections": { + "description": "List of private endpoint connections", + "type": "array", + "items": [ + { + "$ref": "#/definitions/PrivateEndpointConnection" + } + ], + "readOnly": true, + "x-ms-mutability": [ + "read" + ] + }, "publicNetworkAccess": { "description": "Gets or sets allow or disallow public network access to workspace", "type": "string", From 4674d9344abb822479e3b89b943a00cad71d4ed6 Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Fri, 17 Mar 2023 16:59:14 -0400 Subject: [PATCH 06/43] add PrivateEndpointConnections subclasses --- .../2023-04-03/monitoringAccounts_API.json | 102 ++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json index f338d4eae6f5..0c96ebd167f4 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json @@ -424,6 +424,108 @@ } } }, + "PrivateEndpointConnectionProperties": { + "description": "The properties of the private endpoint connection", + "type": "object", + "properties": { + "provisioningState": { + "description": "Gets provisioning state of the private endpoint connection", + "type": "string", + "readOnly": true, + "x-ms-mutability": [ + "read" + ] + }, + "privateEndpoint": { + "description": "Gets or sets the private endpoint which the connection belongs to", + "allOf": [ + { + "$ref": "#/definitions/PrivateEndpoint" + } + ], + "readOnly": true, + "x-ms-mutability": [ + "read" + ] + }, + "groupIds": { + "description": "The private link resource group ids", + "type": "array", + "items": { + "type": "string" + }, + "readOnly": true, + "x-ms-mutability": [ + "read" + ] + }, + "privateLinkServiceConnectionState": { + "description": "Gets or sets connection state of the private endpoint connection", + "allOf": [ + { + "$ref": "#/definitions/PrivateLinkServiceConnectionState" + } + ], + "readOnly": true, + "x-ms-mutability": [ + "read" + ] + } + } + }, + "PrivateEndpoint": { + "description": "The private endpoint which the connection belongs to", + "type": "object", + "properties": { + "id": { + "description": "ARM resource ID", + "type": "string", + "readOnly": true, + "x-ms-mutability": [ + "read" + ] + } + } + }, + "PrivateLinkServiceConnectionState": { + "description": "The connection state of the private endpoint connection", + "type": "object", + "properties": { + "status": { + "description": "Indicates whether the connection has been Approved/Rejected/Removed by the owner of the service", + "enum": [ + "Approved", + "Rejected", + "Removed" + ], + "type": "string", + "readOnly": true, + "x-ms-enum": { + "name": "Status", + "modelAsString": true + }, + "x-ms-mutability": [ + "read" + ] + }, + "description": { + "description": "The reason for approval/rejection of the connection", + "type": "string", + "readOnly": true, + "x-ms-mutability": [ + "read" + ] + }, + "actionsRequired": { + "description": "A message indicating if changes on the service provider require any updates on the consumer", + "type": "string", + "readOnly": true, + "x-ms-mutability": [ + "read" + ] + } + } + }, "AzureMonitorWorkspace": { "description": "Properties of an Azure Monitor workspace", "type": "object", From ea9dd894ebddb8c5b626196be8251438bc2e7b75 Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Fri, 17 Mar 2023 17:09:35 -0400 Subject: [PATCH 07/43] give PrivateEndpointConnectionProperties.ProvisioningState enum vals --- .../stable/2023-04-03/monitoringAccounts_API.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json index 0c96ebd167f4..c7fee2d30fe9 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json @@ -430,8 +430,19 @@ "properties": { "provisioningState": { "description": "Gets provisioning state of the private endpoint connection", + "enum": [ + "Creating", + "Succeeded", + "Deleting", + "Failed", + "Canceled" + ], "type": "string", "readOnly": true, + "x-ms-enum": { + "name": "ProvisioningState", + "modelAsString": true + }, "x-ms-mutability": [ "read" ] From baa9fbbd7edf84111f3dfe772bc81ea66b529d95 Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Mon, 20 Mar 2023 11:05:30 -0400 Subject: [PATCH 08/43] give publicNetworkAccess an enum --- .../stable/2023-04-03/monitoringAccounts_API.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json index c7fee2d30fe9..f8f8de1cb85c 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json @@ -607,6 +607,10 @@ }, "publicNetworkAccess": { "description": "Gets or sets allow or disallow public network access to workspace", + "enum": [ + "Enabled", + "Disabled" + ], "type": "string", "readOnly": true, "x-ms-mutability": [ From de7cab45634c4d53275e362a5e61d8b39de29cc3 Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Mon, 20 Mar 2023 12:00:25 -0400 Subject: [PATCH 09/43] add privateEndpointConnections and publicNetworkAccess to Create example --- .../AzureMonitorWorkspacesCreate.json | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json index 7ccb24d52694..736bf39a4e8d 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json @@ -29,7 +29,29 @@ "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", From 76906f8b137b6d7e8bd40a16c51636dce9b7e874 Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Mon, 20 Mar 2023 12:04:41 -0400 Subject: [PATCH 10/43] add PrivateEndpointConnection and PublicNetworkAccess to other examples --- .../examples/AzureMonitorWorkspacesGet.json | 24 +++++++++- ...eMonitorWorkspacesListByResourceGroup.json | 48 ++++++++++++++++++- ...reMonitorWorkspacesListBySubscription.json | 48 ++++++++++++++++++- .../AzureMonitorWorkspacesUpdate.json | 24 +++++++++- 4 files changed, 138 insertions(+), 6 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesGet.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesGet.json index 42e09d5c7899..adaa85f94146 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesGet.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesGet.json @@ -26,7 +26,29 @@ "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", diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesListByResourceGroup.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesListByResourceGroup.json index 963b4df544cd..af20c7e467b7 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesListByResourceGroup.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesListByResourceGroup.json @@ -27,7 +27,29 @@ "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", @@ -58,7 +80,29 @@ "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", diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesListBySubscription.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesListBySubscription.json index 15e641c25eb3..ad5aaf6389ef 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesListBySubscription.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesListBySubscription.json @@ -26,7 +26,29 @@ "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", @@ -57,7 +79,29 @@ "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", diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesUpdate.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesUpdate.json index 7c3a6971d27d..ebfa2df4274c 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesUpdate.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesUpdate.json @@ -34,7 +34,29 @@ "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", From b62df796f936a6d0ceffbaa68bb38acc270f60d2 Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Mon, 20 Mar 2023 14:36:54 -0400 Subject: [PATCH 11/43] attempt to fix XmsIdentifierValidation linter error --- .../stable/2023-04-03/monitoringAccounts_API.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json index f8f8de1cb85c..387fed19239d 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json @@ -603,6 +603,9 @@ "readOnly": true, "x-ms-mutability": [ "read" + ], + "x-ms-identifiers": [ + "/properties/id" ] }, "publicNetworkAccess": { From 3cf06e598ed9e51e87667cd308eb3921f6f3437b Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Mon, 20 Mar 2023 14:48:39 -0400 Subject: [PATCH 12/43] attempt to fix ArrayMustHaveType linter error --- .../stable/2023-04-03/monitoringAccounts_API.json | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json index 387fed19239d..735d27120857 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json @@ -595,11 +595,9 @@ "privateEndpointConnections": { "description": "List of private endpoint connections", "type": "array", - "items": [ - { - "$ref": "#/definitions/PrivateEndpointConnection" - } - ], + "items": { + "$ref": "#/definitions/PrivateEndpointConnection" + }, "readOnly": true, "x-ms-mutability": [ "read" From b773ed0b159273b58d793c7112c635b342b5e08a Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Mon, 20 Mar 2023 15:01:23 -0400 Subject: [PATCH 13/43] attempt to fix XmsEnumValidation and retry XmsIdentifierValidation errors --- .../stable/2023-04-03/monitoringAccounts_API.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json index 735d27120857..14e6cc639723 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json @@ -603,7 +603,7 @@ "read" ], "x-ms-identifiers": [ - "/properties/id" + "id" ] }, "publicNetworkAccess": { @@ -614,6 +614,10 @@ ], "type": "string", "readOnly": true, + "x-ms-enum": { + "name": "PublicNetworkAccess", + "modelAsString": true + }, "x-ms-mutability": [ "read" ] From c89f963c58072007ef9c2c36d2554ec7bcc514f2 Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Mon, 20 Mar 2023 16:52:26 -0400 Subject: [PATCH 14/43] attempt to fix MISSING_APIS_IN_DEFAULT_TAG --- .../monitor/resource-manager/readme.md | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/specification/monitor/resource-manager/readme.md b/specification/monitor/resource-manager/readme.md index 2b7fbdad1b1f..fa9ca1d1d452 100644 --- a/specification/monitor/resource-manager/readme.md +++ b/specification/monitor/resource-manager/readme.md @@ -46,6 +46,32 @@ These settings apply only when `--tag=package-2023-04` is specified on the comma input-file: - Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json - Microsoft.Monitor/stable/2023-04-03/operations_API.json + - Microsoft.Insights/stable/2022-10-01/autoscale_API.json + - Microsoft.Insights/stable/2015-04-01/operations_API.json + - Microsoft.Insights/stable/2016-03-01/alertRulesIncidents_API.json + - Microsoft.Insights/stable/2016-03-01/alertRules_API.json + - Microsoft.Insights/stable/2016-03-01/logProfiles_API.json + - Microsoft.Insights/preview/2021-05-01-preview/diagnosticsSettings_API.json + - Microsoft.Insights/preview/2021-05-01-preview/diagnosticsSettingsCategories_API.json + - Microsoft.Insights/stable/2023-01-01/actionGroups_API.json + - Microsoft.Insights/preview/2023-03-01-preview/tenantActionGroups_API.json + - Microsoft.Insights/stable/2015-04-01/activityLogs_API.json + - Microsoft.Insights/stable/2015-04-01/eventCategories_API.json + - Microsoft.Insights/stable/2015-04-01/tenantActivityLogs_API.json + - Microsoft.Insights/stable/2021-05-01/metricDefinitions_API.json + - Microsoft.Insights/stable/2021-05-01/metrics_API.json + - Microsoft.Insights/stable/2019-03-01/metricBaselines_API.json + - Microsoft.Insights/stable/2018-03-01/metricAlert_API.json + - Microsoft.Insights/preview/2022-08-01-preview/scheduledQueryRule_API.json + - Microsoft.Insights/preview/2017-12-01-preview/metricNamespaces_API.json + - Microsoft.Insights/preview/2018-11-27-preview/vmInsightsOnboarding_API.json + - Microsoft.Insights/preview/2021-07-01-preview/privateLinkScopes_API.json + - Microsoft.Insights/stable/2020-10-01/activityLogAlerts_API.json + - Microsoft.Insights/stable/2022-06-01/dataCollectionEndpoints_API.json + - Microsoft.Insights/stable/2022-06-01/dataCollectionRuleAssociations_API.json + - Microsoft.Insights/stable/2022-06-01/dataCollectionRules_API.json + - Microsoft.Monitor/preview/2021-06-03-preview/monitoringAccounts_API.json + - Microsoft.Monitor/preview/2021-06-03-preview/operations_API.json ``` ### Tag: package-preview-2023-04 From 9d548d026d2a9755fb2e0143e61cdb163637a105 Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Tue, 21 Mar 2023 11:27:07 -0400 Subject: [PATCH 15/43] use common-type for PrivateEndpointConnection ref, remove nested fields --- .../2023-04-03/monitoringAccounts_API.json | 157 +----------------- 1 file changed, 1 insertion(+), 156 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json index 14e6cc639723..b8fb50f85a73 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json @@ -382,161 +382,6 @@ } } }, - "PrivateEndpointConnection": { - "description": "Private endpoint connection denoting the underlying private endpoint, its connection status, and its properties", - "type": "object", - "properties": { - "id": { - "description": "Fully qualified resource ID", - "type": "string", - "readOnly": true, - "x-ms-mutability": [ - "read" - ] - }, - "name": { - "description": "The name of the resource", - "type": "string", - "readOnly": true, - "x-ms-mutability": [ - "read" - ] - }, - "type": { - "description": "The type of the resource", - "type": "string", - "readOnly": true, - "x-ms-mutability": [ - "read" - ] - }, - "properties": { - "description": "The properties of the private endpoint connection", - "allOf": [ - { - "$ref": "#/definitions/PrivateEndpointConnectionProperties" - } - ], - "readOnly": true, - "x-ms-mutability": [ - "read" - ] - } - } - }, - "PrivateEndpointConnectionProperties": { - "description": "The properties of the private endpoint connection", - "type": "object", - "properties": { - "provisioningState": { - "description": "Gets provisioning state of the private endpoint connection", - "enum": [ - "Creating", - "Succeeded", - "Deleting", - "Failed", - "Canceled" - ], - "type": "string", - "readOnly": true, - "x-ms-enum": { - "name": "ProvisioningState", - "modelAsString": true - }, - "x-ms-mutability": [ - "read" - ] - }, - "privateEndpoint": { - "description": "Gets or sets the private endpoint which the connection belongs to", - "allOf": [ - { - "$ref": "#/definitions/PrivateEndpoint" - } - ], - "readOnly": true, - "x-ms-mutability": [ - "read" - ] - }, - "groupIds": { - "description": "The private link resource group ids", - "type": "array", - "items": { - "type": "string" - }, - "readOnly": true, - "x-ms-mutability": [ - "read" - ] - }, - "privateLinkServiceConnectionState": { - "description": "Gets or sets connection state of the private endpoint connection", - "allOf": [ - { - "$ref": "#/definitions/PrivateLinkServiceConnectionState" - } - ], - "readOnly": true, - "x-ms-mutability": [ - "read" - ] - } - } - }, - "PrivateEndpoint": { - "description": "The private endpoint which the connection belongs to", - "type": "object", - "properties": { - "id": { - "description": "ARM resource ID", - "type": "string", - "readOnly": true, - "x-ms-mutability": [ - "read" - ] - } - } - }, - "PrivateLinkServiceConnectionState": { - "description": "The connection state of the private endpoint connection", - "type": "object", - "properties": { - "status": { - "description": "Indicates whether the connection has been Approved/Rejected/Removed by the owner of the service", - "enum": [ - "Approved", - "Rejected", - "Removed" - ], - "type": "string", - "readOnly": true, - "x-ms-enum": { - "name": "Status", - "modelAsString": true - }, - "x-ms-mutability": [ - "read" - ] - }, - "description": { - "description": "The reason for approval/rejection of the connection", - "type": "string", - "readOnly": true, - "x-ms-mutability": [ - "read" - ] - }, - "actionsRequired": { - "description": "A message indicating if changes on the service provider require any updates on the consumer", - "type": "string", - "readOnly": true, - "x-ms-mutability": [ - "read" - ] - } - } - }, "AzureMonitorWorkspace": { "description": "Properties of an Azure Monitor workspace", "type": "object", @@ -596,7 +441,7 @@ "description": "List of private endpoint connections", "type": "array", "items": { - "$ref": "#/definitions/PrivateEndpointConnection" + "$ref": "../../../../../common-types/resource-management/v4/privatelinks.json#/definitions/PrivateEndpointConnection" }, "readOnly": true, "x-ms-mutability": [ From c0b10315fb54429d9477e235b8a0106edaaa9f50 Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Fri, 24 Mar 2023 16:23:46 -0400 Subject: [PATCH 16/43] update Create and Delete responses for async operations --- .../AzureMonitorWorkspacesCreate.json | 23 +------------------ .../AzureMonitorWorkspacesDelete.json | 2 +- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json index 736bf39a4e8d..d6f7574830de 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json @@ -64,27 +64,6 @@ "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": {}, - "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": {} } } diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json index 64e5ca273ac0..b97ba5135b98 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json @@ -6,7 +6,7 @@ "api-version": "2023-04-03" }, "responses": { - "200": {}, + "202": {}, "204": {} } } From c9c17da74b47425d3d61dfbf42864e8f52cbb41a Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Fri, 24 Mar 2023 16:27:15 -0400 Subject: [PATCH 17/43] further async update --- .../AzureMonitorWorkspacesCreate.json | 59 ++++++++++++++++++- 1 file changed, 57 insertions(+), 2 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json index d6f7574830de..e31b81dcc1ec 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json @@ -25,7 +25,7 @@ "prometheusQueryEndpoint": "https://myAzureMonitorWorkspace-v8hx.eastus.prometheus.monitor.azure.com", "internalId": "mac_2df515bf-c3ce-4920-84d4-1d9d16542d9f" }, - "provisioningState": "Succeeded", + "provisioningState": "Updating", "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" @@ -64,6 +64,61 @@ "etag": "070057da-0000-0000-0000-5ba70d6c0000" } }, - "201": {} + "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" + } + }, + "202": {} } } From 671a5944feb087e18a01b2fcd30e4aed1e95cc5c Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Tue, 28 Mar 2023 11:44:14 -0400 Subject: [PATCH 18/43] Revert "further async update" This reverts commit c9c17da74b47425d3d61dfbf42864e8f52cbb41a. --- .../AzureMonitorWorkspacesCreate.json | 59 +------------------ 1 file changed, 2 insertions(+), 57 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json index e31b81dcc1ec..d6f7574830de 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json @@ -25,7 +25,7 @@ "prometheusQueryEndpoint": "https://myAzureMonitorWorkspace-v8hx.eastus.prometheus.monitor.azure.com", "internalId": "mac_2df515bf-c3ce-4920-84d4-1d9d16542d9f" }, - "provisioningState": "Updating", + "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" @@ -64,61 +64,6 @@ "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" - } - }, - "202": {} + "201": {} } } From 4720e43f9f6085c1ed815396d4dc7c7a4fe9a24f Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Tue, 28 Mar 2023 11:44:22 -0400 Subject: [PATCH 19/43] Revert "update Create and Delete responses for async operations" This reverts commit c0b10315fb54429d9477e235b8a0106edaaa9f50. --- .../AzureMonitorWorkspacesCreate.json | 23 ++++++++++++++++++- .../AzureMonitorWorkspacesDelete.json | 2 +- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json index d6f7574830de..736bf39a4e8d 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json @@ -64,6 +64,27 @@ "etag": "070057da-0000-0000-0000-5ba70d6c0000" } }, - "201": {} + "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": {}, + "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" + } + } } } diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json index b97ba5135b98..64e5ca273ac0 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json @@ -6,7 +6,7 @@ "api-version": "2023-04-03" }, "responses": { - "202": {}, + "200": {}, "204": {} } } From 2043102506093c422360c055915b2ccaae865539 Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Tue, 28 Mar 2023 14:09:35 -0400 Subject: [PATCH 20/43] remove 201 from Create, 200 and 204 from Delete, add 202 to Delete --- .../AzureMonitorWorkspacesCreate.json | 22 ------------------- .../AzureMonitorWorkspacesDelete.json | 3 +-- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json index 736bf39a4e8d..adcd8afecdab 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json @@ -63,28 +63,6 @@ }, "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": {}, - "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" - } } } } diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json index 64e5ca273ac0..3386974ebe33 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json @@ -6,7 +6,6 @@ "api-version": "2023-04-03" }, "responses": { - "200": {}, - "204": {} + "202": {} } } From 7ea81714d1f1a02389fcf4a6477ed3b0605002e7 Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Tue, 28 Mar 2023 14:12:24 -0400 Subject: [PATCH 21/43] readd 204 to Delete --- .../2023-04-03/examples/AzureMonitorWorkspacesDelete.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json index 3386974ebe33..b97ba5135b98 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json @@ -6,6 +6,7 @@ "api-version": "2023-04-03" }, "responses": { - "202": {} + "202": {}, + "204": {} } } From 3b77b5b370d7b307456183f1d46a8711c19db0c6 Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Tue, 28 Mar 2023 14:54:22 -0400 Subject: [PATCH 22/43] make corresponding response updates to API --- .../stable/2023-04-03/monitoringAccounts_API.json | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json index b8fb50f85a73..9bb8218fc62e 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json @@ -181,7 +181,7 @@ "tags": [ "AzureMonitorWorkspaces" ], - "description": "Create or update a workspace", + "description": "Create a workspace", "operationId": "AzureMonitorWorkspaces_Create", "consumes": [ "application/json" @@ -214,12 +214,6 @@ ], "responses": { "200": { - "description": "Azure Monitor workspace was successfully updated", - "schema": { - "$ref": "#/definitions/AzureMonitorWorkspaceResource" - } - }, - "201": { "description": "Azure Monitor workspace was successfully created", "schema": { "$ref": "#/definitions/AzureMonitorWorkspaceResource" @@ -316,7 +310,7 @@ } ], "responses": { - "200": { + "202": { "description": "Workspace was successfully deleted" }, "204": { From f539c36ae6cfd9bcb647b49ba029cce4f06fca9f Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Tue, 28 Mar 2023 15:06:36 -0400 Subject: [PATCH 23/43] add x-ms-long-running-operation: true to Delete --- .../stable/2023-04-03/monitoringAccounts_API.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json index 9bb8218fc62e..c466ec14cacc 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json @@ -327,7 +327,8 @@ "Delete workspace": { "$ref": "./examples/AzureMonitorWorkspacesDelete.json" } - } + }, + "x-ms-long-running-operation": true } } }, From 63f568b8abf18e2af3bff9471db5fa6f024e3309 Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Tue, 28 Mar 2023 15:16:40 -0400 Subject: [PATCH 24/43] add x-ms-long-running-operation-options for Delete --- .../stable/2023-04-03/monitoringAccounts_API.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json index c466ec14cacc..7baeefac6f5a 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json @@ -328,7 +328,10 @@ "$ref": "./examples/AzureMonitorWorkspacesDelete.json" } }, - "x-ms-long-running-operation": true + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + } } } }, From 6bd397949a1f90a3f386d813906bb1507980b7a0 Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Tue, 28 Mar 2023 15:32:55 -0400 Subject: [PATCH 25/43] try to fix Lro errors --- .../stable/2023-04-03/monitoringAccounts_API.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json index 7baeefac6f5a..fa056c04cd67 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json @@ -311,7 +311,8 @@ ], "responses": { "202": { - "description": "Workspace was successfully deleted" + "description": "Workspace was successfully deleted", + "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" }, "204": { "description": "Workspace did not exist" From 42562f8e0c95ccea5d8de5e9b7e88567175fe211 Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Tue, 28 Mar 2023 15:50:13 -0400 Subject: [PATCH 26/43] try to fix errors --- .../stable/2023-04-03/monitoringAccounts_API.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json index fa056c04cd67..ae19318327de 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json @@ -312,10 +312,11 @@ "responses": { "202": { "description": "Workspace was successfully deleted", - "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/operationResults/00000000-0000-0000-0000-000000000000/AzureMonitorWorkspace/default?api-version=2023-04-03" }, "204": { - "description": "Workspace did not exist" + "description": "Workspace did not exist", + "Location": "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" }, "default": { "description": "Error", @@ -331,7 +332,7 @@ }, "x-ms-long-running-operation": true, "x-ms-long-running-operation-options": { - "final-state-via": "azure-async-operation" + "final-state-via": "location" } } } From 39e3b10ee80b71801f9b6ba4c4f3cc1ee54792ae Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Tue, 28 Mar 2023 15:50:33 -0400 Subject: [PATCH 27/43] try to fix errors --- .../stable/2023-04-03/monitoringAccounts_API.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json index ae19318327de..25b8c7fccbf3 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json @@ -315,8 +315,7 @@ "Location": "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" }, "204": { - "description": "Workspace did not exist", - "Location": "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" + "description": "Workspace did not exist" }, "default": { "description": "Error", From 9c725faca6e02901095bc4dd0b6a8e0a5f04c71b Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Tue, 28 Mar 2023 16:02:21 -0400 Subject: [PATCH 28/43] attempt fix again --- .../stable/2023-04-03/monitoringAccounts_API.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json index 25b8c7fccbf3..fa056c04cd67 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json @@ -312,7 +312,7 @@ "responses": { "202": { "description": "Workspace was successfully deleted", - "Location": "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" + "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" }, "204": { "description": "Workspace did not exist" @@ -331,7 +331,7 @@ }, "x-ms-long-running-operation": true, "x-ms-long-running-operation-options": { - "final-state-via": "location" + "final-state-via": "azure-async-operation" } } } From 5011d28e57560894089b2260b5187a7deeca09ae Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Tue, 28 Mar 2023 16:18:20 -0400 Subject: [PATCH 29/43] try again --- .../2023-04-03/examples/AzureMonitorWorkspacesDelete.json | 4 +++- .../stable/2023-04-03/monitoringAccounts_API.json | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json index b97ba5135b98..f524808bf432 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json @@ -6,7 +6,9 @@ "api-version": "2023-04-03" }, "responses": { - "202": {}, + "202": { + "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" + }, "204": {} } } diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json index fa056c04cd67..7baeefac6f5a 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json @@ -311,8 +311,7 @@ ], "responses": { "202": { - "description": "Workspace was successfully deleted", - "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" + "description": "Workspace was successfully deleted" }, "204": { "description": "Workspace did not exist" From 9c4c655354081960bc2f63351bfe56b8cdf6db6e Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Tue, 28 Mar 2023 16:27:57 -0400 Subject: [PATCH 30/43] continue --- .../stable/2023-04-03/monitoringAccounts_API.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json index 7baeefac6f5a..e35c6c5639b7 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json @@ -330,7 +330,7 @@ }, "x-ms-long-running-operation": true, "x-ms-long-running-operation-options": { - "final-state-via": "azure-async-operation" + "final-state-via": "location" } } } From 899d6b1387df32b626d5260cc5e241c95a7866ec Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Tue, 28 Mar 2023 16:34:29 -0400 Subject: [PATCH 31/43] continue --- .../stable/2023-04-03/monitoringAccounts_API.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json index e35c6c5639b7..fc87489c0f89 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json @@ -311,7 +311,8 @@ ], "responses": { "202": { - "description": "Workspace was successfully deleted" + "description": "Workspace was successfully deleted", + "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" }, "204": { "description": "Workspace did not exist" From 16226447b007a958652bffc928a7c5c1a2f637e3 Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Tue, 28 Mar 2023 16:44:38 -0400 Subject: [PATCH 32/43] once more --- .../2023-04-03/examples/AzureMonitorWorkspacesDelete.json | 2 +- .../stable/2023-04-03/monitoringAccounts_API.json | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json index f524808bf432..e909c837c80f 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json @@ -7,7 +7,7 @@ }, "responses": { "202": { - "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/operationResults/00000000-0000-0000-0000-000000000000/AzureMonitorWorkspace/default?api-version=2023-04-03" }, "204": {} } diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json index fc87489c0f89..e35c6c5639b7 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json @@ -311,8 +311,7 @@ ], "responses": { "202": { - "description": "Workspace was successfully deleted", - "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" + "description": "Workspace was successfully deleted" }, "204": { "description": "Workspace did not exist" From d08031dd49dbd40e00fb54bab42866f0c62065b5 Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Wed, 29 Mar 2023 09:44:36 -0400 Subject: [PATCH 33/43] another try --- .../stable/2023-04-03/monitoringAccounts_API.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json index e35c6c5639b7..03b15843b846 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json @@ -311,6 +311,8 @@ ], "responses": { "202": { + "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", "description": "Workspace was successfully deleted" }, "204": { From 649bc7e6bb1d21ab7285bce709396028029c0759 Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Wed, 29 Mar 2023 10:54:28 -0400 Subject: [PATCH 34/43] last one for real --- .../2023-04-03/examples/AzureMonitorWorkspacesDelete.json | 3 ++- .../stable/2023-04-03/monitoringAccounts_API.json | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json index e909c837c80f..c80405e4878f 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json @@ -7,7 +7,8 @@ }, "responses": { "202": { - "Location": "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" + "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": {} } diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json index 03b15843b846..e35c6c5639b7 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json @@ -311,8 +311,6 @@ ], "responses": { "202": { - "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", "description": "Workspace was successfully deleted" }, "204": { From 72950f558265dc450bbdc2d6c2bc04c2869b0d2b Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Wed, 29 Mar 2023 11:03:46 -0400 Subject: [PATCH 35/43] last one v2 --- .../2023-04-03/examples/AzureMonitorWorkspacesDelete.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json index c80405e4878f..3f1684ee2a72 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json @@ -7,8 +7,10 @@ }, "responses": { "202": { - "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" + "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": {} } From f7edcdc7a35834766f14d1427e536ec720c39718 Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Wed, 29 Mar 2023 11:27:11 -0400 Subject: [PATCH 36/43] just one more --- .../stable/2023-04-03/monitoringAccounts_API.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json index e35c6c5639b7..6440f2111eeb 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json @@ -311,7 +311,11 @@ ], "responses": { "202": { - "description": "Workspace was successfully deleted" + "description": "Workspace was successfully deleted", + "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": { "description": "Workspace did not exist" From 4f28a31036ad44331a2b16274f37e020595f42bf Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Wed, 29 Mar 2023 11:33:57 -0400 Subject: [PATCH 37/43] last or second to last one, guaranteed --- .../stable/2023-04-03/monitoringAccounts_API.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json index 6440f2111eeb..637d082dfaf2 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json @@ -313,8 +313,12 @@ "202": { "description": "Workspace was successfully deleted", "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" + "Azure-AsyncOperation": { + "type": "string" + }, + "Location": { + "type": "string" + } } }, "204": { From 0fc498fb40230cc0b72dc75ae457f6ac599f4731 Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Wed, 29 Mar 2023 11:39:55 -0400 Subject: [PATCH 38/43] attempt cleanup --- .../2023-04-03/examples/AzureMonitorWorkspacesDelete.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json index 3f1684ee2a72..b97ba5135b98 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json @@ -6,12 +6,7 @@ "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" - } - }, + "202": {}, "204": {} } } From 4bf85cabf8a234b3715dee84e91a0918b0458440 Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Wed, 29 Mar 2023 11:44:18 -0400 Subject: [PATCH 39/43] Revert "attempt cleanup" This reverts commit 0fc498fb40230cc0b72dc75ae457f6ac599f4731. --- .../2023-04-03/examples/AzureMonitorWorkspacesDelete.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json index b97ba5135b98..3f1684ee2a72 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesDelete.json @@ -6,7 +6,12 @@ "api-version": "2023-04-03" }, "responses": { - "202": {}, + "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": {} } } From 31944e2256bb739b7d5b993a16971a759287fba9 Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Thu, 6 Apr 2023 12:38:08 -0700 Subject: [PATCH 40/43] reintroduce 201 response for PUT --- .../AzureMonitorWorkspacesCreate.json | 55 +++++++++++++++++++ .../2023-04-03/monitoringAccounts_API.json | 8 ++- 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json index adcd8afecdab..e8a7e07937e6 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/examples/AzureMonitorWorkspacesCreate.json @@ -30,6 +30,61 @@ "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", diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json index 637d082dfaf2..2a4f36743165 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/stable/2023-04-03/monitoringAccounts_API.json @@ -181,7 +181,7 @@ "tags": [ "AzureMonitorWorkspaces" ], - "description": "Create a workspace", + "description": "Create or update a workspace", "operationId": "AzureMonitorWorkspaces_Create", "consumes": [ "application/json" @@ -214,6 +214,12 @@ ], "responses": { "200": { + "description": "Azure Monitor workspace was successfully updated", + "schema": { + "$ref": "#/definitions/AzureMonitorWorkspaceResource" + } + }, + "201": { "description": "Azure Monitor workspace was successfully created", "schema": { "$ref": "#/definitions/AzureMonitorWorkspaceResource" From 09319ca4735368425620c4c85f084e3c01944428 Mon Sep 17 00:00:00 2001 From: James Lai Date: Thu, 13 Apr 2023 20:30:11 -0700 Subject: [PATCH 41/43] remove double readme entry --- specification/monitor/resource-manager/readme.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/specification/monitor/resource-manager/readme.md b/specification/monitor/resource-manager/readme.md index fa9ca1d1d452..1a6699c67241 100644 --- a/specification/monitor/resource-manager/readme.md +++ b/specification/monitor/resource-manager/readme.md @@ -70,8 +70,6 @@ input-file: - Microsoft.Insights/stable/2022-06-01/dataCollectionEndpoints_API.json - Microsoft.Insights/stable/2022-06-01/dataCollectionRuleAssociations_API.json - Microsoft.Insights/stable/2022-06-01/dataCollectionRules_API.json - - Microsoft.Monitor/preview/2021-06-03-preview/monitoringAccounts_API.json - - Microsoft.Monitor/preview/2021-06-03-preview/operations_API.json ``` ### Tag: package-preview-2023-04 From efd14026bfec95785c54647fbbd156cbac00b7d5 Mon Sep 17 00:00:00 2001 From: Chenjie Shi Date: Mon, 17 Apr 2023 14:24:39 +0800 Subject: [PATCH 42/43] resolve Go SDK duplication schema issue --- specification/monitor/resource-manager/readme.go.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/specification/monitor/resource-manager/readme.go.md b/specification/monitor/resource-manager/readme.go.md index 5e6af753c5a1..e0286a40a431 100644 --- a/specification/monitor/resource-manager/readme.go.md +++ b/specification/monitor/resource-manager/readme.go.md @@ -23,7 +23,10 @@ directive: - rename-operation: from: 'MonitorOperations_List' to: 'OperationsForMonitor_List' - + - from: privateLinkScopes_API.json # this is to resolve the duplicated schema issue in this swagger + where: "$.path['/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Insights/privateLinkScopes/{scopeName}/privateEndpointConnections/{privateEndpointConnectionName}'].get.responses['200'].schema" + transform: > + $["$ref"] = "../../../../../common-types/resource-management/v4/privatelinks.json#/definitions/PrivateEndpointConnection"; modelerfour: lenient-model-deduplication: true ``` From 58daca29ac4a3652b446ae3de1a7b63794ba4d82 Mon Sep 17 00:00:00 2001 From: Chenjie Shi Date: Mon, 17 Apr 2023 14:44:31 +0800 Subject: [PATCH 43/43] revert change --- specification/monitor/resource-manager/readme.go.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/specification/monitor/resource-manager/readme.go.md b/specification/monitor/resource-manager/readme.go.md index e0286a40a431..c8aca4d41e1f 100644 --- a/specification/monitor/resource-manager/readme.go.md +++ b/specification/monitor/resource-manager/readme.go.md @@ -23,10 +23,6 @@ directive: - rename-operation: from: 'MonitorOperations_List' to: 'OperationsForMonitor_List' - - from: privateLinkScopes_API.json # this is to resolve the duplicated schema issue in this swagger - where: "$.path['/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Insights/privateLinkScopes/{scopeName}/privateEndpointConnections/{privateEndpointConnectionName}'].get.responses['200'].schema" - transform: > - $["$ref"] = "../../../../../common-types/resource-management/v4/privatelinks.json#/definitions/PrivateEndpointConnection"; modelerfour: lenient-model-deduplication: true ```