Merge pull request #300857 from MicrosoftDocs/main

6/4/2025 PM Publish

Author: Taojunshen

articles/api-management/configure-service-update-settings.md

@@ -15,15 +15,15 @@ ms.author: danlep
 
 This article shows you how to configure *service update* settings (preview) in your API Management instance. Azure periodically applies service updates automatically to API Management instances, using a phased rollout approach. These updates include new features, security enhancements, and reliability improvements. 
 
-You can't control exactly when Azure updates each API Management instance, but in select service tiers you can choose an *update group* for your instance so that it receives updates earlier or later than it usually would during an update rollout. You can also configure a *maintenance window* during the day when you want your instance to receive updates. 
+You can't control exactly when Azure updates each API Management instance, but in select service tiers you can choose an *update group* (also called a *release channel*) for your instance so that it receives updates earlier or later than it usually would during an update rollout. You can also configure a *maintenance window* during the day when you want your instance to receive updates. 
 
 * **Update group** - A set of instances that receive API Management service updates during a production rollout, which can take from several days to several weeks to complete. 
 
     Choose from:
     * **Early** - Receive updates early in the rollout, for testing and early access to new features. This option is not recommended for production deployments.
     * **Default** - Receive updates as part of the regular release rollout. This option is recommended for most services, including production deployments.
     * **Late** - Receive updates later than the previous groups, typically weeks after the initial rollout. This option is recommended for mission-critical deployments only.
