Skip to content

Commit

Permalink
Update all variations of "MonitoringAccount" to "AzureMonitorWorkspac…
Browse files Browse the repository at this point in the history
…es" (#22328)
  • Loading branch information
jasondavis-MS authored Feb 9, 2023
1 parent 3443f1b commit ec6a94a
Show file tree
Hide file tree
Showing 10 changed files with 95 additions and 91 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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": {
Expand All @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parameters": {
"subscriptionId": "703362b3-f278-4e4b-9179-c76eaf41ffc2",
"resourceGroupName": "myResourceGroup",
"monitoringAccountName": "myMonitoringAccount",
"azureMonitorWorkspaceName": "myAzureMonitorWorkspace",
"api-version": "2021-06-03-preview"
},
"responses": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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": {
Expand All @@ -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": {
Expand All @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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": {
Expand All @@ -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": {
Expand All @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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": {
Expand All @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down
Loading

0 comments on commit ec6a94a

Please sign in to comment.