Skip to content

Commit 6eb2a02

Browse files
Merge pull request #280418 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 2fec25a + 8ea9dea commit 6eb2a02

File tree

5 files changed

+20
-9
lines changed

5 files changed

+20
-9
lines changed

articles/logic-apps/set-up-zone-redundancy-availability-zones.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Availability zone support is available for Standard logic apps, which are powere
3030

3131
* You can enable availability zone redundancy *only for new* Standard logic apps with workflows that run in single-tenant Azure Logic Apps. You can't enable availability zone redundancy for existing Standard logic app workflows.
3232

33-
* You can enable availability zone redundancy *only at creation time using Azure portal*. No programmatic tool support, such as Azure PowerShell or Azure CLI, currently exists to enable availability zone redundancy.
33+
* You can enable availability zone redundancy *only at creation time*. No programmatic tool support, such as Azure PowerShell or Azure CLI, currently exists to enable availability zone redundancy after creation.
3434

3535
### [Consumption (preview)](#tab/consumption)
3636

articles/machine-learning/how-to-identity-based-service-authentication.md

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -463,13 +463,9 @@ When you disable the admin user for ACR, Azure Machine Learning uses a managed i
463463

464464
### Bring your own ACR
465465

466-
If ACR admin user is disallowed by subscription policy, you should first create ACR without admin user, and then associate it with the workspace. Also, if you have existing ACR with admin user disabled, you can attach it to the workspace.
467-
466+
If ACR admin user is disallowed by subscription policy, you should first create ACR without admin user, and then associate it with the workspace.
468467
[Create ACR from Azure CLI](../container-registry/container-registry-get-started-azure-cli.md) without setting ```--admin-enabled``` argument, or from Azure portal without enabling admin user. Then, when creating Azure Machine Learning workspace, specify the Azure resource ID of the ACR. The following example demonstrates creating a new Azure Machine Learning workspace that uses an existing ACR:
469468

470-
> [!TIP]
471-
> To get the value for the `--container-registry` parameter, use the [az acr show](/cli/azure/acr#az-acr-show) command to show information for your ACR. The `id` field contains the resource ID for your ACR.
472-
473469
[!INCLUDE [cli v2](includes/machine-learning-cli-v2.md)]
474470

475471
```azurecli-interactive
@@ -479,6 +475,20 @@ az ml workspace create -w <workspace name> \
479475
--container-registry /subscriptions/<subscription id>/resourceGroups/<acr resource group>/providers/Microsoft.ContainerRegistry/registries/<acr name>
480476
```
481477

478+
> [!TIP]
479+
> To get the value for the `--container-registry` parameter, use the [az acr show](/cli/azure/acr#az-acr-show) command to show information for your ACR. The `id` field contains the resource ID for your ACR.
480+
481+
Also, if you already have an existing ACR with admin user disabled, you can attach it to the workspace by updating it. The following example demonstrates updating an Azure Machine Learning workspace to use an existing ACR:
482+
483+
[!INCLUDE [cli v2](includes/machine-learning-cli-v2.md)]
484+
485+
```azurecli-interactive
486+
az ml workspace update --update-dependent-resources \
487+
--name <workspace name> \
488+
--resource-group <workspace resource group> \
489+
--container-registry /subscriptions/<subscription id>/resourceGroups/<acr resource group>/providers/Microsoft.ContainerRegistry/registries/<acr name>
490+
```
491+
482492
### Create compute with managed identity to access Docker images for training
483493

484494
To access the workspace ACR, create machine learning compute cluster with system-assigned managed identity enabled. You can enable the identity from Azure portal or Studio when creating compute, or from Azure CLI using the below. For more information, see [using managed identity with compute clusters](how-to-create-attach-compute-cluster.md#set-up-managed-identity).

articles/search/cognitive-search-how-to-debug-skillset.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ Enriched documents are internal, but a debug session gives you access to the con
113113

114114
:::image type="content" source="media/cognitive-search-debug/enriched-doc-output-expression.png" alt-text="Screenshot of a skill execution showing output values." border="true":::
115115

116-
1. Alternatively, open **AI enrichment > Enriched Data Structure** to scroll down the list of nodes. The list includes potential and actual nodes, with a column for output, and another column that indicates the upstream object used to produce the output.
116+
1. Alternatively, open **AI Enrichments > Enriched Data Structure** to scroll down the list of nodes. The list includes potential and actual nodes, with a column for output, and another column that indicates the upstream object used to produce the output.
117117

118118
:::image type="content" source="media/cognitive-search-debug/enriched-doc-output.png" alt-text="Screenshot of enriched document showing output values." border="true":::
119119

articles/virtual-machines/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -932,7 +932,7 @@
932932
items:
933933
- name: What are Azure reservations?
934934
displayName: Reserved Instances, RI, prepay, flexibility
935-
href: /azure/cost-management-billing/reservations/save-compute-costs-reservations.md?toc=/azure/virtual-machines/toc.json
935+
href: /azure/cost-management-billing/reservations/save-compute-costs-reservations?toc=/azure/virtual-machines/toc.json
936936
- name: Prepay for VMs
937937
displayName: Reserved Instances, RI, prepay, flexibility
938938
href: ./prepay-reserved-vm-instances.md

articles/virtual-machines/flash-event-grid-system-topic.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,13 @@ This system topic provides in-depth VM [health data](../event-grid/event-schema-
2929
### Get started
3030

3131
- Step 1: Users start by [creating a system](../event-grid/create-view-manage-system-topics.md#create-a-system-topic)topic within the Azure subscription for which they want to receive notifications.
32-
- Step 2: Users then proceed to [create an event subscription](../event-grid/subscribe-through-portal.md#create-event-subscriptions) within the system topic in Step 1. During this step, they specify the [endpoint](../event-grid/event-handlers.md) (such as, Event Hubs) to which the events are routed. Users can also configure event filters to narrow down the scope of delivered events.
32+
- Step 2: Users then proceed to [create an event subscription](../event-grid/subscribe-through-portal.md#create-event-subscriptions) within the system topic in Step 1. During this step, they specify the [endpoint](../event-grid/event-handlers.md) (such as Event Hubs or Azure Monitor Alerts) to which the events are routed. Users can also configure event filters to narrow down the scope of delivered events.
3333

3434
As you start subscribing to events from the HealthResources system topic, consider the following best practices:
3535

3636
- Choose an appropriate [destination or event handler](../event-grid/event-handlers.md) based on the anticipated scale and size of events.
3737
- For fan-in scenarios where notifications from multiple system topics need to be consolidated, [event hubs](../event-grid/handler-event-hubs.md) are highly recommended as a destination. This practice is especially useful for real-time processing scenarios to maintain data freshness and for periodic processing for analytics, with configurable retention periods.
38+
- NEW: Customers can now subscribe to Health Resources events and send them to Azure Monitor alerts as new destination. For step-by-step guide, see [Subscribe to Health Resources events and send them to Azure monitor alerts](../event-grid/handle-health-resources-events-using-azure-monitor-alerts.md).
3839

3940
We have plans to transition the preview into a fully fledged general availability feature. As part of the preview, we emit events scoped to changes in VM availability states with the following sample [schema](../event-grid/event-schema.md):
4041

0 commit comments

Comments
 (0)