Merge branch 'main' into md-uuf-359323-upgrade-wac

Author: Manika Dhiman

azure-local/TOC.yml

@@ -567,7 +567,180 @@ items:
       href: concepts/route-reflector-overview.md
     - name: SDN Multisite overview
       href: concepts/sdn-multisite-overview.md
-
+- name: Version 22H2
+  items:
+  - name: Release information for version 22H2
+    href: release-information.md
+  - name: Azure Benefits (22H2 and earlier)
+    href: ./manage/azure-benefits.md
+  - name: Review requirements for 22H2
+    href: concepts/system-requirements.md
+  - name: Deploy version 22H2
+    items:
+    - name: 0. Download the software
+      href: deploy/download-software.md
+    - name: 1. Deploy the OS
+      href: deploy/operating-system.md
+    - name: 2. Create a system
+      href: deploy/create-cluster.md
+    - name: 3. Set up a witness
+      href: manage/witness.md    
+    - name: 4. Register with Azure
+      href: deploy/register-with-azure.md
+    - name: 5. Validate the system
+      href: deploy/validate.md
+    - name: Deploy with PowerShell
+      items:
+      - name: Deploy on a single server
+        href: deploy/single-server.md
+      - name: Single server scale-out
+        href: manage/single-node-scale-out.md
+      - name: Create a system with PowerShell
+        href: deploy/create-cluster-powershell.md
+      - name: Host networking with Network ATC
+        href: deploy/network-atc.md?pivots=azure-local
+    - name: Deploy SDN 
+      items:
+      - name: Deploy using Windows Admin Center
+        href: deploy/sdn-wizard.md
+      - name: Deploy using SDN Express
+        href: manage/sdn-express.md
+      - name: Deploy at system creation
+        href: deploy/create-cluster.md#step-5-sdn-optional
+    - name: Deploy and manage in VMM
+      href: /system-center/vmm/deploy-manage-azure-stack-hci?toc=/azure/azure-local/toc.json&bc=/azure/azure-local/breadcrumb/toc.json  
+    - name: Deploy workloads
+      items: 
+      - name: Branch office and edge
+        href: deploy/branch-office-edge.md
+      - name: Virtual desktop infrastructure
+        href: deploy/virtual-desktop-infrastructure.md
+      - name: SQL Server
+        href: deploy/sql-server.md
+      - name: Trusted enterprise virtualization
+        href: deploy/trusted-enterprise-virtualization.md
+  - name: Manage
+    items:
+    - name: Manage VMs
+      items:
+      - name: Deploy Windows Server Azure Edition VMs
+        href: manage/windows-server-azure-edition.md
+      - name: Upgrade VMs to Windows Server Azure Edition
+        href: manage/upgrade-vm-windows-server-azure-edition.md
+      - name: Use GPUs with clustered VMs
+        href: /windows-server/virtualization/hyper-v/deploy/use-gpu-with-clustered-vm?pivots=azure-local&context=/azure/azure-local/context/context
+    - name: Manage storage
+      items:
+      - name: Create stretched volumes
+        href: manage/create-stretched-volumes.md
+      - name: Storage thin provisioning
+        href: manage/thin-provisioning.md
+      - name: Thin provisioning conversion
+        href: manage/thin-provisioning-conversion.md
+    - name: Monitor systems
+      items:
+      - name: Monitor single system with Insights
+        href: manage/monitor-hci-single.md
+      - name: Monitor multiple systems with Insights
+        href: manage/monitor-hci-multi.md
+      - name: Monitor systems from Windows Admin Center
+        href: manage/monitor-cluster.md
+      - name: Use DISKSPD to test workloads
+        href: manage/diskspd-overview.md
+    - name: Manage systems
+      items:
+      - name: (Optional) Configure proxy settings
+        href: manage/configure-proxy-settings.md
+      - name: Manage system registration
+        href: manage/manage-cluster-registration.md
+      - name: Manage systems with Windows Admin Center
+        href: manage/cluster.md
+      - name: Manage systems with PowerShell
+        href: manage/cluster-powershell.md
+      - name: Manage Network ATC
+        href: manage/manage-network-atc.md?pivots=azure-local
+      - name: Update the system
+        href: manage/update-cluster.md
+      - name: Manage quick restarts
+        href: manage/kernel-soft-reboot.md
+    - name: Manage nodes
+      items:
+      - name: Add or remove nodes
+        href: manage/add-cluster.md
+      - name: Convert to stretched cluster
+        href: manage/convert-to-stretched-cluster.md
+      - name: Take a node offline for maintenance
+        href: manage/maintain-servers.md
+      - name: Change languages
+        href: manage/languages.md
+      - name: Change privacy settings
+        href: manage/change-privacy-settings.md
+      - name: Use BitLocker with Cluster Shared Volumes
+        href: /windows-server/failover-clustering/bitlocker-on-csv-in-ws-2022?context=/azure/azure-local/context/context
+    - name: Manage Azure services
+      items:
+      - name: Hybrid capabilities with Azure services
+        href: hybrid-capabilities-with-azure-services.md
+      - name: Register Windows Admin Center with Azure
+        href: manage/register-windows-admin-center.md
+      - name: Use Windows Admin Center in Azure
+        href: /windows-server/manage/windows-admin-center/azure/manage-hci-clusters?context=/azure/azure-local/context/context
+      - name: Use Azure portal
+        href: manage/azure-portal.md
+    - name: Manage SDN 
+      items:
+      - name: Manage default network access policies
+        href: manage/manage-default-network-access-policies-virtual-machines.md   
+  - name: Troubleshooting
+    items:
+    - name: Troubleshoot system registration
+      href: deploy/troubleshoot-hci-registration.md
+    - name: Troubleshoot system validation reporting
+      href: manage/validate-qos.md
+    - name: Troubleshoot CredSSP
+      href: manage/troubleshoot-credssp.md
+    - name: Troubleshoot live migration
+      href: /troubleshoot/windows-server/virtualization/troubleshoot-live-migration-issues?context=/azure/azure-local/context/context
+    - name: Troubleshoot Storage Spaces Direct
+      href: /windows-server/storage/storage-spaces/troubleshooting-storage-spaces?context=/azure/azure-local/context/context
+    - name: Troubleshoot storage health
+      href: /windows-server/storage/storage-spaces/storage-spaces-states?context=/azure/azure-local/context/context
+    - name: Collect diagnostic data
+      href: manage/collect-diagnostic-data.md
+  - name: Migrate using SCVMM
+    items:
+    - name: For Hyper-V VMs
+      href: /system-center/vmm/deploy-manage-azure-stack-hci#step-8-migrate-vms-from-windows-server-to-azure-local-instance
+    - name: For VMware VMs
+      href: /system-center/vmm/deploy-manage-azure-stack-hci#step-9-migrate-vmware-workloads-to-azure-local-instance-using-scvmm
+  - name: Concepts
+    items:
+    - name: Storage and systems
+      items:
+      - name: Single-node systems
+        href: concepts/single-server-clusters.md
+      - name: Stretched clusters
+        href: concepts/stretched-clusters.md
+      - name: Nested virtualization
+        href: concepts/nested-virtualization.md
+    - name: Software Defined Networking (SDN)
+      items:
+      - name: SDN overview
+        href: concepts/software-defined-networking.md
+      - name: Plan an SDN infrastructure
+        href: concepts/plan-software-defined-networking-infrastructure.md
+      - name: Plan Network Controller
+        href: concepts/network-controller.md
+    - name: Maintenance and security
+      items:
+      - name: Updates and upgrades
+        href: concepts/updates.md
+      - name: Security considerations
+        href: concepts/security.md
+      - name: Utility applications
+        href: concepts/utility-applications.md
+      - name: Data collection
+        href: concepts/data-collection.md
 - name: Reference
   items:
   - name: For Azure Local VM management

