Sync release-hotfixes with main

sethmanheim · web-flow · commit 3e43d43f4c91 · 2025-05-29T12:22:34.000-07:00
diff --git a/AKS-Arc/aks-edge-howto-secret-encryption.md b/AKS-Arc/aks-edge-howto-secret-encryption.md
@@ -92,7 +92,7 @@ If there are errors with the KMS plugin, follow this procedure:
    Repair-AksEdgeKms
    ```
 
-1. If you still encounter errors, contact [Microsoft Customer Support](aks-edge-troubleshoot-overview.md) and [collect logs](aks-get-kubelet-logs.md).
+1. If you still encounter errors, contact [Microsoft Customer Support](aks-edge-troubleshoot-overview.md) and [collect logs](aks-edge-resources-logs.md).
 
 ## Next steps
 
diff --git a/azure-local/deploy/deployment-arc-register-configurator-app.md b/azure-local/deploy/deployment-arc-register-configurator-app.md
@@ -4,7 +4,7 @@ description: Learn how to use the Configurator app to bootstrap and quickly regi
 author: alkohli
 ms.author: alkohli
 ms.topic: how-to
-ms.date: 05/22/2025
+ms.date: 05/29/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.
 ---
@@ -133,7 +133,7 @@ Follow these steps to configure network settings and connect the machines to Azu
 
    :::image type="content" source="media/deployment-arc-register-configurator-app/review-apply-tab-1.png" alt-text="Screenshot of the Review and apply tab in the Configurator app for Azure Local." lightbox="media/deployment-arc-register-configurator-app/review-apply-tab-1.png":::
 
-### Step 2: Complete registration of machines to Azure
+## Step 2: Complete registration of machines to Azure
 
 1. Wait for the configuration to complete. First, machine is configured with the basic details followed by registration of the machines to Azure.
 
@@ -151,7 +151,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
 
@@ -206,44 +206,30 @@ Follow these steps to collect and download a Support package:
 
 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
+#### Upload the Support log package
 
->[!IMPORTANT]
-> Uploading the Support package to Microsoft can take up to 20 minutes. Make sure to leave the app open and running to complete this process.
+> [!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.
 
 Follow these steps to upload the Support 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** dialog:
+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":::
 
-    1. The **Cloud type** is populated automatically as `Azure`.
-   
-    1. Enter a **Subscription ID** to register the machine.
-
-    1. Provide a **Resource group** name. This resource group contains the machine and system resources that you create.
-
-    1. Specify the **Region** where you want to create the resources. The region should be the same as the region where you want to deploy the Azure Local instance.
-
-       > [!IMPORTANT]
-       > Specify the region with spaces removed. For example, specify the East US region as `EastUS`.
-
-    1. Provide a **Tenant ID**. The tenant ID is the directory ID of your Microsoft Entra tenant. To get the tenant ID, see [Find your Microsoft Entra tenant](/azure/azure-portal/get-subscription-tenant-id).
-
-    1. If you set up an Azure Arc gateway, specify the Arc gateway ID. This is the resource ID of the Arc gateway that you set up. For more information, see [About Azure Arc gateways](./deployment-azure-arc-gateway-overview.md).
-
-       > [!IMPORTANT]
-       > Make sure to verify all the inputs before you proceed. Any incorrect inputs here might result in an upload failure.
+    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 **Upload** to upload the Support package.
-   1. Authenticate in the browser with the same account that you used to sign in to the Configurator app. The upload process might take several minutes.
+1. Select **Begin upload** to upload the Support log 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":::
+   :::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.-->
+1. After the upload is complete, you receive a confirmation message. You can also view the upload status in the app.
 
 ### Clean previous installation
 
@@ -257,4 +243,4 @@ If you have more than one version of the app installed, when you try to open the
 
 - After your machines are registered with Azure Arc, proceed to deploy your Azure Local system via one of the following options:
     - [Deploy via Azure portal](./deploy-via-portal.md).
-    - [Deploy via ARM template](./deployment-azure-resource-manager-template.md).
+    - [Deploy via ARM template](./deployment-azure-resource-manager-template.md).
diff --git a/azure-local/manage/troubleshoot-arc-enabled-vms.md b/azure-local/manage/troubleshoot-arc-enabled-vms.md
@@ -1,19 +1,49 @@
 ---
-title: Troubleshoot Azure Local VMs enabled by Azure Arc
-description: Learn how to troubleshoot Azure Local VMs.
+title: Troubleshoot Azure Local Virtual Machines enabled by Azure Arc
+description: Learn how to troubleshoot issues you experience with Azure Local Virtual Machines (VMs).
 author: alkohli
 ms.topic: how-to
-ms.date: 03/27/2025
+ms.date: 05/29/2025
 ms.author: alkohli
 ms.reviewer: vlakshmanan
 ms.service: azure-local
 ---
 
-# Troubleshoot Azure Local VMs enabled by Azure Arc
+# Troubleshoot Azure Local Virtual Machines enabled by Azure Arc
 
 [!INCLUDE [hci-applies-to-23h2](../includes/hci-applies-to-23h2.md)]
 
-This article describes how to collect logs and troubleshoot issues with Azure Local VMs enabled by Azure Arc. It also lists the current limitations and known issues with Azure Local VM management, along with recommended resolutions.
+This article describes how to collect logs and troubleshoot issues with Azure Local Virtual Machines (VMs) enabled by Azure Arc. It also lists the current limitations and known issues with Azure Local VM management, along with recommended resolutions.
+
+
+## Property isn't supported for this operation
+
+**Error:**
+
+`Property '<Property Name>' isn't supported for this operation on your Azure Local cluster version. Please update your cluster if you want to set this property for this operation. Please view aka.ms/hciproperties.`
+
+**Cause:**
+
+This error occurs when the feature you're trying to use isn't available for the software version running on your Azure Local instance. This can happen if the software version on your cluster is outdated or the feature was introduced in a later version.
+
+**Resolution:**
+
+To resolve this issue, update your Azure Local instance to the latest version. For more information, see [Update via PowerShell](../update/update-via-powershell-23h2.md) or [Update via Azure portal](../update/azure-update-manager-23h2.md).
+
+
+## Cluster extension doesn't support resource type
+
+**Error:**
+
+`The cluster extension '<Cluster Extension Azure Resource Manager ID>' doesn't support resource type 'Microsoft.AzureStackHCI/<Resource Type>'. The currently enabled resource types are '<Supported Resource Type Names>'. Please ensure the 'Microsoft.AzureStackHCI' cluster extension version metadata file supports the resource type. [ClusterExtensionVersion='<Cluster Extension Version>'] [CorrelationId='<Correlation ID>'].`
+
+**Cause:**
+
+This error occurs when the feature you're trying to use isn't available for the software version running on your Azure Local instance. This can happen if the software version on your cluster is outdated or the feature was introduced in a later version.
+
+**Resolution:**
+
+To resolve this issue, update your Azure Local instance to the latest version. For more information, see [Update via PowerShell](../update/update-via-powershell-23h2.md) or [Update via Azure portal](../update/azure-update-manager-23h2.md).
 
 ## Unable to select an image for Trusted launch VMs
 
