Sync release-hotfixes with main

Sync release-hotfixes with main

Author: sethmanheim

AKS-Arc/aks-vmware-overview.md

@@ -2,7 +2,7 @@
 title: AKS enabled by Azure Arc on VMware overview (preview)
 description: Learn about AKS enabled by Azure Arc deployment options on VMware.
 ms.topic: overview
-ms.date: 03/22/2024
+ms.date: 05/08/2025
 author: sethmanheim
 ms.author: sethm 
 ms.reviewer: leslielin

AKS-Arc/kubernetes-monitor-audit-events.md

@@ -3,7 +3,7 @@ title: Monitor Kubernetes audit events in AKS enabled by Azure Arc
 description: Learn how to create a diagnostic setting to access Kubernetes audit logs.
 author: sethmanheim
 ms.topic: how-to
-ms.date: 12/18/2024
+ms.date: 05/08/2024
 ms.author: sethm 
 ms.lastreviewed: 02/26/2024
 ms.reviewer: guanghu
@@ -14,7 +14,7 @@ ms.reviewer: guanghu
 
 [!INCLUDE [hci-applies-to-23h2](includes/hci-applies-to-23h2.md)], AKS enabled by Azure Arc on VMware (preview)
 
-You can access Kubernetes audit logs in Kubernetes control plane logs. Control plane logs for AKS clusters are implemented as [resource logs](/azure/azure-monitor/essentials/resource-logs) in Azure Monitor. Resource logs aren't collected and stored until you create a diagnostic setting to route them to one or more locations. You typically send them to a Log Analytics workspace, which is where most of the data for Container Insights is stored.
+You can access Kubernetes audit logs in Kubernetes control plane logs. Control plane logs for AKS clusters are implemented as [resource logs](/azure/azure-monitor/essentials/resource-logs) in Azure Monitor. Resource logs aren't collected and stored until you create a diagnostic setting to route them to one or more locations. You typically send them to a Log Analytics workspace, which is where most of the data for Container Insights is stored.
 
 ## Create a diagnostic setting
 

azure-local/concepts/azure-hybrid-benefit.md

@@ -6,7 +6,7 @@ ms.author: sethm
 ms.topic: conceptual
 ms.service: azure-local
 ms.custom: devx-track-azurepowershell
-ms.date: 12/09/2024
+ms.date: 05/08/2025
 ---
 
 # Azure Hybrid Benefit for Azure Local
@@ -48,6 +48,7 @@ The following prerequisites are required to activate Azure Hybrid Benefit for yo
 ### Activate Azure Hybrid Benefit
 
 # [Azure portal](#tab/azure-portal)
+
 Follow these steps to activate Azure Hybrid Benefit for Azure Local via the Azure portal:
 
 1. Use your Microsoft Azure credentials to sign in to the Azure portal at this URL: https://portal.azure.com.
@@ -73,83 +74,88 @@ Follow these steps to activate Azure Hybrid Benefit for Azure Local via the Azur
     :::image type="content" source="media/azure-hybrid-benefit/activate-windows-server-subscription.png" alt-text="Screenshot showing how to activate Windows Server subscription." lightbox="media/azure-hybrid-benefit/activate-windows-server-subscription.png":::
 
 # [Azure PowerShell](#tab/azure-powershell)
