Merge pull request #3286 from MicrosoftDocs/main638598564967526294sync_temp

For protected branch, push strategy should use PR and merge to target branch method to work around git push error

Author: learn-build-service-prod[bot]

azure-stack/hci/azure-stack-hci-license-billing.yml

@@ -1,6 +1,6 @@
 ### YamlMime:FAQ
 metadata:
-  title: Azure Stack HCI OEM license and billing FAQ (preview)
+  title: Azure Stack HCI OEM license and billing FAQ
   description: The Azure Stack HCI FAQ provides information on the Azure Stack HCI OEM license and billing.
   ms.topic: faq
   author: ronmiab
@@ -9,12 +9,10 @@ metadata:
   ms.subservice: azure-stack-hci
   ms.date: 07/15/2024
 
-title: Azure Stack HCI OEM license and billing FAQ (preview)
+title: Azure Stack HCI OEM license and billing FAQ
 summary: |
   This FAQ provides information on the Azure Stack HCI OEM license and billing and applies to Azure Stack HCI, version 23H2.
 
-  This feature is currently in PREVIEW. See the [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/) for legal terms that apply to Azure features that are in beta, preview, or otherwise not yet released into general availability.
-
 sections:
   - name: Azure Stack HCI OEM license and billing FAQ
     questions:

azure-stack/hci/azure-stack-hci-oem-license.md

@@ -1,5 +1,5 @@
 ---
-title: Azure Stack HCI OEM license overview (preview)
+title: Azure Stack HCI OEM license overview
 description: Learn about the Azure Stack HCI OEM license, its benefits, license requirements, activation, and more.
 author: ronmiab
 ms.topic: overview
@@ -10,14 +10,12 @@ ms.subservice: azure-stack-hci
 # customer intent: As a content developer, I want to provide customers with the appropriate Azure Stack HCI OEM license information so that they can have a clear understanding of what the license is and how it can be beneficial to them.
 ---
 
-# Azure Stack HCI OEM license overview (preview)
+# Azure Stack HCI OEM license overview
 
 [!INCLUDE [applies-to](../includes/hci-applies-to-23h2.md)]
 
 This article covers the Azure Stack HCI OEM license, its benefits, license requirements, activation, and more.
 
-[!INCLUDE [important](../includes/hci-preview.md)]
-
 ## About the OEM license
 
 The Azure Stack HCI OEM license is designed for Azure Stack HCI hardware including [Azure Stack HCI Premier Solutions, Integrated Systems, and Validated Nodes](https://azurestackhcisolutions.azure.microsoft.com/#/catalog?systemType=PremierSolution). The license remains valid for the lifetime of the hardware, covers up to 16 cores, and includes three essential services for your cloud infrastructure:

azure-stack/hci/upgrade/about-upgrades-23h2.md

@@ -3,7 +3,7 @@ title: About Azure Stack HCI Upgrade to latest version 23H2
 description: Learn about how to upgrade from Azure Stack HCI, version 22H2 to latest Azure Stack HCI, version 23H2.
 author: alkohli
 ms.topic: conceptual
-ms.date: 08/13/2024
+ms.date: 08/19/2024
 ms.author: alkohli
 ms.reviewer: alkohli
 ms.subservice: azure-stack-hci
@@ -56,7 +56,9 @@ The following diagram illustrates the Azure Stack HCI upgrade process:
 :::image type="content" source="./media/about-upgrades-23h2/update-os-to-23h2-and-apply-the-solution-update.png" alt-text="Diagram that illustrates the two steps to update the Azure Stack HCI OS and then apply the solution update." lightbox="./media/about-upgrades-23h2/update-os-to-23h2-and-apply-the-solution-update.png":::
 
 > [!IMPORTANT]
-> If you were running AKS workloads on your Azure Stack HCI cluster, you must remove Azure Kubernetes Service and all the settings from AKS enabled by Azure Arc before you apply the solution upgrade. Kubernetes versions are incompatible between Azure Stack HCI, version 22H2, and version 23H2. Additionally, Preview versions of Arc VMs can't be updated.
+> - If running Azure Kubernetes Service (AKS) workloads on your Azure Stack HCI cluster, you must remove AKS and all the settings from AKS enabled by Azure Arc before you apply the solution upgrade. Kubernetes versions are incompatible between Azure Stack HCI, version 22H2, and version 23H2. 
+> - Preview versions of Arc VMs can't be updated.
+> - If running stretched clusters, you must upgrade to version 23H2 OS to maintain your cluster in a supported state. The solution upgrade is not initially available for stretched clusters.
 
 ## Next steps
 

azure-stack/hci/upgrade/troubleshoot-upgrade-to-azure-stack-hci-23h2.md

@@ -3,7 +3,7 @@ title: Troubleshoot Azure Stack HCI upgrade
 description: Learn how to troubleshoot upgrade on your Azure Stack HCI system. 
 author: alkohli
 ms.topic: how-to
-ms.date: 08/12/2024
+ms.date: 08/19/2024
 ms.author: alkohli
 ms.reviewer: alkohli
 ---
@@ -22,23 +22,23 @@ When you [Upgrade the OS](./upgrade-22h2-to-23h2-powershell.md), you may encount
 
 Run the following PowerShell command to verify that the cluster is registered with Azure:
 
-```powershell
-PS C:\> Get-AzureStackHci
+```PowerShell
+Get-AzureStackHci
 ```
 
 Here's a sample output:
 
 ```output
-ClusterStatus : Clustered
-RegistrationStatus : Registered
-RegistrationDate : 8/1/2024 9:15:12 AM
-AzureResourceName : Redmond
-AzureResourceUri : /Subscriptions/<Subscription I>/resourceGroups/Redmond/providers/Microsoft.AzureStackHCI/clusters/Redmond
-ConnectionStatus : Connected
-LastConnected : 8/1/2024 11:30:42 AM
+ClusterStatus :          Clustered
+RegistrationStatus :     Registered
+RegistrationDate :       8/1/2024 9:15:12 AM
+AzureResourceName :      Redmond
+AzureResourceUri :       /Subscriptions/<Subscription ID>/resourceGroups/Redmond/providers/Microsoft.AzureStackHCI/clusters/Redmond
+ConnectionStatus :       Connected
+LastConnected :          8/1/2024 11:30:42 AM
 NextSync :
-IMDSAttestation : Disabled
-DiagnosticLevel : Basic
+IMDSAttestation :        Disabled
+DiagnosticLevel :        Basic
 Region :
 ```
 
@@ -48,35 +48,36 @@ If `RegistrationStatus` is **Not registered**, follow troubleshooting steps in [
 
 Run the following PowerShell command to verify Network ATC intent health state:
 
-```powershell
-PS C:\> Get-netintentstatus
+```PowerShell
+Get-NetIntentStatus
 ```
 
 Here's a sample output:
 
 ```output
-IntentName : converged
-Host : win-llbl239crrl
-IsComputeIntentSet : True
-IsManagementIntentSet : True
-IsStorageIntentSet : True
-IsStretchIntentSet : False
-LastUpdated : 08/01/2024 17:34:09
-LastSuccess : 08/01/2024 17:34:09 
-RetryCount : 0
-LastConfigApplied : 1
-Error :
-Progress : 1 of 1
-ConfigurationStatus : Success
-ProvisioningStatus : Completed
+PS C:\Users\administrator.CONTOSO> Get-NetlntentStatus
+IntentName:            convergedintent
+Host:                  nodel 
+IsComputeintentSet:    True
+IsHanagementlntentSet: True
+IsStoragelntentSet:    True
+IsStretchlntentSet:    False
+LastUpdated:           08/13/2024 18:01:43
+LastSuccess:           08/13/2024 17:25:10
+RetryCount:            0
+LastConfigApplied:     1
+Error:                 PhysicalAdapterNotFound
+Progress:              1 of 1
+ConfigurationStatus:   Retrying
+ProvisioningStatus:    Pending
 ```
 
 If the `ConfigurationStatus` isn't healthy, verify that the VM network adapter name is the same as the network adapter name.
 
 Run the following PowerShell commands to verify that the network adapter name for `vManagement` matches the VM network adapter name:
 
-```powershell
-PS C:\> Get-NetAdapter
+```PowerShell
+Get-NetAdapter
 ```
 
 Here's a sample output:
@@ -97,8 +98,8 @@ vManagement(converged)    Hyper-V Virtual Ethernet Adapter             14 Up
 vSMB(converged#Embedde... Hyper-V Virtual Ethernet Adapter #3          24 Up           00-15-5D-20-40-03        25 Gbps 
 ```
 
-```powershell
-PS C:\> Get-VmNetworkAdapter -ManagementOS 
+```PowerShell
+Get-VmNetworkAdapter -ManagementOS 
 ```
 
 Here's a sample output:
@@ -117,13 +118,13 @@ vSMB(converged#Embedded FlexibleLOM 1 Port 2) True                  ConvergedSwi
 
 Both names must match. If names don't match, run the following PowerShell command to rename the network adapter:
 
-```powershell
-Rename-netadapter -Name "badname" -NewName "VMNetworkadapterName"
+```PowerShell
+Rename-NetAdapter -Name "badname" -NewName "VMNetworkadapterName"
 ```
 
 Run the following PowerShell command to force a network ATC intent update:
 
-```powershell
+```PowerShell
 Set-NetIntentRetryState -Name "YourIntentName"
 ```
 

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

@@ -3,7 +3,7 @@ title: Upgrade Azure Stack HCI, version 22H2 OS to version 23H2 via other manual
 description: Learn how to upgrade from Azure Stack HCI, version 22H2 OS to Azure Stack HCI, version 23H2 using other manual methods.
 author: alkohli
 ms.topic: how-to
-ms.date: 07/30/2024
+ms.date: 08/19/2024
 ms.author: alkohli
 ms.reviewer: alkohli
 ms.subservice: azure-stack-hci
@@ -13,16 +13,14 @@ ms.subservice: azure-stack-hci
 
 [!INCLUDE [applies-to](../../includes/hci-applies-to-23h2-22h2.md)]
 
-This article describes how to upgrade the Azure Stack HCI, version 22H2 Operating System (OS) to version 23H2, which is the latest generally available software using other manual methods via Cluster Aware Updating (CAU) and [SConfig](/windows-server/administration/server-core/server-core-sconfig).
-
-There are other methods to upgrade the OS that include using the Server Configuration tool (SConfig), and Cluster Aware Updating (CAU).  Cluster aware updating orchestrates the process of applying the operating system automatically to all the cluster members using either Windows Update or ISO media.
+This article describes how to upgrade the Azure Stack HCI, version 22H2 Operating System (OS) to version 23H2, which is the latest generally available software, using manual methods such as [SConfig](/windows-server/administration/server-core/server-core-sconfig) and performing an offline upgrade.
 
 While you can use these other methods, PowerShell is the recommended method to upgrade the OS. For more information, see [Upgrade the Azure Stack HCI, version 22H2 OS to Azure Stack HCI, version 23H2 OS via PowerShell](./upgrade-22h2-to-23h2-powershell.md).
 
 Throughout this article, we refer to Azure Stack HCI, version 23H2 as the new version and Azure Stack HCI, version 22H2 as the old version.
 
 > [!IMPORTANT]
-> To keep your Azure Stack HCI service in a supported state, you have up to six months to install this new OS version. The update is applicable to all the Azure Stack HCI, version 22H2 clusters. We strongly recommend that you install this version as soon as it becomes available.
+> To keep your Azure Stack HCI service in a supported state, you have up to six months to install this new OS version. The update is applicable to all Azure Stack HCI, version 22H2 clusters. We strongly recommend that you install this version as soon as it becomes available.
 
 ## High-level workflow for the OS upgrade
 
@@ -36,7 +34,7 @@ To upgrade the OS on your cluster, follow these high-level steps:
    1. [Manual upgrade of a Failover Cluster using SConfig.](#method-1-perform-a-manual-os-update-of-a-failover-cluster-using-sconfig)
    1. [Offline manual upgrade of all servers in a cluster.](#method-2-perform-a-fast-offline-os-update-of-all-servers-in-a-cluster)
 1. Check the status of the updates.
-1. Perform post-upgrade steps, after the OS is upgraded.
+1. [Perform post-upgrade steps, after the OS is upgraded.](#next-steps)
 
 
 ## Complete prerequisites
@@ -53,7 +51,10 @@ Before you begin, make sure that:
 
 Follow these steps on your client to connect to one of the servers of your Azure Stack HCI cluster.
 
-1. Run PowerShell as administrator on the client that you're using to connect to your cluster.
+> [!IMPORTANT]
+> To perform a manual upgrade using SConfig, you must log in directly to the cluster nodes.  You can use remote PowerShell to control cluster actions, or you can run the commands directly from each node when performing the update.
+
+1. Run PowerShell as Administrator on the client that you're using to connect to your cluster.
 2. Open a remote PowerShell session to a server on your Azure Stack HCI cluster. Run the following command and provide the credentials of your server when prompted:
 
    ```powershell
@@ -105,12 +106,22 @@ If there's a critical security update <!--ASK-->that you need to apply quickly o
 1. Plan your maintenance window.
 1. Take the virtual disks offline.
 1. Stop the cluster to take the storage pool offline. Run the `Stop-Cluster` cmdlet or use Windows Admin Center to stop the cluster.
-1. Set the cluster service to **Disabled** in *Services.msc* on each server. This prevents the cluster service from starting up while being updated.
+1. Set the cluster service to **Disabled** by running the PowerShell command below on each server. This prevents the cluster service from starting up while being updated.
+
+   ```
+   Set-Service -Name clussvc -StartupType Disabled
+   ```
+   
 1. <!--ASK-->Apply the Windows Server Cumulative Update and any required Servicing Stack Updates to all servers. You can update all servers at the same time: there's no need to wait because the cluster is down.
 1. Restart the servers and ensure everything looks good.
-1. Set the cluster service back to **Automatic** on each server.
+1. Set the cluster service back to **Automatic** by running the PowerShell command below on each server.
+
+   ```
+   Set-Service -Name clussvc -StartupType Automatic
+   ```
+   
 1. Start the cluster. Run the `Start-Cluster` cmdlet or use Windows Admin Center.  
-1. Give it a few minutes. Make sure the storage pool is healthy.
+1. Give it a few minutes. Make sure the storage pool is healthy.  Run `Get-StorageJob` to ensure all jobs complete successfully.
 1. Bring the virtual disks back online.
 1. Monitor the status of the virtual disks by running the `Get-Volume` and `Get-VirtualDisk` cmdlets.
 
@@ -120,4 +131,4 @@ You're now ready to perform the post-upgrade steps for your cluster.
 
 ## Next steps
 
-- [Learn how to perform the post-upgrade steps for your Azure Stack HCI cluster.](./post-upgrade-steps.md)
+- [Learn how to perform the post-upgrade steps for your Azure Stack HCI cluster.](./post-upgrade-steps.md)