From ec6a94a6a47e7db7a7255fa3d5df20e4ddf5c95a Mon Sep 17 00:00:00 2001 From: jasondavis-MS <122496947+jasondavis-MS@users.noreply.github.com> Date: Wed, 8 Feb 2023 20:19:25 -0800 Subject: [PATCH] Update all variations of "MonitoringAccount" to "AzureMonitorWorkspaces" (#22328) --- ...json => AzureMonitorWorkspacesCreate.json} | 18 +++--- ...json => AzureMonitorWorkspacesDelete.json} | 2 +- ...et.json => AzureMonitorWorkspacesGet.json} | 12 ++-- ...MonitorWorkspacesListByResourceGroup.json} | 20 +++--- ...eMonitorWorkspacesListBySubscription.json} | 20 +++--- ...json => AzureMonitorWorkspacesUpdate.json} | 14 ++--- .../examples/OperationsGet.json | 28 ++++----- .../monitoringAccounts_API.json | 61 ++++++++++--------- .../2021-06-03-preview/operations_API.json | 6 +- .../monitor/resource-manager/readme.go.md | 5 +- 10 files changed, 95 insertions(+), 91 deletions(-) rename specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/{MonitoringAccountsCreate.json => AzureMonitorWorkspacesCreate.json} (74%) rename specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/{MonitoringAccountsDelete.json => AzureMonitorWorkspacesDelete.json} (78%) rename specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/{MonitoringAccountsGet.json => AzureMonitorWorkspacesGet.json} (68%) rename specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/{MonitoringAccountsListByResourceGroup.json => AzureMonitorWorkspacesListByResourceGroup.json} (70%) rename specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/{MonitoringAccountsListBySubscription.json => AzureMonitorWorkspacesListBySubscription.json} (70%) rename specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/{MonitoringAccountsUpdate.json => AzureMonitorWorkspacesUpdate.json} (69%) diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/MonitoringAccountsCreate.json b/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/AzureMonitorWorkspacesCreate.json similarity index 74% rename from specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/MonitoringAccountsCreate.json rename to specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/AzureMonitorWorkspacesCreate.json index 99d1b22d4711..98c36548705f 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/MonitoringAccountsCreate.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/AzureMonitorWorkspacesCreate.json @@ -2,17 +2,17 @@ "parameters": { "subscriptionId": "703362b3-f278-4e4b-9179-c76eaf41ffc2", "resourceGroupName": "myResourceGroup", - "monitoringAccountName": "myMonitoringAccount", + "azureMonitorWorkspaceName": "myAzureMonitorWorkspace", "api-version": "2021-06-03-preview", - "monitoringAccountProperties": { + "azureMonitorWorkspaceProperties": { "location": "eastus" } }, "responses": { "200": { "body": { - "id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myMonitoringAccount", - "name": "myMonitoringAccount", + "id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myAzureMonitorWorkspace", + "name": "myAzureMonitorWorkspace", "type": "Microsoft.Monitor/accounts", "location": "eastus", "tags": { @@ -22,13 +22,13 @@ "properties": { "accountId": "2df515bf-c3ce-4920-84d4-1d9d16542d9f", "metrics": { - "prometheusQueryEndpoint": "https://myMonitoringAccount-v8hx.eastus.prometheus.monitor.azure.com", + "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_myMonitoringAccount_eastus_managed/providers/Microsoft.Insights/dataCollectionRules/myMonitoringAccount", - "dataCollectionEndpointResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_myMonitoringAccount_eastus_managed/providers/Microsoft.Insights/dataCollectionEndpoints/myMonitoringAccount" + "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": { @@ -44,8 +44,8 @@ }, "201": { "body": { - "id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myMonitoringAccount", - "name": "myMonitoringAccount", + "id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myAzureMonitorWorkspace", + "name": "myAzureMonitorWorkspace", "type": "Microsoft.Monitor/accounts", "location": "eastus", "tags": { diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/MonitoringAccountsDelete.json b/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/AzureMonitorWorkspacesDelete.json similarity index 78% rename from specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/MonitoringAccountsDelete.json rename to specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/AzureMonitorWorkspacesDelete.json index 96904d8ba1d2..e6d32ec73e1e 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/MonitoringAccountsDelete.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/AzureMonitorWorkspacesDelete.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "703362b3-f278-4e4b-9179-c76eaf41ffc2", "resourceGroupName": "myResourceGroup", - "monitoringAccountName": "myMonitoringAccount", + "azureMonitorWorkspaceName": "myAzureMonitorWorkspace", "api-version": "2021-06-03-preview" }, "responses": { diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/MonitoringAccountsGet.json b/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/AzureMonitorWorkspacesGet.json similarity index 68% rename from specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/MonitoringAccountsGet.json rename to specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/AzureMonitorWorkspacesGet.json index 7e90737255f1..727dc24b4859 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/MonitoringAccountsGet.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/AzureMonitorWorkspacesGet.json @@ -2,14 +2,14 @@ "parameters": { "subscriptionId": "703362b3-f278-4e4b-9179-c76eaf41ffc2", "resourceGroupName": "myResourceGroup", - "monitoringAccountName": "myMonitoringAccount", + "azureMonitorWorkspaceName": "myAzureMonitorWorkspace", "api-version": "2021-06-03-preview" }, "responses": { "200": { "body": { - "id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myMonitoringAccount", - "name": "myMonitoringAccount", + "id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myAzureMonitorWorkspace", + "name": "myAzureMonitorWorkspace", "type": "Microsoft.Monitor/accounts", "location": "eastus", "tags": { @@ -19,13 +19,13 @@ "properties": { "accountId": "2df515bf-c3ce-4920-84d4-1d9d16542d9f", "metrics": { - "prometheusQueryEndpoint": "https://myMonitoringAccount-v8hx.eastus.prometheus.monitor.azure.com", + "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_myMonitoringAccount_eastus_managed/providers/Microsoft.Insights/dataCollectionRules/myMonitoringAccount", - "dataCollectionEndpointResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_myMonitoringAccount_eastus_managed/providers/Microsoft.Insights/dataCollectionEndpoints/myMonitoringAccount" + "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": { diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/MonitoringAccountsListByResourceGroup.json b/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/AzureMonitorWorkspacesListByResourceGroup.json similarity index 70% rename from specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/MonitoringAccountsListByResourceGroup.json rename to specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/AzureMonitorWorkspacesListByResourceGroup.json index 81f5790987ca..161291ad1a36 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/MonitoringAccountsListByResourceGroup.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/AzureMonitorWorkspacesListByResourceGroup.json @@ -9,8 +9,8 @@ "body": { "value": [ { - "id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myMonitoringAccount", - "name": "myMonitoringAccount", + "id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myAzureMonitorWorkspace", + "name": "myAzureMonitorWorkspace", "type": "Microsoft.Monitor/accounts", "location": "eastus", "tags": { @@ -20,13 +20,13 @@ "properties": { "accountId": "2df515bf-c3ce-4920-84d4-1d9d16542d9f", "metrics": { - "prometheusQueryEndpoint": "https://mymonitoringaccount-abcd.eastus.prometheus.monitor.azure.com", + "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_myMonitoringAccount_eastus_managed/providers/Microsoft.Insights/dataCollectionRules/myMonitoringAccount", - "dataCollectionEndpointResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_myMonitoringAccount_eastus_managed/providers/Microsoft.Insights/dataCollectionEndpoints/myMonitoringAccount" + "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": { @@ -40,8 +40,8 @@ "etag": "070057da-0000-0000-0000-5ba70d6c0000" }, { - "id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/herMonitoringAccount", - "name": "herMonitoringAccount", + "id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/herAzureMonitorWorkspace", + "name": "herAzureMonitorWorkspace", "type": "Microsoft.Monitor/accounts", "location": "westus", "tags": { @@ -51,13 +51,13 @@ "properties": { "accountId": "823220c6-0415-44d8-bfb2-d5c1c9ea1172", "metrics": { - "prometheusQueryEndpoint": "https://hermonitoringaccount-xywz.eastus.prometheus.monitor.azure.com", + "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_herMonitoringAccount_eastus_managed/providers/Microsoft.Insights/dataCollectionRules/herMonitoringAccount", - "dataCollectionEndpointResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_herMonitoringAccount_eastus_managed/providers/Microsoft.Insights/dataCollectionEndpoints/herMonitoringAccount" + "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": { diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/MonitoringAccountsListBySubscription.json b/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/AzureMonitorWorkspacesListBySubscription.json similarity index 70% rename from specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/MonitoringAccountsListBySubscription.json rename to specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/AzureMonitorWorkspacesListBySubscription.json index 9c6412ac429b..487b89c4b819 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/MonitoringAccountsListBySubscription.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/AzureMonitorWorkspacesListBySubscription.json @@ -8,8 +8,8 @@ "body": { "value": [ { - "id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myMonitoringAccount", - "name": "myMonitoringAccount", + "id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myAzureMonitorWorkspace", + "name": "myAzureMonitorWorkspace", "type": "Microsoft.Monitor/accounts", "location": "eastus", "tags": { @@ -19,13 +19,13 @@ "properties": { "accountId": "2df515bf-c3ce-4920-84d4-1d9d16542d9f", "metrics": { - "prometheusQueryEndpoint": "https://myMonitoringAccount-v8hx.eastus.prometheus.monitor.azure.com", + "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_myMonitoringAccount_eastus_managed/providers/Microsoft.Insights/dataCollectionRules/myMonitoringAccount", - "dataCollectionEndpointResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_myMonitoringAccount_eastus_managed/providers/Microsoft.Insights/dataCollectionEndpoints/myMonitoringAccount" + "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": { @@ -39,8 +39,8 @@ "etag": "070057da-0000-0000-0000-5ba70d6c0000" }, { - "id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/herResourceGroup/providers/Microsoft.Monitor/accounts/herMonitoringAccount", - "name": "herMonitoringAccount", + "id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/herResourceGroup/providers/Microsoft.Monitor/accounts/herAzureMonitorWorkspace", + "name": "herAzureMonitorWorkspace", "type": "Microsoft.Monitor/accounts", "location": "westus", "tags": { @@ -50,13 +50,13 @@ "properties": { "accountId": "823220c6-0415-44d8-bfb2-d5c1c9ea1172", "metrics": { - "prometheusQueryEndpoint": "https://hermonitoringaccount-xywz.eastus.prometheus.monitor.azure.com", + "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_herMonitoringAccount_eastus_managed/providers/Microsoft.Insights/dataCollectionRules/herMonitoringAccount", - "dataCollectionEndpointResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_herMonitoringAccount_eastus_managed/providers/Microsoft.Insights/dataCollectionEndpoints/herMonitoringAccount" + "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": { diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/MonitoringAccountsUpdate.json b/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/AzureMonitorWorkspacesUpdate.json similarity index 69% rename from specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/MonitoringAccountsUpdate.json rename to specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/AzureMonitorWorkspacesUpdate.json index 1b57950862fa..f1c1d020b7cb 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/MonitoringAccountsUpdate.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/AzureMonitorWorkspacesUpdate.json @@ -2,9 +2,9 @@ "parameters": { "subscriptionId": "703362b3-f278-4e4b-9179-c76eaf41ffc2", "resourceGroupName": "myResourceGroup", - "monitoringAccountName": "myMonitoringAccount", + "azureMonitorWorkspaceName": "myAzureMonitorWorkspace", "api-version": "2021-06-03-preview", - "monitoringAccountProperties": { + "azureMonitorWorkspaceProperties": { "tags": { "tag1": "A", "tag2": "B", @@ -15,8 +15,8 @@ "responses": { "200": { "body": { - "id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myMonitoringAccount", - "name": "myMonitoringAccount", + "id": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Monitor/accounts/myAzureMonitorWorkspace", + "name": "myAzureMonitorWorkspace", "type": "Microsoft.Monitor/accounts", "location": "eastus", "tags": { @@ -27,13 +27,13 @@ "properties": { "accountId": "2df515bf-c3ce-4920-84d4-1d9d16542d9f", "metrics": { - "prometheusQueryEndpoint": "https://myMonitoringAccount-v8hx.eastus.prometheus.monitor.azure.com", + "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_myMonitoringAccount_eastus_managed/providers/Microsoft.Insights/dataCollectionRules/myMonitoringAccount", - "dataCollectionEndpointResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/MA_myMonitoringAccount_eastus_managed/providers/Microsoft.Insights/dataCollectionEndpoints/myMonitoringAccount" + "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": { diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/OperationsGet.json b/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/OperationsGet.json index da82b6de4fbc..2fbefeed797f 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/OperationsGet.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/examples/OperationsGet.json @@ -10,9 +10,9 @@ "name": "microsoft.monitor/accounts/read", "display": { "provider": "Microsoft Monitoring", - "resource": "Monitoring Accounts", - "operation": "Read Monitoring Accounts", - "description": "Read any Monitoring Account" + "resource": "Azure Monitor Workspaces", + "operation": "Read Azure Monitor Workspaces", + "description": "Read any Azure Monitor Workspace" }, "isDataAction": false, "origin": "user, system" @@ -21,9 +21,9 @@ "name": "microsoft.monitor/accounts/write", "display": { "provider": "Microsoft Monitoring", - "resource": "Monitoring Accounts", - "operation": "Create or Update Monitoring Accounts", - "description": "Create or Update any Monitoring Account" + "resource": "Azure Monitor Workspaces", + "operation": "Create or Update Azure Monitor Workspaces", + "description": "Create or Update any Azure Monitor Workspace" }, "isDataAction": false, "origin": "user, system" @@ -32,9 +32,9 @@ "name": "microsoft.monitor/accounts/delete", "display": { "provider": "Microsoft Monitoring", - "resource": "Monitoring Accounts", - "operation": "Delete Monitoring Accounts", - "description": "Delete any Monitoring Account" + "resource": "Azure Monitor Workspaces", + "operation": "Delete Azure Monitor Workspaces", + "description": "Delete any Azure Monitor Workspace" }, "isDataAction": false, "origin": "user, system" @@ -43,9 +43,9 @@ "name": "microsoft.monitor/accounts/metrics/read", "display": { "provider": "Microsoft Monitoring", - "resource": "Monitoring Accounts", - "operation": "Read Monitoring Account metrics", - "description": "Read Monitoring Account metrics" + "resource": "Azure Monitor Workspaces", + "operation": "Read Azure Monitor Workspace metrics", + "description": "Read Azure Monitor Workspace metrics" }, "isDataAction": false, "origin": "user, system" @@ -54,9 +54,9 @@ "name": "microsoft.monitor/accounts/data/metrics/read", "display": { "provider": "Microsoft Monitoring", - "resource": "Monitoring Accounts", + "resource": "Azure Monitor Workspaces", "operation": "Read Metrics Data", - "description": "Read metrics data in any Monitoring Account" + "description": "Read metrics data in any Azure Monitor Workspace" }, "isDataAction": true, "origin": "user, system" diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/monitoringAccounts_API.json b/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/monitoringAccounts_API.json index 5808526ad422..86745aa2fac0 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/monitoringAccounts_API.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/monitoringAccounts_API.json @@ -71,7 +71,7 @@ "200": { "description": "Request completed successfully", "schema": { - "$ref": "#/definitions/MonitoringAccountResourceListResult" + "$ref": "#/definitions/AzureMonitorWorkspaceResourceListResult" } }, "default": { @@ -86,7 +86,7 @@ }, "x-ms-examples": { "List monitor workspaces by resource group": { - "$ref": "./examples/MonitoringAccountsListByResourceGroup.json" + "$ref": "./examples/AzureMonitorWorkspacesListByResourceGroup.json" } } } @@ -113,7 +113,7 @@ "200": { "description": "Request completed successfully", "schema": { - "$ref": "#/definitions/MonitoringAccountResourceListResult" + "$ref": "#/definitions/AzureMonitorWorkspaceResourceListResult" } }, "default": { @@ -128,12 +128,12 @@ }, "x-ms-examples": { "List workspaces by subscription": { - "$ref": "./examples/MonitoringAccountsListBySubscription.json" + "$ref": "./examples/AzureMonitorWorkspacesListBySubscription.json" } } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Monitor/accounts/{monitoringAccountName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Monitor/accounts/{azureMonitorWorkspaceName}": { "get": { "tags": [ "AzureMonitorWorkspaces" @@ -151,7 +151,7 @@ "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/MonitoringAccountNameParameter" + "$ref": "#/parameters/AzureMonitorWorkspaceNameParameter" }, { "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" @@ -161,7 +161,7 @@ "200": { "description": "Request completed successfully", "schema": { - "$ref": "#/definitions/MonitoringAccountResource" + "$ref": "#/definitions/AzureMonitorWorkspaceResource" } }, "default": { @@ -173,7 +173,7 @@ }, "x-ms-examples": { "Get workspace": { - "$ref": "./examples/MonitoringAccountsGet.json" + "$ref": "./examples/AzureMonitorWorkspacesGet.json" } } }, @@ -197,18 +197,18 @@ "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/MonitoringAccountNameParameter" + "$ref": "#/parameters/AzureMonitorWorkspaceNameParameter" }, { "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" }, { "in": "body", - "name": "monitoringAccountProperties", + "name": "azureMonitorWorkspaceProperties", "description": "Properties that need to be specified to create a new workspace", "required": true, "schema": { - "$ref": "#/definitions/MonitoringAccountResource" + "$ref": "#/definitions/AzureMonitorWorkspaceResource" } } ], @@ -216,13 +216,13 @@ "200": { "description": "Azure Monitor workspace was successfully updated", "schema": { - "$ref": "#/definitions/MonitoringAccountResource" + "$ref": "#/definitions/AzureMonitorWorkspaceResource" } }, "201": { "description": "Azure Monitor workspace was successfully created", "schema": { - "$ref": "#/definitions/MonitoringAccountResource" + "$ref": "#/definitions/AzureMonitorWorkspaceResource" } }, "default": { @@ -234,7 +234,7 @@ }, "x-ms-examples": { "Create or update workspace": { - "$ref": "./examples/MonitoringAccountsCreate.json" + "$ref": "./examples/AzureMonitorWorkspacesCreate.json" } } }, @@ -258,25 +258,25 @@ "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/MonitoringAccountNameParameter" + "$ref": "#/parameters/AzureMonitorWorkspaceNameParameter" }, { "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" }, { "in": "body", - "name": "monitoringAccountProperties", + "name": "azureMonitorWorkspaceProperties", "description": "The payload", "schema": { - "$ref": "#/definitions/MonitoringAccountResourceForUpdate" + "$ref": "#/definitions/AzureMonitorWorkspaceResourceForUpdate" } } ], "responses": { "200": { - "description": "Monitoring account was successfully updated", + "description": "Monitor workspace was successfully updated", "schema": { - "$ref": "#/definitions/MonitoringAccountResource" + "$ref": "#/definitions/AzureMonitorWorkspaceResource" } }, "default": { @@ -288,7 +288,7 @@ }, "x-ms-examples": { "Update workspace": { - "$ref": "./examples/MonitoringAccountsUpdate.json" + "$ref": "./examples/AzureMonitorWorkspacesUpdate.json" } } }, @@ -309,7 +309,7 @@ "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/MonitoringAccountNameParameter" + "$ref": "#/parameters/AzureMonitorWorkspaceNameParameter" }, { "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" @@ -331,7 +331,7 @@ }, "x-ms-examples": { "Delete workspace": { - "$ref": "./examples/MonitoringAccountsDelete.json" + "$ref": "./examples/AzureMonitorWorkspacesDelete.json" } } } @@ -382,7 +382,7 @@ } } }, - "MonitoringAccount": { + "AzureMonitorWorkspace": { "description": "Properties of an Azure Monitor workspace", "type": "object", "properties": { @@ -439,7 +439,7 @@ } } }, - "MonitoringAccountResource": { + "AzureMonitorWorkspaceResource": { "description": "An Azure Monitor Workspace definition", "required": [ "location" @@ -450,7 +450,7 @@ "description": "Resource properties", "allOf": [ { - "$ref": "#/definitions/MonitoringAccount" + "$ref": "#/definitions/AzureMonitorWorkspace" } ], "x-ms-client-flatten": true @@ -471,7 +471,7 @@ ], "x-ms-azure-resource": true }, - "MonitoringAccountResourceListResult": { + "AzureMonitorWorkspaceResourceListResult": { "description": "A pageable list of resources", "required": [ "value" @@ -482,7 +482,7 @@ "description": "A list of resources", "type": "array", "items": { - "$ref": "#/definitions/MonitoringAccountResource" + "$ref": "#/definitions/AzureMonitorWorkspaceResource" } }, "nextLink": { @@ -491,7 +491,7 @@ } } }, - "MonitoringAccountResourceForUpdate": { + "AzureMonitorWorkspaceResourceForUpdate": { "description": "Definition of ARM tracked top level resource properties for update operation", "type": "object", "properties": { @@ -506,12 +506,13 @@ } }, "parameters": { - "MonitoringAccountNameParameter": { + "AzureMonitorWorkspaceNameParameter": { "in": "path", - "name": "monitoringAccountName", + "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/preview/2021-06-03-preview/operations_API.json b/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/operations_API.json index 50eaccb1b2b7..f348f37459cc 100644 --- a/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/operations_API.json +++ b/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/operations_API.json @@ -1,8 +1,8 @@ { "swagger": "2.0", "info": { - "title": "Azure Monitoring Accounts Control Plane API", - "description": "Provides operations for working with Azure Monitoring Accounts", + "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" @@ -52,7 +52,7 @@ "Operations" ], "description": "Lists available Operations for this Resource Provider", - "operationId": "Monitor_Operations_List", + "operationId": "MonitorOperations_List", "produces": [ "application/json" ], diff --git a/specification/monitor/resource-manager/readme.go.md b/specification/monitor/resource-manager/readme.go.md index 4218192c948b..5e6af753c5a1 100644 --- a/specification/monitor/resource-manager/readme.go.md +++ b/specification/monitor/resource-manager/readme.go.md @@ -20,7 +20,10 @@ directive: where: "$.definitions.Resource" transform: > $["x-ms-client-name"] = "TrackedEntityResource"; - + - rename-operation: + from: 'MonitorOperations_List' + to: 'OperationsForMonitor_List' + modelerfour: lenient-model-deduplication: true ```