@@ -39,7 +69,7 @@ Follow these steps to verify that the Managed Identity isn't created for this VM
 
     :::image type="content" source="./media/troubleshoot-arc-enabled-vms/managed-identity-missing-2.png" alt-text="Screenshot of JSON view indicating the Managed Identity is absent." lightbox="./media/troubleshoot-arc-enabled-vms/managed-identity-missing-2.png":::
 
-1. To create managed identity, connect to the Azure Local machine via RDP. Run the following command:
+1. To create managed identity, connect to the Azure Local machine via Remote Desktop Protocol (RDP). Run the following command:
     
     ```azurecli
     az extension add --name connectedmachine
@@ -86,17 +116,17 @@ Or, you see this error:
 
 **Error:** `{"code":"moc-operator galleryimage serviceClient returned an error while reconciling: rpc error: code = Unknown desc = ===== RESPONSE ERROR (ErrorCode=NoAuthenticationInformation) =====\nDescription=, Details: (none)\n","message":"moc-operator galleryimage serviceClient returned an error while reconciling: rpc error: code = Unknown desc = ===== RESPONSE ERROR (ErrorCode=NoAuthenticationInformation) =====\nDescription=, Details: (none)\n"}`
 
-The failure occurs because the user creating the image does not have the right permissions to access the image from the storage account. The user must have the **Storage Blob Data Contributor** role on the storage account that you use for the image. For more information, see [Assign Azure roles](/azure/role-based-access-control/role-assignments-portal?tabs=current) for access to blob data.
+The failure occurs because the user creating the image doesn't have the right permissions to access the image from the storage account. The user must have the **Storage Blob Data Contributor** role on the storage account that you use for the image. For more information, see [Assign Azure roles](/azure/role-based-access-control/role-assignments-portal?tabs=current) for access to blob data.
 
 **Resolution:**
 
-Add the **Storage Blob Data Contributor** role to the user that needs to create an image from this storage account. Once role has been added, retry deploying the image.
+Add the **Storage Blob Data Contributor** role to the user that needs to create an image from this storage account. Once role is added, retry deploying the image.
 
-You may also see the following error when trying to deploy a VM image from a storage account:
+You might also see the following error when trying to deploy a VM image from a storage account:
 
 **Error:** `{"code":"moc-operator galleryimage serviceClient returned an error while reconciling: rpc error: code = Unknown desc = ===== RESPONSE ERROR (ErrorCode=InvalidBlobType) =====\nDescription=The blob type is invalid for this operation.\nRequestId:5e74055f-e01e-0033-66eb-ff9734000000\nTime:2024-09-05T23:32:56.3001852Z, Details: (none)\n","message":"moc-operator galleryimage serviceClient returned an error while reconciling: rpc error: code = Unknown desc = ===== RESPONSE ERROR (ErrorCode=InvalidBlobType) =====\nDescription=The blob type is invalid for this operation.\nRequestId:5e74055f-e01e-0033-66eb-ff9734000000\nTime:2024-09-05T23:32:56.3001852Z, Details: (none)\n","additionalInfo":[{"type":"ErrorInfo","info":{"category":"Uncategorized","recommendedAction":"","troubleshootingURL":""}}]}`
 
-This failure is because the blob type is not correct within the storage account. The image must be of `page blob` type.
+This failure is because the blob type isn't correct within the storage account. The image must be of `page blob` type.
 
 **Resolution:**
 
@@ -133,6 +163,7 @@ If your environment fails to recognize Azure CLI after installing it, run the fo
 ```
 
 
