Merging changes synced from https://github.com/MicrosoftDocs/azure-stack-docs-pr (branch live)

Author: Learn Build Service GitHub App

azure-local/deploy/deployment-arc-register-configurator-app.md

@@ -1,10 +1,10 @@
 ---
-title: Configurator application for Azure Local (Preview)
-description: Learn how to use the Configurator application to bootstrap and Arc register the Azure Local machines. (Preview)
+title: Configurator App for Azure Local to Register Machines (Preview)
+description: Learn how to use the Configurator app to bootstrap and quickly register your Azure Local machines with Azure Arc. (Preview)
 author: alkohli
 ms.author: alkohli
 ms.topic: how-to
-ms.date: 04/30/2025
+ms.date: 05/23/2025
 ms.service: azure-local
 #CustomerIntent: As an IT Pro, I want to bootstrap and Arc register Azure Local machines via the Arc registration script.
 ---
@@ -13,7 +13,7 @@ ms.service: azure-local
 
 > Applies to: Azure Local 2502 and later
 
-This article describes how to use the Configurator app to bootstrap and register the machines you plan to include in your Azure Local instance.
+This article explains how to use the Configurator app to quickly bootstrap and register machines in your Azure Local instance, enabling seamless Azure Arc integration.
 
 You can use the Configurator app or [Azure CLI](./deployment-arc-register-server-permissions.md) to register your machines. If you plan to deploy a few machines per site, use the Configurator app.
 