azure-local/includes/azure-local-verify-update.md

@@ -0,0 +1,38 @@
+---
+author: alkohli
+ms.author: alkohli
+ms.service: azure-local
+ms.topic: include
+ms.date: 05/13/2024
+---
+
+## Step 3: Check the status of an update
+
+To get the summary information about an update in progress, run the `Get-CauRun` cmdlet:
+
+```PowerShell
+Get-CauRun -ClusterName <SystemName>
+```
+
+Here's a sample output: <!--ASK-->
+
+```output
+RunId                   : <Run ID> 
+RunStartTime            : 10/13/2024 1:35:39 PM 
+CurrentOrchestrator     : NODE1 
+NodeStatusNotifications : { 
+Node      : NODE1 
+Status    : Waiting 
+Timestamp : 10/13/2024 1:35:49 PM 
+} 
+NodeResults             : { 
+Node                     : NODE2 
+Status                   : Succeeded 
+ErrorRecordData          : 
+NumberOfSucceededUpdates : 0 
+NumberOfFailedUpdates    : 0 
+InstallResults           : Microsoft.ClusterAwareUpdating.UpdateInstallResult[] 
+}
+```
+
+You're now ready to perform the post-OS upgrade steps for your system.

azure-local/manage/virtual-machine-manage-extension.md

@@ -5,7 +5,7 @@ author: alkohli
 ms.author: alkohli
 ms.topic: how-to
 ms.service: azure-local
-ms.date: 03/27/2025
+ms.date: 05/15/2025
 ---
 
 # Manage VM extensions on Azure Local virtual machines 
@@ -25,7 +25,7 @@ For a full list of supported VM extensions, see:
 
 ## Prerequisites
 
