Skip to content

Commit 2b73bed

Browse files
authored
Merge pull request #146705 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents 4f8f9b9 + 5eb007c commit 2b73bed

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

articles/aks/manage-azure-rbac.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,3 +282,4 @@ az group delete -n MyResourceGroup
282282
[az-feature-list]: /cli/azure/feature#az-feature-list
283283
[az-feature-register]: /cli/azure/feature#az-feature-register
284284
[az-aks-install-cli]: /cli/azure/aks?view=azure-cli-latest#az-aks-install-cli&preserve-view=true
285+
[az-provider-register]: /cli/azure/provider?view=azure-cli-latest#az-provider-register

articles/azure-monitor/app/java-in-process-agent.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ try {
233233
} finally {
234234
long endTime = System.currentTimeMillis();
235235
RemoteDependencyTelemetry telemetry = new RemoteDependencyTelemetry();
236+
telemetry.setSuccess(success);
236237
telemetry.setTimestamp(new Date(startTime));
237238
telemetry.setDuration(new Duration(endTime - startTime));
238239
telemetryClient.trackDependency(telemetry);

articles/azure-monitor/log-query/logs-dedicated-clusters.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ After you create your *Cluster* resource, you can edit additional properties suc
7979
You can have up to 2 active clusters per subscription per region. If cluster is deleted, it is still reserved for 14 days. You can have up to 4 reserved clusters per subscription per region (active or recently deleted).
8080

8181
> [!WARNING]
82-
> Cluster creation triggers resource allocation and provisioning. This operation can take up to an hour to complete. It is recommended to run it asynchronously.
82+
> Cluster creation triggers resource allocation and provisioning. This operation can take a few hours to complete. It is recommended to run it asynchronously.
8383
8484
The user account that creates the clusters must have the standard Azure resource creation permission: `Microsoft.Resources/deployments/*` and cluster write permission `Microsoft.OperationalInsights/clusters/write` by having in their role assignments this specific action or `Microsoft.OperationalInsights/*` or `*/write`.
8585

articles/mariadb/howto-configure-privatelink-cli.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ az resource show --ids $networkInterfaceId --api-version 2019-04-01 -o json
118118
119119
#Create DNS records
120120
az network private-dns record-set a create --name mydemoserver --zone-name privatelink.mariadb.database.azure.com --resource-group myResourceGroup
121-
az network private-dns record-set a add-record --record-set-name mydemoserver --zone-name privatelink.mariadb.database.windows.net --resource-group myResourceGroup -a <Private IP Address>
121+
az network private-dns record-set a add-record --record-set-name mydemoserver --zone-name privatelink.mariadb.database.azure.com --resource-group myResourceGroup -a <Private IP Address>
122122
```
123123

124124
> [!NOTE]
@@ -193,4 +193,4 @@ az group delete --name myResourceGroup --yes
193193
Learn more about [What is Azure private endpoint](../private-link/private-endpoint-overview.md)
194194

195195
<!-- Link references, to text, Within this same GitHub repo. -->
196-
[resource-manager-portal]: ../azure-resource-manager/management/resource-providers-and-types.md
196+
[resource-manager-portal]: ../azure-resource-manager/management/resource-providers-and-types.md

0 commit comments

Comments
 (0)