-    * **AI Gateway Early** (GenAI release) - Get early access to the latest [AI gateway features and updates](genai-gateway-capabilities.md) before they reach other update groups. Receive other service updates as part of the **Late** rollout group.
+    * **AI Gateway Early** (GenAI release channel) - Get early access to the latest [AI gateway features and updates](genai-gateway-capabilities.md) before they reach other update groups. Receive other service updates as part of the **Late** rollout group.
 
     > [!NOTE]
     > Azure deploys all updates using a [safe deployment practices (SDP) framework](https://azure.microsoft.com/blog/advancing-safe-deployment-practices/). Updates released early in a rollout might be less stable and replaced later by stable releases. All instances are eventually updated to the most stable release builds.

articles/api-management/genai-gateway-capabilities.md

@@ -126,6 +126,7 @@ To help safeguard users from harmful, offensive, or misleading content, you can
 ## Labs and samples
 
 * [Labs for the AI gateway capabilities of Azure API Management](https://github.com/Azure-Samples/ai-gateway)
+* [AI gateway workshop](https://aka.ms/ai-gateway/workshop)
 * [Azure API Management (APIM) - Azure OpenAI Sample (Node.js)](https://github.com/Azure-Samples/genai-gateway-apim)
 * [Python sample code for using Azure OpenAI with API Management](https://github.com/Azure-Samples/openai-apim-lb/blob/main/docs/sample-code.md)
 

articles/app-service/app-service-hybrid-connections.md

@@ -1,11 +1,11 @@
 ---
 title: Hybrid connections in Azure App Service
 description: Learn how to create and use hybrid connections in Azure App Service to access resources in disparate networks. 
-author: madsd
+author: seligj95
 ms.assetid: 66774bde-13f5-45d0-9a70-4e9536a4f619
 ms.topic: article
-ms.date: 05/06/2025
-ms.author: madsd
+ms.date: 06/04/2025
+ms.author: jordanselig
 ms.custom:
   - "UpdateFrequency3, fasttrack-edit"
   - build-2025
@@ -56,7 +56,7 @@ Things you can't do with Hybrid Connections include:
 
 ## Add and Create Hybrid Connections in your app
 
-To create a Hybrid Connection:
+To create a Hybrid Connection in the Azure portal:
 
 1. In the [Azure portal], select your app. Select **Settings** > **Networking**.
 1. Next to **Hybrid connections**, select the **Not configured** link. Here you can see the Hybrid Connections that are configured for your app.
@@ -84,6 +84,23 @@ When a Hybrid Connection is added to your app, you can see details on it simply
 
 :::image type="content" source="media/app-service-hybrid-connections/hybrid-connections-properties.png" alt-text="Screenshot of Hybrid connections details.":::
 
+### Create a Hybrid Connection in ARM/Bicep
+
+To create a Hybrid Connection using an ARM/Bicep template, add the following resource to your existing template. You must include the `userMetadata` to have a valid Hybrid Connection. If you don't include the `userMetadata`, the Hybrid Connection doesn't work. If you create the Hybrid Connection in the Azure portal, this property is automatically filled in for you.
+
+The `userMetadata` property should be a string representation of a JSON array in the format `[{"key": "endpoint", "value : "host:port"}]`. The following Bicep template has a sample for this property. For more information, see [Microsoft.Relay namespaces/hybridConnections](/azure/templates/microsoft.relay/namespaces/hybridconnections).
+
+```bicep
+resource hybridConnection 'Microsoft.Relay/namespaces/hybridConnections@2024-01-01' = {
+  parent: relayNamespace
+  name: hybridConnectionName
+  properties: {
+    requiresClientAuthorization: true
+    userMetadata: '[{"key": "endpoint", "value : "<HOST>:<PORT>"}]'
+  }
+}
+```
+
 ### Create a Hybrid Connection in the Azure Relay portal
 
 In addition to the portal experience from within your app, you can create Hybrid Connections from within the Azure Relay portal. For a Hybrid Connection to be used by App Service, it must:

articles/application-gateway/media/application-gateway-create-gateway-portal/application-gateway-create-zone-redundant.png

@@ -45,7 +45,10 @@ Create the application gateway using the tabs on the **Create application gatewa
    - **Application gateway name**: Enter *myAppGateway* for the name of the application gateway.
    - Use the default selections for other settings.
 
-     ![Screenshot of create new application gateway: basics.](./media/application-gateway-create-gateway-portal/application-gateway-create-basics.png)
+     ![Screenshot of create new application gateway: basics.](./media/application-gateway-create-gateway-portal/application-gateway-create-zone-redundant.png)
+
+    > [!NOTE]
+    > Application Gateways are zone-redundant by default in regions that support multiple availability zones.
 
 2. For Azure to communicate between the resources that you create, a virtual network is needed. You can either create a new virtual network or use an existing one. In this example, you'll create a new virtual network at the same time that you create the application gateway. Application Gateway instances are created in separate subnets. You create two subnets in this example: One for the application gateway, and another for the backend servers.
 

articles/application-gateway/quick-create-portal.md

@@ -3,7 +3,7 @@ title: Tutorial - Scale clusters in a private cloud
 description: In this tutorial, you use the Azure portal to scale an Azure VMware Solution private cloud.
 ms.topic: tutorial
 ms.service: azure-vmware
-ms.date: 6/7/2024
+ms.date: 6/4/2025
 ms.custom: engagement-fy23
 
 #Customer intent: As a VMware administrator, I want to learn how to scale an Azure VMware Solution private cloud in the Azure portal.
@@ -39,14 +39,9 @@ We do not allow the mixing of AV36, AV36P, or AV52 SKUs within the same cluster.
 
 2. The deployment of the new cluster will begin.
 
-## Scale a cluster
+## Scale a cluster - Host Addition
 
-> [!NOTE]
-> Scaling down a cluster successfully requires all objects (VM/vmdk/iso/etc) on a vSAN datastore to be configured with a storage policy below or equal to [RAID level requirements](configure-storage-policy.md).
-> Scaling down a cluster will place requested host(s) into maintenance mode prior to actual removal of host from vCenter inventory.
 
-> [!CAUTION]
-> Deleting a cluster terminates all running workloads and components and is an irreversible operation. Once you delete a cluster, you cannot recover the data.
 
 1. In your Azure VMware Solution private cloud, under **Manage**, select **Clusters**.
 
@@ -63,6 +58,28 @@ We do not allow the mixing of AV36, AV36P, or AV52 SKUs within the same cluster.
    >[!NOTE] 
    >The hosts will be added to the cluster in parallel.
 
+## Scale a cluster - Host Removal
+> [!CAUTION]
+> Deleting a cluster terminates all running workloads and components and is an irreversible operation. Once you delete a cluster, you cannot recover the data.
+
+> [!NOTE]
+> Scaling down a cluster successfully requires all objects (VM/vmdk/iso/etc) on a vSAN datastore to be configured with a storage policy below or equal to [RAID level requirements](configure-storage-policy.md).
+> Scaling down a cluster will place requested host(s) into maintenance mode prior to actual removal of host from vCenter inventory.
+> Clusters cannot be scaled down past the minimum requirement of 3 hosts per cluster. 
+
+1. In your Azure VMware Solution private cloud, under **Manage**, select **Clusters**.
+
+2. Select the cluster you want to scale down, select **More** (...), then select **Edit**.
+
+   :::image type="content" source="media/tutorial-scale-private-cloud/ss4-select-scale-private-cloud-2.png" alt-text="Screenshot showing where to edit an existing cluster." lightbox="media/tutorial-scale-private-cloud/ss4-select-scale-private-cloud-2.png" border="true":::
+
+3. Select the host you want to remove, select **More** (...), select **Delete**, then select **Save**.
+
+   :::image type="content" source="media/tutorial-scale-private-cloud/remove-host-from-cluster.png" alt-text="Screenshot showing how to remove a host from an existing cluster." lightbox="media/tutorial-scale-private-cloud/remove-host-from-cluster.png" border="true":::
+
+   The removal of a host from the cluster begins.
+
+
 ## Next steps
 
 If you require another Azure VMware Solution private cloud, [create another private cloud](tutorial-create-private-cloud.md) following the same networking prerequisites, cluster, and host limits.

articles/azure-vmware/media/tutorial-scale-private-cloud/remove-host-from-cluster.png

@@ -6,6 +6,7 @@ description: Provides an overview of the BareMetal Infrastructure on Azure.
 ms.custom: references_regions
 ms.topic: concept-article
 ms.date: 08/15/2024
+# Customer intent: As a systems architect, I want to evaluate BareMetal Infrastructure options in Azure, so that I can determine if they meet the requirements for my mission-critical, specialized workloads and ensure optimal performance and control for my enterprise applications.
 ---
 
 #  What is BareMetal Infrastructure on Azure?

articles/azure-vmware/tutorial-scale-private-cloud.md

@@ -6,6 +6,7 @@ description: Learn how to identify and interact with BareMetal instances in the
 ms.topic: how-to
 ms.custom: devx-track-azurecli
 ms.date: 08/15/2024
+# Customer intent: As an infrastructure administrator, I want to register and manage BareMetal instances in Azure using the portal or CLI, so that I can effectively deploy, monitor, and maintain high-performance applications on dedicated hardware.
 ---
 
 # Connect BareMetal Infrastructure instances in Azure

articles/baremetal-infrastructure/concepts-baremetal-infrastructure-overview.md

@@ -5,6 +5,7 @@ ms.author: jacobjaygbay
 description: Know the terms of Azure BareMetal Infrastructure.
 ms.topic: concept-article
 ms.date: 08/15/2024
+# Customer intent: "As an IT architect, I want to understand the key terms related to BareMetal Infrastructure, so that I can effectively plan and manage our deployment and utilization of these resources within our cloud architecture."
 ---
 
 # Know the terms for BareMetal Infrastructure