@@ -28,7 +28,6 @@ Before you begin, make sure that you complete the following prerequisites:
 [!INCLUDE [hci-registration-azure-local-machine-prerequisites](../includes/hci-registration-azure-local-machine-prerequisites.md)]
 
 - Download the [Configurator App for Azure Local](https://aka.ms/ConfiguratorAppForHCI).
-
 - Note down:
 
    - The serial number for each machine.
@@ -151,7 +150,7 @@ Follow these steps to configure network settings and connect the machines to Azu
 
 1. On the resource group used to bootstrap, you should see your Arc-enabled machines. In this example, you see a single machine.
 
-   :::image type="content" source="media/deployment-arc-register-configurator-app/setup-arc-enabled-servers.png" alt-text="Screenshot that shows the Azure Arc agent Arc-enabled servers in Azure portal for Azure Local ." lightbox="media/deployment-arc-register-configurator-app/setup-arc-enabled-servers.png":::
+   :::image type="content" source="media/deployment-arc-register-configurator-app/setup-arc-enabled-servers.png" alt-text="Screenshot that shows the Azure Arc agent Arc-enabled servers in Azure portal for Azure Local." lightbox="media/deployment-arc-register-configurator-app/setup-arc-enabled-servers.png":::
 
 ## Troubleshooting
 
@@ -166,7 +165,7 @@ You might need to collect logs or diagnose problems if you encounter any issues
 
 If you can't access the app, you can get the logs from a machine. Logs are stored in the following location: `C:\Windows\System32\Bootstrap\Logs`. You can access the logs by connecting to the machine via Remote Desktop Protocol (RDP).
 
-If you can access the app, follow the instructions in [Run diagnostic tests](#run-diagnostic-tests-from-the-app) to troubleshoot the issue and if needed, [Collect a support package](#collect-a-support-package-from-the-app).
+If you can access the app, follow the instructions in [Run diagnostic tests](#run-diagnostic-tests-from-the-app) to troubleshoot the issue and if needed, [Collect a support package](#collect-a-support-log-package-from-the-app).
 
 ### Run diagnostic tests from the app
 
@@ -192,16 +191,46 @@ Here's a table that describes the diagnostic tests:
 | Azure Arc agent                  | This test validates the Azure Arc agent is installed and running on the machine. |
 | Environment checker              | The Environment Checker tool runs a series of tests to evaluate the deployment readiness of your environment for Azure Local deployment including those for connectivity, hardware, Active Directory, network, and Arc integration. For more information, see [Evaluate the deployment readiness of your environment for Azure Local](../manage/use-environment-checker.md#about-the-environment-checker-tool). |
 
-### Collect a Support package from the app
+### Collect a Support log package from the app
+
+A Support log package is composed of all the relevant logs that can help Microsoft Support troubleshoot any machine issues. You can generate a Support package via the app.
 
-A Support package is composed of all the relevant logs that can help Microsoft Support troubleshoot any machine issues. You can generate a Support package via the app. Follow these steps to collect a Support package:
+#### Download the Support log package
+
+Follow these steps to collect and download a Support log package:
 
 1. Select the help icon in the top-right corner of the app to open the **Support + troubleshooting** pane. Select **Create** to begin support package collection. The package collection could take several minutes.
 
    :::image type="content" source="media/deployment-arc-register-configurator-app/collect-support-package-1.png" alt-text="Screenshot that shows the Support and troubleshooting pane with Create selected." lightbox="media/deployment-arc-register-configurator-app/collect-support-package-1.png":::
 
 1. After the Support package is created, select **Download**. This action downloads two zipped packages corresponding to Support logs and Configurator logs on your local system. You can unzip the package and view the system log files.
 
+#### Upload the Support log package
+
+> [!IMPORTANT]
+> - Make sure to run the Configurator app as an administrator to upload the Support log package.
+> - Uploading the Support log package to Microsoft can take up to 20 minutes. Make sure to leave the app open and running to complete this process.
+
+Collect a Support log package before you upload it. Follow these steps to upload the Support log package to Microsoft:
+
+1. Select the help icon in the top-right corner of the app to open the **Support + troubleshooting** pane. Select **Upload** to upload the Support package to Microsoft.
+
+   :::image type="content" source="media/deployment-arc-register-configurator-app/upload-support-package-1.png" alt-text="Screenshot that shows the Support and troubleshooting pane with Upload package selected." lightbox="media/deployment-arc-register-configurator-app/upload-support-package-1.png":::
+
+1. Provide the required information in the **Upload Support package to Microsoft** dialog:
+
+   :::image type="content" source="media/deployment-arc-register-configurator-app/upload-support-package-2.png" alt-text="Screenshot that shows the Upload Support Package dialog filled out." lightbox="media/deployment-arc-register-configurator-app/upload-support-package-2.png":::
+
+   The fields in the dialog are prepopulated with the information you provided during [Step 1: Configure the network and connect to Azure](#step-1-configure-the-network-and-connect-to-azure). You can modify the fields as needed.
+
+
+   1. Select **Begin upload** to upload the Support package.
+   1. Authenticate in the browser with the same account that you used to sign in to register with Azure Arc. The upload process might take several minutes. Leave the app open and running until the upload is complete.
+
+       :::image type="content" source="media/deployment-arc-register-configurator-app/upload-support-package-3.png" alt-text="Screenshot that shows the Support and troubleshooting pane with Upload selected and authentication guidance." lightbox="media/deployment-arc-register-configurator-app/upload-support-package-3.png":::
+
+   1. After the upload is complete, you receive a confirmation message. You can also view the upload status in the app.
+
 ### Clean previous installation
 
 If you have more than one version of the app installed, when you try to open the app, an older version of the app might open. To fix this issue, clean the previous installation. Follow these steps to clean the previous installation:

azure-local/deploy/media/deployment-arc-register-configurator-app/upload-support-package-1.png

@@ -86,14 +86,14 @@
     },
     "fileMetadata": {
       "monikerRange": {
-      "./*.md": ">=azloc-2411 || =azloc-previous",
-      "./*.yml": ">=azloc-2411 || =azloc-previous"
+      "./*.md": ">=azloc-24111 || =azloc-previous",
+      "./*.yml": ">=azloc-24111 || =azloc-previous"
       }
     },
     "template": [],
     "groups": {
       "version-azlocal": {
-        "moniker_range": ">=azloc-2411 || =azloc-previous",
+        "moniker_range": ">=azloc-24111 || =azloc-previous",
         "dest": "azure-local"
       }
     }

azure-local/deploy/media/deployment-arc-register-configurator-app/upload-support-package-2.png

@@ -344,7 +344,7 @@ The following table lists the known issues from previous releases:
 
 ::: moniker-end
 
-::: moniker range="=azloc-2411"
+::: moniker range="=azloc-previous"
 
 ## Known issues for version 2411
 
@@ -397,10 +397,6 @@ The following table lists the known issues from previous releases:
 | Update | When updating the Azure Local instance via the Azure Update Manager, the update progress and results may not be visible in the Azure portal.| To work around this issue, on each node, add the following registry key (no value needed):<br><br>`New-Item -Path "HKLM:\SYSTEM\CurrentControlSet\Services\HciCloudManagementSvc\Parameters" -force`</br><br> Then on one of the nodes, restart the Cloud Management cluster group. </br><br>`Stop-ClusterGroup "Cloud Management"`</br><br>`Start-ClusterGroup "Cloud Management"`</br><br> This won't fully remediate the issue as the progress details may still not be displayed for a duration of the update process. To get the latest update details, you can [Retrieve the update progress with PowerShell](./update/update-via-powershell-23h2.md#step-6-track-update-progress). |
 | Update <!--26659432--> |In some cases, `SolutionUpdate` commands could fail if run after the `Send-DiagnosticData` command.  | Make sure to close the PowerShell session used for `Send-DiagnosticData`. Open a new PowerShell session and use it for `SolutionUpdate` commands.|
 
-::: moniker-end
-
-::: moniker range="=azloc-previous"
-
 ## Known issues for version 2408.2
 
 This software release maps to software version number **2408.2.7**.

azure-local/deploy/media/deployment-arc-register-configurator-app/upload-support-package-3.png

@@ -1,10 +1,10 @@
 ---
-title: Manage capacity by adding a node on Azure Local, version 23H2
+title: Manage Capacity by Adding a Node on Azure Local, Version 23H2
 description: Learn how to manage capacity on your Azure Local, version 23H2 system by adding a node.
 ms.topic: article
 author: alkohli
 ms.author: alkohli
-ms.date: 05/08/2025
+ms.date: 05/22/2025
 ---
 
 # Add a node on Azure Local

azure-local/docfx.json

@@ -3,7 +3,7 @@ title:  Security updates for Azure Local, version 23H2
 description: Security updates for Azure Local, version 23H2.
 author: alkohli
 ms.topic: conceptual
-ms.date: 04/25/2025
+ms.date: 05/12/2025
 ms.author: alkohli
 ms.reviewer: alkohli
 ---
@@ -306,7 +306,7 @@ For a list of the files that are provided in this update, download the file info
 
 ::: moniker-end
 
-::: moniker range="azloc-2411"
+::: moniker range="azloc-previous"
 
 ## November OS security update (KB) for Azure Local
 
@@ -344,10 +344,6 @@ To install the LCU on your Azure Local instance, see [Update Azure Stack Local i
 
 For a list of the files that are provided in this update, download the file information for [Cumulative update KB 5046618](https://go.microsoft.com/fwlink/?linkid=2296832).
 
-::: moniker-end
-
-::: moniker range="azloc-previous"
-
 ## October OS security update (KB 5044288) for Azure Local
 
 <!-- [!INCLUDE [applies-to](../includes/hci-applies-to-23h2.md)] -->

azure-local/known-issues.md

@@ -5,7 +5,7 @@ ms.topic: overview
 author: alkohli
 ms.author: alkohli
 ms.service: azure-local
-ms.date: 05/08/2025
+ms.date: 05/22/2025
 ---
 
 # What's new in Azure Local?
@@ -16,6 +16,35 @@ ms.date: 05/08/2025
 
 This article lists the various features and improvements that are available in Azure Local. The latest version of Azure Local solution focuses on cloud-based deployment and updates, cloud-based monitoring, new and simplified experience for Azure Local virtual machine (VM) management, security, and more.
 
+::: moniker range="=azloc-2505"
+
+There are two 2505 releases for May. Here are the details of each release:
+
+|Solution version  |OS version |Deployment  |
+|---------|---------|---------|
+|12.2505.1001.23 |  26100.4061        | New deployments only.        |
+|11.2505.1001.22  | 25398.1611        | Existing deployments only.        |
+
+For more information, see [Release information summary](./release-information-23h2.md).
+
+## Features and improvements in 2505
+
+This release has the following features and improvements:
+
+- **OS version changes**:
+
+    - In the last release (2504), a new operating system was introduced for Azure Local deployments. For 2505, all the new deployments of Azure Local will run OS version **26100.4061**. You can download the 2505 OS image from the Azure portal. You also need to get the driver compatible with Azure Local 12.2505 or Windows Server 2025. If a compatible driver is not available, you can use the 2503 image.
+    
+        Existing deployments of Azure Local will continue to use OS version **25398.1611**. For more information, see [Release information summary](./release-information-23h2.md).
+
+    - If you've purchased Integrated System or Premier solution hardware from the [Azure Local Catalog](https://aka.ms/AzureStackHCICatalog) through your preferred Microsoft hardware partner, the OS should be preinstalled. Work with your Original Equipment Manufacturer (OEM) to get the OS image compatible with **12.2505** and driver compatible with Azure Local 12.2505 or Windows Server 2025.
+
+- **.NET updates**: This build uses .NET version **8.0.16** for both .NET Runtime and ASP.NET Core. For more details, see [Download .NET 8.0](https://dotnet.microsoft.com/download/dotnet/8.0).
+
+- **Update changes**: This release includes reliability improvements to the update process. For more information, see [Fixed issues in 2505](./known-issues.md?view=azloc-2505&preserve-view=true#fixed-issues).
+
+::: moniker-end
+
 ::: moniker range="=azloc-2504"
 
 Starting with 2504 release, Microsoft introduced a new versioning schema. There are two 2504 releases for April. Here are the details of each release:
@@ -170,7 +199,7 @@ For more information on improvements in this release, see the [Fixed issues in 2
 
 ::: moniker-end
 
-::: moniker range="=azloc-2411"
+::: moniker range="=azloc-previous"
 
 ## Features and improvements in 2411
 
@@ -219,10 +248,6 @@ This release has the following features and improvements:
 
 - **AKS on Azure Local** - This release has several new features and enhancements for AKS on Azure Local. For more information, see [What's new in AKS on Azure Local](/azure/aks/hybrid/aks-whats-new-23h2).
 
-::: moniker-end
-
-::: moniker range="=azloc-previous"
-
 ## Features and improvements in 2408.2
 
 This release has the following features and improvements: