Skip to content

Commit f01042a

Browse files
authored
Merge pull request #223975 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 4ec1892 + 37b7ea7 commit f01042a

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

articles/azure-monitor/essentials/metrics-store-custom-rest-api.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ curl -X POST 'https://login.microsoftonline.com/<tennant ID>/oauth2/token' \
5050
--data-urlencode 'grant_type=client_credentials' \
5151
--data-urlencode 'client_id=<your apps client ID>' \
5252
--data-urlencode 'client_secret=<your apps client secret' \
53-
--data-urlencode 'resource=https://management.azure.com'
53+
--data-urlencode 'resource=https://monitor.azure.com'
5454
```
5555

5656
The response body appears as follows:
@@ -144,4 +144,4 @@ If you receive an error message with some part of the process, consider the foll
144144

145145
## Next steps
146146

147-
- Learn more about [custom metrics](./metrics-custom-overview.md).
147+
- Learn more about [custom metrics](./metrics-custom-overview.md).

articles/azure-monitor/essentials/prometheus-metrics-enable.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ The output for each command will look similar to the following:
7676
"metrics": {
7777
"enabled": true,
7878
"kubeStateMetrics": {
79-
"metrican'tationsAllowList": "",
79+
"metricAnnotationsAllowList": "",
8080
"metricLabelsAllowlist": ""
8181
}
8282
}
@@ -102,7 +102,7 @@ The output will be similar to the following:
102102
"metrics": {
103103
"enabled": true,
104104
"kubeStateMetrics": {
105-
"metrican'tationsAllowList": "pods=[k8s-annotation-1,k8s-annotation-n]",
105+
"metricAnnotationsAllowList": "pods=[k8s-annotation-1,k8s-annotation-n]",
106106
"metricLabelsAllowlist": "namespaces=[k8s-label-1,k8s-label-n]"
107107
}
108108
}

articles/marketplace/azure-container-technical-assets.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ You can't deploy an image to Azure Container Instances from an on-premises regis
5252

5353
- If you already have a working container in your local registry, create an Azure Registry and upload your container image to the Azure Container Registry. To learn more, see [Tutorial: Build and deploy container images in the cloud with Azure Container Registry Tasks](../container-registry/container-registry-tutorial-quick-task.md).
5454

55-
- If dont have a container image yet and need to containerize your existing application or create a new container based application, clone the application source code from GitHub, create a container image from the application source, and test the image in a local Docker environment. To learn more, see [Tutorial: Create a container image for deployment to Azure Container Instances](../container-instances/container-instances-tutorial-prepare-app.md).
55+
- If you don't have a container image yet, and you need to containerize your existing application or create a new container-based application, clone the application source code from GitHub, create a container image from the application source, and test the image in a local Docker environment. To learn more, see [Tutorial: Create a container image for deployment to Azure Container Instances](../container-instances/container-instances-tutorial-prepare-app.md).
5656

5757
## Next steps
5858

59-
- [Create your container offer](azure-container-offer-setup.md)
59+
- [Create your container offer](azure-container-offer-setup.md)

articles/site-recovery/azure-to-azure-network-mapping.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Before you map networks, you should have [Azure VNets](../virtual-network/virtua
2020

2121
## Set up network mapping manually (Optional)
2222

23-
>[!NOTE
23+
>[!NOTE]
2424
> Replication can now be done between any two Azure regions around the world. Customers are no longer limited to enabling replication within their continent.
2525
2626
Map networks as follows:

0 commit comments

Comments
 (0)