+
 ## Next steps
 
 - [Azure Local VM management FAQs](./azure-arc-vms-faq.yml)
diff --git a/azure-local/release-information-23h2.md b/azure-local/release-information-23h2.md
@@ -106,8 +106,8 @@ Starting with Azure Local 2503, you can discover and import update packages for
 
 |Version| OS Build |Security update| What's new | Known issues |
 |------|-------|---------------|------------|--------------|
-| 12.2505.1001.23 <br><br> Availability date: 2025-05-28 | 26100.4061 | [May OS security update](security-update/security-update.md?view=azloc-2505&preserve-view=true) | [Features and improvements](./whats-new.md?view=azloc-2505&preserve-view=true#features-and-improvements-in-2505) | [Known issues](./known-issues.md?view=azloc-2505&preserve-view=true) |
-| 12.2504.1001.20 <br><br> Availability date: 2025-04-29 | 26100.3775 | [April OS security update](security-update/security-update.md?view=azloc-2504&preserve-view=true) | [Features and improvements](./whats-new.md?view=azloc-2504&preserve-view=true#features-and-improvements-in-2504) | [Known issues](./known-issues.md?view=azloc-2504&preserve-view=true) |
+| 12.2505.1001.23 <br><br> Availability date: 2025-05-28 | 26100.4061 | [May OS security update](security-update/security-update.md?view=azloc-2505&preserve-view=true&tabs=new-deployments) | [Features and improvements](./whats-new.md?view=azloc-2505&preserve-view=true#features-and-improvements-in-2505) | [Known issues](./known-issues.md?view=azloc-2505&preserve-view=true) |
+| 12.2504.1001.20 <br><br> Availability date: 2025-04-29 | 26100.3775 | [April OS security update](security-update/security-update.md?view=azloc-2504&preserve-view=true&tabs=new-deployments) | [Features and improvements](./whats-new.md?view=azloc-2504&preserve-view=true#features-and-improvements-in-2504) | [Known issues](./known-issues.md?view=azloc-2504&preserve-view=true) |
 
 ---
 
diff --git a/azure-local/whats-new.md b/azure-local/whats-new.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/29/2025
 ---
 
 # What's new in Azure Local?
@@ -45,6 +45,10 @@ This release has the following features and improvements:
 
 - **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).
 
+- **Ability to upload logs**: You can now upload a Support log package that includes all relevant logs to help Microsoft Support troubleshoot machine issues, directly from the Configurator app. For details, see [Upload the Support log package](./deploy/deployment-arc-register-configurator-app.md#upload-the-support-log-package).
+
+- **Archival of Azure Local, version 22H2 documentation**: The archival of Azure Local, version 22H2 documentation is currently in progress and will be completed soon. Once archived, the articles will be available in the [Azure previous versions documentation](/previous-versions/azure/) for reference. The archived documentation isn't updated and isn't supported.
+
 ::: moniker-end
 
 