-- Access to a VM running on Azure Local with guest management enabled. Guest management is supported on Windows and Linux VMs. For information on how to create a VM, see [Create Azure Local VMs(./create-arc-virtual-machines.md).
+- Access to a VM running on Azure Local with guest management enabled. Guest management is supported on Windows and Linux VMs. For information on how to create a VM, see [Create Azure Local VMs](./create-arc-virtual-machines.md).
 
 ## Verify that guest management is enabled
 

azure-local/release-information.md

@@ -5,7 +5,7 @@ author: alkohli
 ms.author: alkohli
 ms.topic: conceptual
 ms.service: azure-local
-ms.date: 04/22/2025
+ms.date: 05/13/2025
 ---
 
 # Azure Stack HCI, version 22H2 release information
@@ -26,6 +26,7 @@ All dates are listed in ISO 8601 format: *YYYY-MM-DD*
 
 | **OS build** | **Availability date** | **KB article** |
 |:-|:-|:-|
+| 20349.3692 | 2025-05-13 | [KB 5058385](https://support.microsoft.com/topic/may-13-2025-security-update-kb5058385-f5bee2f1-a4de-4d73-a8ff-4f3e760965b1) |
 | 20349.3561 | 2025-04-11 | [KB 5058920](https://support.microsoft.com/topic/april-11-2025-non-security-update-5058920-out-of-band-586390cc-2951-478e-9e10-28e6a559ecc1) |
 | 20349.3453 | 2025-04-08 | [KB 5055526](https://support.microsoft.com/topic/april-8-2025-security-update-kb5055526-8645284f-476f-40b2-b6ca-a61876893c6e) |
 | 20349.3328 | 2025-03-11 | [KB 5053603](https://support.microsoft.com/topic/march-11-2025-security-update-kb5053603-11c37709-3521-4e80-a223-a8c4846ae980) |

azure-local/upgrade/install-enable-network-atc.md

@@ -5,7 +5,7 @@ author: ronmiab
 ms.author: robess
 ms.topic: how-to
 ms.reviewer: alkohli
-ms.date: 02/28/2025
+ms.date: 05/14/2025
 ms.service: azure-local
 #Customer intent: As a Senior Content Developer, I want to provide customers with content and steps to help them successfully install and enable Network ATC on their existing Azure Local, version 22H2 instance.
 ---
@@ -19,6 +19,7 @@ This article provides information on how to install and enable Network ATC on an
 > [!IMPORTANT]
 > - Before you apply the solution upgrade, make sure to install and enable Network ATC on your existing Azure Local instance. If Network ATC is already enabled on your existing system, you can skip this step. 
 > - We recommend that you set up Network ATC after you have upgraded the operating system from version 22H2 to version 23H2. For more information, see [Upgrade Azure Local to the latest version 23H2 via PowerShell](./upgrade-22h2-to-23h2-powershell.md).
+> - If you’re enabling Network ATC for the first time on an existing Azure Local system with SDN workloads or want to avoid downtime during migration to a Network ATC managed system, skip this article and contact support.
 
 ## About Network ATC
 

azure-local/upgrade/upgrade-22h2-to-23h2-other-methods.md

@@ -3,7 +3,7 @@ title: Upgrade Azure Stack HCI OS, version 22H2 to version 23H2 via other method
 description: Learn how to upgrade from Azure Stack HCI OS, version 22H2 to version 23H2 using other manual methods on Azure Local.
 author: alkohli
 ms.topic: how-to
-ms.date: 05/12/2025
+ms.date: 05/13/2025
 ms.author: alkohli
 ms.reviewer: alkohli
 ms.service: azure-local
@@ -170,7 +170,7 @@ If there's a critical security update <!--ASK-->that you need to apply quickly o
 
 <!--ASK-->
 
-You're now ready to perform the post-upgrade steps for your system.
+[!INCLUDE [verify-update](../includes/azure-local-verify-update.md)]
 
 ## Next steps
 

azure-local/upgrade/upgrade-22h2-to-23h2-powershell.md

@@ -3,7 +3,7 @@ title: Upgrade Azure Stack HCI OS, version 22H2 to version 23H2 via PowerShell
 description: Learn how to use PowerShell to upgrade Azure Stack HCI OS, version 22H2 to version 23H2.
 author: alkohli
 ms.topic: how-to
-ms.date: 05/12/2025
+ms.date: 05/13/2025
 ms.author: alkohli
 ms.reviewer: alkohli
 ms.service: azure-local
@@ -170,36 +170,7 @@ To install the new OS using PowerShell, follow these steps:
 
 Wait for the update to complete and check the status of the update.
 
-## Step 3: Check the status of an update
-
-To get the summary information about an update in progress, run the `Get-CauRun` cmdlet:
-
-```PowerShell
-Get-CauRun -ClusterName <SystemName>
-```
-
-Here's a sample output: <!--ASK-->
-
-```output
-RunId                   : <Run ID> 
-RunStartTime            : 10/13/2024 1:35:39 PM 
-CurrentOrchestrator     : NODE1 
-NodeStatusNotifications : { 
-Node      : NODE1 
-Status    : Waiting 
-Timestamp : 10/13/2024 1:35:49 PM 
-} 
-NodeResults             : { 
-Node                     : NODE2 
-Status                   : Succeeded 
-ErrorRecordData          : 
-NumberOfSucceededUpdates : 0 
-NumberOfFailedUpdates    : 0 
-InstallResults           : Microsoft.ClusterAwareUpdating.UpdateInstallResult[] 
-}
-```
-
-You're now ready to perform the post-OS upgrade steps for your system.
+[!INCLUDE [verify-update](../includes/azure-local-verify-update.md)]
 
 ## Next steps