-Azure PowerShell can be run in Azure Cloud Shell. This document details how to use PowerShell in Azure Cloud Shell. For more information, see [Quickstart for Azure Cloud Shell](/azure/cloud-shell/quickstart).
+
+Azure PowerShell can be run in Azure Cloud Shell. This section describes how to use PowerShell in Azure Cloud Shell. For more information, see [Quickstart for Azure Cloud Shell](/azure/cloud-shell/quickstart).
 
 Launch [Azure Cloud Shell](https://shell.azure.com/) and use Azure PowerShell to perform the following steps:
 
 1. Set up parameters from your subscription, resource group, and system name
-    ```powershell
-    $subscription = "00000000-0000-0000-0000-000000000000" # Replace with your subscription ID
-    $resourceGroup = "local-rg" # Replace with your resource group name
-    $clusterName = "MyLocal" # Replace with your system name
 
-    Set-AzContext -Subscription "${subscription}"
-    ```
+   ```powershell
+   $subscription = "00000000-0000-0000-0000-000000000000" # Replace with your subscription ID
+   $resourceGroup = "local-rg" # Replace with your resource group name
+   $clusterName = "MyLocal" # Replace with your system name
+
+   Set-AzContext -Subscription "${subscription}"
+   ```
+
+1. To view Azure Hybrid Benefit status on a system, run the following command:
 
+   ```powershell
+   Install-Module -Name Az.ResourceGraph
+   Search-AzGraph -Query "resources | where type == 'microsoft.azurestackhci/clusters'| where name == '${clusterName}' | project id, properties['softwareAssuranceProperties']['softwareAssuranceStatus']"
+   ```
 
-1. To view Azure Hybrid Benefits status on a system, run the following command:
-    ```powershell
-    Install-Module -Name Az.ResourceGraph
-    Search-AzGraph -Query "resources | where type == 'microsoft.azurestackhci/clusters'| where name == '${clusterName}' | project id, properties['softwareAssuranceProperties']['softwareAssuranceStatus']"
-    ```
+1. To enable Azure Hybrid Benefit, run the following command and check if Azure Hybrid Benefit was enabled using the previous command:
 
-    
-1. To enable Azure Hybrid Benefits, run the following command and check if Azure Hybrid Benefits got enabled using above command:
-    ```powershell    
-    Invoke-AzStackHciExtendClusterSoftwareAssuranceBenefit -ClusterName "${clusterName}" -ResourceGroupName "${resourceGroup}" -SoftwareAssuranceIntent "Enable"
-    ```
+   ```powershell
+   Invoke-AzStackHciExtendClusterSoftwareAssuranceBenefit -ClusterName "${clusterName}" -ResourceGroupName "${resourceGroup}" -SoftwareAssuranceIntent "Enable"
+   ```
 
 # [Azure CLI](#tab/azure-cli)
-Azure CLI is available to install in Windows, macOS and Linux environments. It can also be run in Azure Cloud Shell. This document details how to use Bash in Azure Cloud Shell. For more information, refer [Quickstart for Azure Cloud Shell](/azure/cloud-shell/quickstart).
+
+Azure CLI is available to install in Windows, macOS and Linux environments. It can also be run in Azure Cloud Shell. This section describes how to use Bash in Azure Cloud Shell. For more information, see [Quickstart for Azure Cloud Shell](/azure/cloud-shell/quickstart).
 
 Launch [Azure Cloud Shell](https://shell.azure.com/) and use Azure CLI to configure Azure Hybrid Benefits following these steps:
 
-1. Set up parameters from your subscription, resource group, and system name
-    ```azurecli
-    subscription="00000000-0000-0000-0000-000000000000" # Replace with your subscription ID
-    resourceGroup="hcicluster-rg" # Replace with your resource group name
-    clusterName="HCICluster" # Replace with your system name
-
-    az account set --subscription "${subscription}"
-    ```
-
-1. To view Azure Hybrid Benefits status on a system, run the following command:
-    ```azurecli    
-    az stack-hci cluster list \
-    --resource-group "${resourceGroup}" \
-    --query "[?name=='${clusterName}'].{Name:name, SoftwareAssurance:softwareAssuranceProperties.softwareAssuranceStatus}" \
-    -o table
-    ```
-
-    
-1. To enable Azure Hybrid Benefits, run the following command:
-    ```azurecli    
-    az stack-hci cluster extend-software-assurance-benefit \
-    --cluster-name "${clusterName}" \
-    --resource-group "${resourceGroup}" \
-    --software-assurance-intent enable
-    ```
+1. Set up parameters for your subscription, resource group, and system name:
+
+   ```azurecli
+   subscription="00000000-0000-0000-0000-000000000000" # Replace with your subscription ID
+   resourceGroup="hcicluster-rg" # Replace with your resource group name
+   clusterName="HCICluster" # Replace with your system name
+
+   az account set --subscription "${subscription}"
+   ```
+
+1. To view Azure Hybrid Benefit status on a system, run the following command:
+
+   ```azurecli
+   az stack-hci cluster list \
+   --resource-group "${resourceGroup}" \
+   --query "[?name=='${clusterName}'].{Name:name, SoftwareAssurance:softwareAssuranceProperties.softwareAssuranceStatus}" \
+   -o table
+   ```
+
+1. To enable Azure Hybrid Benefit, run the following command:
+
+   ```azurecli
+   az stack-hci cluster extend-software-assurance-benefit \
+   --cluster-name "${clusterName}" \
+   --resource-group "${resourceGroup}" \
+   --software-assurance-intent enable
+   ```
 
 ---
 
 ## Maintain compliance for Azure Hybrid Benefit
 
-After you activate Azure Local with Azure Hybrid Benefit, you must regularly check status and maintain compliance for Azure Hybrid Benefit. An Azure Local instance using Azure Hybrid Benefit can run only during the Software Assurance term. When the Software Assurance term is nearing expiry, you need to either renew your agreement with Software Assurance, disable the Azure Hybrid Benefit functionality, or de-provision the systems that are using Azure Hybrid Benefit.
+After you activate Azure Local with Azure Hybrid Benefit, you must regularly check status and maintain compliance for Azure Hybrid Benefit. An Azure Local instance using Azure Hybrid Benefit can run only during the Software Assurance term. When the Software Assurance term is nearing expiration, you must either renew your agreement with Software Assurance, disable the Azure Hybrid Benefit functionality, or de-provision the systems that are using Azure Hybrid Benefit.
 
 You can perform an inventory of your systems through the Azure portal and [Azure Resource Graph](/azure/governance/resource-graph/first-query-azurecli) as described in the following section.
 
 ### Verify that your system is using Azure Hybrid Benefit
 
-You can verify if your system is using Azure Hybrid Benefit via Azure portal, PowerShell, or Azure CLI.
+You can verify if your system is using Azure Hybrid Benefit via the Azure portal, PowerShell, or Azure CLI.
 
 # [Azure portal](#tab/azure-portal)
 
 1. In your Azure Local resource page, under **Settings**, select **Configuration**.
 1. Under **Azure Hybrid Benefit**, the status shows as:
-    - Activated - indicates Azure Hybrid Benefit is activated
-    - Not activated - indicates Azure Hybrid Benefit isn't activated
+    - **Activated** - indicates Azure Hybrid Benefit is activated
+    - **Not activated** - indicates Azure Hybrid Benefit isn't activated
 
-You can also navigate to **Cost Analysis** > **Cost by Resource** > **Cost by Resource**. Expand your Azure Local resource to check that the meter is under **Software Assurance**.
+You can also navigate to **Cost Analysis > Cost by Resource > Cost by Resource**. Expand your Azure Local resource to check that the meter is under **Software Assurance**.
 
 # [Azure PowerShell](#tab/azure-powershell)
 
@@ -196,17 +202,17 @@ az graph query -q "Resources | where type == 'microsoft.azurestackhci/clusters'
 
 This section describes the errors that you might get when activating Azure Hybrid Benefit for Azure Local.
 
-**Error**
+### Error
 
-*Failed to activate Azure Hybrid Benefit. We couldn’t find your Software Assurance contract.*
+Failed to activate Azure Hybrid Benefit. We couldn't find your Software Assurance contract.
 
-**Suggested solution**
+#### Suggested solution
 
-This error can occur if you have a new Software Assurance contract or if you have set up this Azure subscription recently, but your information isn't updated in the portal yet. If you get this error, reach out to us at [[email protected]](mailto:[email protected]) and share the following information:
+This error can occur if you have a new Software Assurance contract or if you set up this Azure subscription recently, but your information isn't updated in the portal yet. If you get this error, reach out to us at [[email protected]](mailto:[email protected]) and share the following information:
 
 - Customer/organization name - the name registered on your Software Assurance contract.
 - Azure subscription ID – to which your Azure Local instance is registered.
-- Agreement number for Software Assurance – this can be found on your purchase order, and is the number you would use to install software from the Volume Licensing Service Center (VLSC).
+- Agreement number for Software Assurance – this can be found on your purchase order, and is the number you use to install software from the Volume Licensing Service Center (VLSC).
 
 ## FAQs
 
@@ -228,12 +234,10 @@ No additional costs are incurred, as Azure Hybrid Benefit is included as part of
 
 Consult your Account Manager or licensing partner.
 
-### When would the new pricing benefit for Azure Hybrid Benefit take effect?
+### When does the new pricing benefit for Azure Hybrid Benefit take effect?
 
 The pricing benefit for Azure Local host fees takes effect immediately upon activation of Azure Hybrid Benefit for your system. The pricing benefit for Windows Server subscription takes effect immediately after you activate both Azure Hybrid Benefit and Windows Server subscription.
 
 ## Next steps
 
-For related information, see also:
-
 - [Azure Hybrid Benefit for Windows Server](/windows-server/get-started/azure-hybrid-benefit).

azure-local/deploy/deploy-via-portal.md

@@ -3,29 +3,30 @@ title: Deploy an Azure Local instance using the Azure portal
 description: Learn how to deploy an Azure Local instance from the Azure portal
 author: alkohli
 ms.topic: how-to
-ms.date: 05/01/2025
+ms.date: 05/07/2025
 ms.author: alkohli
 ms.service: azure-local
 #CustomerIntent: As an IT Pro, I want to deploy an Azure Local instance of 1-16 machines via the Azure portal so that I can host VM and container-based workloads on it.
 ---
 
 # Deploy Azure Local using the Azure portal
 
-> Applies to: Azure Local 2503 and later
-
 This article helps you deploy an Azure Local instance using the Azure portal.
 
-> [!IMPORTANT]
-> The Azure portal will block deployments of Azure Local for versions 2411.3 or earlier. To deploy these versions, use an Azure Resource Manager (ARM) template. For more information, see [Deploy Azure Local via Azure Resource Manager deployment template](./deployment-azure-resource-manager-template.md).
-
 ## Prerequisites
 
 - Completion of [Register your machines with Azure Arc and assign deployment permissions](./deployment-arc-register-server-permissions.md).
 <!-- Cristian to confirm * For three-node systems, the network adapters that carry the in-cluster storage traffic must be connected to a network switch. Deploying three-node systems with storage network adapters that are directly connected to each machine without a switch isn't supported in this preview.-->
 
+::: moniker range="<=azloc-24113"
+
+- To deply Azure Local 2411.3 and earlier, use the alternative version of the [Azure portal](https://aka.ms/dfc-2411deploycluster). Use this version only for deployment, don't use it for any other purpose.
+
+::: moniker-end
+
 ## Start the wizard and fill out the basics
 
-1. Open a web browser and navigate to [**Azure portal**](https://portal.azure.com). Search for and select **Azure Local**. On the **Azure Arc|Azure Local**, go to the **Get started** tab. On the **Deploy Azure Local** tile, select **Create instance**.
+1. Go to the Azure portal. Search for and select **Azure Local**. On the **Azure Arc|Azure Local**, go to the **Get started** tab. On the **Deploy Azure Local** tile, select **Create instance**.
 
    :::image type="content" source="./media/deploy-via-portal/get-started-1.png" alt-text="Screenshot of the Get started tab in deployment via Azure portal." lightbox="./media/deploy-via-portal/get-started-1.png":::
 

azure-local/deploy/deployment-arc-register-server-permissions.md

@@ -187,6 +187,13 @@ This section describes how to assign Azure permissions for deployment from the A
 
 1. In the right pane, go to **Role assignments**. Verify that the deployment user has all the configured roles.
 
+1. In the Azure portal, go to **Microsoft Entra Roles and Administrators** and assign the **Cloud Application Administrator** role permission at the Microsoft Entra tenant level.
+
+    :::image type="content" source="media/deployment-arc-register-server-permissions/cloud-application-administrator-role-at-tenant.png" alt-text="Screenshot of the Cloud Application Administrator permission at the tenant level." lightbox="./media/deployment-arc-register-server-permissions/cloud-application-administrator-role-at-tenant.png":::
+
+    > [!NOTE]
+    > The Cloud Application Administrator permission is temporarily needed to create the service principal. After deployment, this permission can be removed. 
+
 ## Next steps
 
 After setting up the first machine in your instance, you're ready to deploy using Azure portal: