Merge branch 'main' of https://github.com/MicrosoftDocs/azure-stack-docs-pr into md-collect-logs-portal

Author: Manika Dhiman

.openpublishing.publish.config.json

@@ -92,6 +92,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "azure-reference-other-repo",
+      "url": "https://github.com/MicrosoftDocs/azure-reference-other-pr",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "quickstart-templates",
       "url": "https://github.com/Azure/azure-quickstart-templates",

.openpublishing.redirection.aks.json

@@ -1355,6 +1355,11 @@
         "redirect_url": "/azure/aks/hybrid/manage-node-pools",
         "redirect_document_id": false
       },
+      {
+        "source_path": "AKS-Hybrid/manage-control-plane-nodes.md",
+        "redirect_url": "/azure/aks/hybrid/manage-node-pools",
+        "redirect_document_id": false
+      },
       {
         "source_path": "AKS-Hybrid/deploy-metallb.md",
         "redirect_url": "/azure/aks/hybrid/deploy-load-balancer",
@@ -1365,6 +1370,16 @@
         "redirect_url": "/azure/aks/hybrid/aks-get-kubelet-logs",
         "redirect_document_id": false
       },
+      {
+        "source_path": "AKS-Hybrid/reference/aks-edge-ps/set-aksedgebillingpodstate.md",
+        "redirect_url": "/azure/aks/hybrid/reference/aks-edge-ps/",
+        "redirect_document_id": false
+      },
+      {
+        "source_path": "AKS-Hybrid/reference/aks-edge-ps/set-aksedgenodeconnectivitymode.md",
+        "redirect_url": "/azure/aks/hybrid/reference/aks-edge-ps/",
+        "redirect_document_id": false
+      },
       {
         "source_path": "AKS-Hybrid/aks-hci-evaluation-guide.md",
         "redirect_url": "/azure/aks/hybrid/overview",
@@ -1377,7 +1392,7 @@
       },
       {
         "source_path": "AKS-Hybrid/offline-download.md",
-        "redirect_url": "/azure/aks/hybrid/aks-overview",
+        "redirect_url": "/azure/aks/hybrid/aks-whats-new-23h2",
         "redirect_document_id": false
       },      
       {

.openpublishing.redirection.json

@@ -1,5 +1,25 @@
 {
   "redirections": [
+    {
+      "source_path":"azure-stack/hci/manage/bitlocker-on-csv.md",
+      "redirect_url":"/azure-stack/hci/manage/manage-bitlocker",
+      "redirect_document_id": false
+    },
+    {
+      "source_path":"azure-stack/hci/manage/install-preview-version.md",
+      "redirect_url":"/azure-stack/hci/whats-new?tabs=2405releases",
+      "redirect_document_id": false
+    },
+    {
+      "source_path":"azure-stack/hci/manage/network-atc-faq.md",
+      "redirect_url":"/azure-stack/hci/whats-new?tabs=2405releases",
+      "redirect_document_id": false
+    },
+    {
+      "source_path":"azure-stack/hci/manage/preview-post-installation.md",
+      "redirect_url":"/azure-stack/hci/whats-new?tabs=2405releases",
+      "redirect_document_id": false
+    },
     {
       "source_path":"azure-stack/hci/manage/preview-channel.md",
       "redirect_url":"/azure-stack/hci/deploy/download-azure-stack-hci-23h2-software",
@@ -145,6 +165,16 @@
       "redirect_url":"/azure/active-directory/develop/howto-create-service-principal-portal", 
       "redirect_document_id":false
     },
+    { 
+      "source_path":"azure-stack/operator/azure-stack-provision-storage-account.md", 
+      "redirect_url":"/azure-stack/operator/azure-stack-manage-storage-accounts", 
+      "redirect_document_id":false
+    },
+    { 
+      "source_path":"azure-stack/user/azure-stack-connect-azure-stack.md", 
+      "redirect_url":"/azure-stack/user/azure-stack-powershell-configure-user", 
+      "redirect_document_id":false
+    },
     { 
       "source_path":"azure-stack/operator/app-service-known-issues-v0.md", 
       "redirect_url":"/azure-stack/operator/app-service-release-notes-2021-q1#known-issues-update", 
@@ -160,6 +190,91 @@
       "redirect_url":"/azure-stack/operator/app-service-release-notes-2020-q2#known-issues-update", 
       "redirect_document_id":false
     },    
+    { 
+      "source_path":"azure-stack/operator/azure-stack-app-service-release-notes-update-five.md", 
+      "redirect_url":"/azure-stack/operator/app-service-release-notes-2302", 
+      "redirect_document_id":false
+    },    
+    { 
+      "source_path":"azure-stack/operator/azure-stack-app-service-release-notes-update-six.md", 
+      "redirect_url":"/azure-stack/operator/app-service-release-notes-2302", 
+      "redirect_document_id":false
+    },    
+    { 
+      "source_path":"azure-stack/operator/azure-stack-app-service-release-notes-update-four.md", 
+      "redirect_url":"/azure-stack/operator/app-service-release-notes-2302", 
+      "redirect_document_id":false
+    },    
+    { 
+      "source_path":"azure-stack/operator/azure-stack-app-service-release-notes-update-one.md", 
+      "redirect_url":"/azure-stack/operator/app-service-release-notes-2302", 
+      "redirect_document_id":false
+    },    
+    { 
+      "source_path":"azure-stack/operator/azure-stack-app-service-release-notes-update-seven.md", 
+      "redirect_url":"/azure-stack/operator/app-service-release-notes-2302", 
+      "redirect_document_id":false
+    },    
+    { 
+      "source_path":"azure-stack/operator/azure-stack-app-service-release-notes-update-two.md", 
+      "redirect_url":"/azure-stack/operator/app-service-release-notes-2302", 
+      "redirect_document_id":false
+    },    
+    { 
+      "source_path":"azure-stack/operator/azure-stack-app-service-release-notes-update-three.md", 
+      "redirect_url":"/azure-stack/operator/app-service-release-notes-2302", 
+      "redirect_document_id":false
+    },    
+    { 
+      "source_path":"azure-stack/operator/app-service-release-notes-2020-Q2.md", 
+      "redirect_url":"/azure-stack/operator/app-service-release-notes-2302", 
+      "redirect_document_id":false
+    },    
+    { 
+      "source_path":"azure-stack/operator/app-service-release-notes-2020-Q3.md", 
+      "redirect_url":"/azure-stack/operator/app-service-release-notes-2302", 
+      "redirect_document_id":false
+    },    
+    { 
+      "source_path":"azure-stack/operator/azure-stack-sql-resource-provider-11300.md", 
+      "redirect_url":"/azure-stack/operator/azure-stack-mysql-resource-provider-2-0-13", 
+      "redirect_document_id":false
+    },    
+    { 
+      "source_path":"azure-stack/operator/azure-stack-sql-resource-provider-11330.md", 
+      "redirect_url":"/azure-stack/operator/azure-stack-mysql-resource-provider-2-0-13", 
+      "redirect_document_id":false
+    },    
+    { 
+      "source_path":"azure-stack/operator/azure-stack-sql-resource-provider-11930.md", 
+      "redirect_url":"/azure-stack/operator/azure-stack-mysql-resource-provider-2-0-13", 
+      "redirect_document_id":false
+    },    
+    { 
+      "source_path":"azure-stack/operator/azure-stack-mysql-resource-provider-11300.md", 
+      "redirect_url":"/azure-stack/operator/azure-stack-mysql-resource-provider-2-0-13", 
+      "redirect_document_id":false
+    },    
+    { 
+      "source_path":"azure-stack/operator/azure-stack-mysql-resource-provider-11330.md", 
+      "redirect_url":"/azure-stack/operator/azure-stack-mysql-resource-provider-2-0-13", 
+      "redirect_document_id":false
+    },    
+    { 
+      "source_path":"azure-stack/operator/azure-stack-mysql-resource-provider-11930.md", 
+      "redirect_url":"/azure-stack/operator/azure-stack-mysql-resource-provider-2-0-13", 
+      "redirect_document_id":false
+    },    
+    { 
+      "source_path":"azure-stack/ruggedized/operator/azure-stack-manage-basics-tzl.md", 
+      "redirect_url":"/azure-stack/ruggedized/ruggedized-overview", 
+      "redirect_document_id":false
+    },    
+    { 
+      "source_path":"azure-stack/ruggedized/operator/azure-stack-windows-server-faq-tzl.md", 
+      "redirect_url":"/azure-stack/ruggedized/ruggedized-overview", 
+      "redirect_document_id":false
+    },    
     { 
       "source_path":"azure-stack/operator/known-issues-vn.md", 
       "redirect_url":"/azure-stack/operator/known-issues", 
@@ -215,6 +330,16 @@
       "redirect_url":"/azure-stack/operator/hotfix-1-2108-2-83", 
       "redirect_document_id":false
     },        
+    { 
+      "source_path":"azure-stack/operator/hotfix-1-2008-41-163.md", 
+      "redirect_url":"/azure-stack/operator/hotfix-1-2008-41-161", 
+      "redirect_document_id":false
+    },            
+    { 
+      "source_path":"azure-stack/operator/hotfix-1-2301-2-58.md", 
+      "redirect_url":"/azure-stack/operator/hotfix-1-2301-2-64", 
+      "redirect_document_id":false
+    },            
     { 
       "source_path":"azure-stack/operator/relnotearchive/release-notes-known-issues-1802.md", 
       "redirect_url":"/azure-stack/operator/relnotearchive/release-notes?view=azs-1802", 
@@ -330,6 +455,16 @@
       "redirect_url":"/azure-stack/operator/relnotearchive/release-notes?view=azs-1910", 
       "redirect_document_id":false
     },                          
+    { 
+      "source_path":"azure-stack/operator/relnotearchive/known-issues-2002.md", 
+      "redirect_url":"/azure-stack/operator/relnotearchive/known-issues?view=azs-2002", 
+      "redirect_document_id":false
+    },                          
+    { 
+      "source_path":"azure-stack/operator/relnotearchive/release-notes-2002.md", 
+      "redirect_url":"/azure-stack/operator/relnotearchive/release-notes?view=azs-2002", 
+      "redirect_document_id":false
+    },                          
     { 
       "source_path":"azure-stack/mdc/customer-journey.md", 
       "redirect_url":"/azure-stack/mdc/integration-overview", 
@@ -1334,6 +1469,16 @@
       "source_path": "azure-stack/hci/manage/use-gpu-with-clustered-vm.md",
       "redirect_url": "/windows-server/virtualization/hyper-v/deploy/use-gpu-with-clustered-vm?pivots=azure-stack-hci&toc=/azure-stack/hci/toc.json&bc=/azure-stack/breadcrumb/toc.json",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "azure-stack/user/vm-update-management.md",
+      "redirect_url": "/azure/azure-monitor/agents/agents-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "azure-stack/hci/manage/processor-compatibility-mode.md",
+      "redirect_url": "/windows-server/virtualization/hyper-v/manage/dynamic-processor-compatibility-mode?pivots=azure-stack-hci",
+      "redirect_document_id": false
     }
   ]
 }

AKS-Hybrid/TOC.yml

@@ -47,7 +47,9 @@
       - name: Azure CLI
         href: aks-create-clusters-cli.md
       - name: Azure portal
-        href: aks-create-clusters-portal.md   
+        href: aks-create-clusters-portal.md
+      - name: Bicep
+        href: create-clusters-bicep.md   
       - name: Deploy to Azure using a quickstart template
         href: /samples/azure/azure-quickstart-templates/aks-on-ashci
       - name: Azure Resource Manager template
@@ -64,8 +66,10 @@
           href: deploy-load-balancer-portal.md
         # - name: Troubleshoot issues
         #   href: load-balancer-troubleshoot.md
-    - name: Security and authentication
+    - name: Authentication and authorization
       items:
+      - name: Enable Microsoft Entra ID authentication for Kubernetes clusters
+        href: enable-authentication-microsoft-entra-id.md
       - name: Use Azure RBAC for Kubernetes authorization
         href: azure-rbac-23h2.md
       - name: Use Kubernetes RBAC with Microsoft Entra ID
@@ -94,6 +98,8 @@
         href: cluster-labels.md
       - name: Taints
         href: aks-arc-use-node-taints.md
+      - name: Use availability sets
+        href: availability-sets.md
     - name: Scale a Kubernetes cluster
       href: auto-scale-aks-arc.md
     - name: Upgrade Kubernetes clusters
@@ -186,6 +192,8 @@
       href: aks-edge-howto-access-tpm.md
     - name: Additional configuration
       href: aks-edge-howto-more-configs.md
+    - name: Use GPU acceleration
+      href: aks-edge-gpu.md
     - name: Update AKS Edge Essentials
       items:
       - name: Update online

AKS-Hybrid/ad-sso.md

@@ -3,7 +3,7 @@ title: Use Active Directory single sign-on for secure connection to Kubernetes A
 description: Use Active Directory Authentication to securely connect to the API server with SSO credentials
 author: sethmanheim
 ms.topic: how-to
-ms.date: 06/24/2024
+ms.date: 08/07/2024
 ms.author: sethm 
 ms.lastreviewed: 1/14/2022
 ms.reviewer: sulahiri
@@ -30,7 +30,10 @@ AD integration uses AD kubeconfig, which is distinct from the certificate-based
 Another security benefit with AD integration is that the users and groups are stored as [security identifiers (SIDs)](/troubleshoot/windows-server/identity/security-identifiers-in-windows). Unlike group names, SIDs are immutable and unique and therefore present no naming conflicts.
 
 > [!NOTE]
-> Currently, AD SSO connectivity is only supported for workload clusters.
+> AD SSO connectivity is only supported for workload clusters.
+
+> [!NOTE]
+> The use of nested AD groups (creating an AD group within another AD group) is unsupported.
 
 This article guides you through the steps to set up Active Directory as the identity provider and to enable SSO via `kubectl`:
 

AKS-Hybrid/adapt-apps-mixed-os-clusters.md

@@ -1,9 +1,9 @@
 ---
 title: Adapt applications for use in mixed-OS Kubernetes clusters
-description: How to use node selectors or taints and tolerations on Azure Kubernetes Service to ensure applications in mixed OS Kubernetes clusters running on AKS Arc are scheduled on the correct worker node operating system.
+description: Learn how to use node selectors or taints and tolerations on Azure Kubernetes Service to ensure applications in mixed OS Kubernetes clusters running on AKS Arc are scheduled on the correct worker node operating system.
 author: sethmanheim
 ms.topic: how-to
-ms.date: 11/03/2022
+ms.date: 06/27/2024
 ms.author: sethm 
 ms.lastreviewed: 1/14/2022
 ms.reviewer: abha
@@ -16,29 +16,29 @@ ms.reviewer: abha
 
 [!INCLUDE [applies-to-azure stack-hci-and-windows-server-skus](includes/aks-hci-applies-to-skus/aks-hybrid-applies-to-azure-stack-hci-windows-server-sku.md)]
 
-AKS enabled by Azure Arc enables you to run Kubernetes clusters with both Linux and Windows nodes, but you must make small edits to your apps for use in these mixed-OS clusters. In this how-to guide, you learn how to ensure your application gets scheduled on the right host OS using either node selectors or taints and tolerations.
+AKS enabled by Arc enables you to run Kubernetes clusters with both Linux and Windows nodes, but you must make small edits to your apps for use in these mixed-OS clusters. This how-to guide describes how to ensure your application gets scheduled on the right host OS using either node selectors or taints and tolerations.
 
 This article assumes a basic understanding of Kubernetes concepts. For more information, see [Kubernetes core concepts for AKS enabled by Arc](kubernetes-concepts.md).
 
 ## Node selectors
 
 A *node selector* is a simple field in the pod specification YAML that constrains pods to only be scheduled onto healthy nodes matching the operating system. In your pod specification YAML, specify a `nodeSelector` value of Windows or Linux, as shown in the following examples:
 
-```yml
+```yaml
 kubernetes.io/os = Windows
 ```
 
 or,
 
-```yml
+```yaml
 kubernetes.io/os = Linux
 ```
 
-For more information about nodeSelectors, see [node selectors](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/).
+For more information about node selectors, see [node selectors](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/).
 
 ## Taints and tolerations
 
-**Taints** and **tolerations** work together to ensure that pods aren't scheduled on nodes unintentionally. A node can be "tainted" to reject pods that don't explicitly tolerate its taint through a "toleration" in the pod specification YAML.
+**Taints** and **tolerations** work together to ensure that pods aren't unintentionally scheduled on nodes. A node can be "tainted" to reject pods that don't explicitly tolerate its taint through a "toleration" in the pod specification YAML.
 
 Windows OS nodes in AKS Arc can be tainted when created with the [New-AksHciNodePool](./reference/ps/new-akshcinodepool.md) or the [New-AksHciCluster](./reference/ps/new-akshcicluster.md) commands. You can also use these commands to taint Linux OS nodes. The following example taints Windows nodes.
 
@@ -82,7 +82,7 @@ Taints       : {sku=Windows:NoSchedule}
 
 You can specify a toleration for a pod in the pod specification YAML. The following toleration "matches" the taint created by the `kubectl` taint line shown in the previous example. The result is that a pod with the toleration can schedule onto the tainted nodes.
 
-```yml
+```yaml
 tolerations:
 - key: node.kubernetes.io/os
   operator: Equal

AKS-Hybrid/aks-arc-diagnostic-checker.md

@@ -97,9 +97,9 @@ param (
 $urlArray = @(
     "https://management.azure.com",
     "https://eastus.dp.kubernetesconfiguration.azure.com",
-    "https://log in.microsoftonline.com",
-    "https://eastus.log in.microsoft.com",
-    "https://log in.windows.net",
+    "https://login.microsoftonline.com",
+    "https://eastus.login.microsoft.com",
+    "https://login.windows.net",
     "https://mcr.microsoft.com",
     "https://gbl.his.arc.azure.com",
     "https://k8connecthelm.azureedge.net",

AKS-Hybrid/aks-create-clusters-cli.md

@@ -4,7 +4,7 @@ description: Learn how to create Kubernetes clusters in Azure Stack HCI using Az
 ms.topic: how-to
 ms.custom: devx-track-azurecli
 author: sethmanheim
-ms.date: 02/05/2024
+ms.date: 09/24/2024
 ms.author: sethm 
 ms.lastreviewed: 01/25/2024
 ms.reviewer: guanghu
@@ -123,7 +123,7 @@ apiVersion: apps/v1
             "kubernetes.io/os": linux 
           containers: 
           - name: azure-vote-back 
-            image: mcr.microsoft.com/oss/bitnami/redis:6.0.8 
+            image: <path to image>/oss/bitnami/redis:6.0.8 
             env: 
             - name: ALLOW_EMPTY_PASSWORD 
               value: "yes" 
@@ -166,7 +166,7 @@ apiVersion: apps/v1
             "kubernetes.io/os": linux 
           containers: 
           - name: azure-vote-front 
-            image: mcr.microsoft.com/azuredocs/azure-vote-front:v1 
+            image: <path to image>/azure-vote-front:v1 
             resources: 
               requests: 
                 cpu: 100m