Merge pull request #209522 from MicrosoftGuyJFlo/WindowsDeviceJoinTroubleshoot

[Azure AD] Devices - Windows Troubleshooter

Author: v-regandowner

articles/active-directory/devices/TOC.yml

@@ -53,13 +53,15 @@
       - name: Troubleshoot hybrid Azure AD joined Windows current version
         href: troubleshoot-hybrid-join-windows-current.md
       - name: Troubleshoot pending device state
-        href: /troubleshoot/azure/active-directory/pending-devices
+        href: /troubleshoot/azure/active-directory/pending-devices?toc=/azure/active-directory/fundamentals/toc.json
       - name: Troubleshoot using dsregcmd
         href: troubleshoot-device-dsregcmd.md
       - name: Troubleshoot hybrid Azure AD joined down level Windows devices
         href: troubleshoot-hybrid-join-windows-legacy.md
   - name: Manage device identities
     href: device-management-azure-portal.md
+  - name: Troubleshooting Windows devices
+    href: troubleshoot-device-windows-joined.md
   - name: Manage stale devices
     href: manage-stale-devices.md
   - name: Azure Linux VMs and Azure AD

articles/active-directory/devices/media/troubleshoot-device-windows-joined/devices-troubleshoot-windows-upload.png

@@ -0,0 +1,38 @@
+---
+title: Troubleshoot registered, hybrid, and Azure AD joined Windows machines
+description: This article helps you troubleshoot hybrid Azure Active Directory-joined Windows 10 and Windows 11 devices
+
+services: active-directory
+ms.service: active-directory
+ms.subservice: devices
+ms.topic: troubleshooting
+ms.date: 08/29/2022
+
+ms.author: joflore
+author: MicrosoftGuyJFlo
+manager: amycolannino
+ms.reviewer: jogro
+---
+# Troubleshooting Windows devices in Azure AD
+
+If you have a Windows 11 or Windows 10 device that isn't working with Azure Active Directory (Azure AD) correctly, start your troubleshooting here.
+
+1. Sign in to the **Azure portal**.
+1. Browse to **Azure Active Directory** > **Devices** > **Diagnose and solve problems**.
+1. Select **Troubleshoot** under the **Windows 10+ related issue** troubleshooter.
+   :::image type="content" source="media/troubleshoot-device-windows-joined/devices-troubleshoot-windows.png" alt-text="A screenshot showing the Windows troubleshooter located in the diagnose and solve pane of the Azure portal." lightbox="media/troubleshoot-device-windows-joined/devices-troubleshoot-windows.png":::
+1. Select **instructions** and follow the steps to download, run, and collect the required logs for the troubleshooter to analyze.
+1. Return to the Azure portal when you've collected and zipped the `authlogs` folder and contents.
+1. Select **Browse** and choose the zip file you wish to upload.
+   :::image type="content" source="media/troubleshoot-device-windows-joined/devices-troubleshoot-windows-upload.png" alt-text="A screenshot showing how to browse to select the logs gathered in the previous step to allow the troubleshooter to make recommendations." lightbox="media/troubleshoot-device-windows-joined/devices-troubleshoot-windows-upload.png":::
+
+The troubleshooter will review the contents of the file you uploaded and provide suggested next steps. These next steps may include links to documentation or contacting support for further assistance.
+
+## Next steps
+
+- [Troubleshoot devices by using the dsregcmd command](troubleshoot-device-dsregcmd.md)
+- [Troubleshoot hybrid Azure AD-joined devices](troubleshoot-hybrid-join-windows-current.md)
+- [Troubleshooting hybrid Azure Active Directory joined down-level devices](troubleshoot-hybrid-join-windows-legacy.md)
+- [Troubleshoot pending device state](/troubleshoot/azure/active-directory/pending-devices)
+- [MDM enrollment of Windows 10-based devices](/windows/client-management/mdm/mdm-enrollment-of-windows-devices)
+- [Troubleshooting Windows device enrollment errors in Intune](/troubleshoot/mem/intune/troubleshoot-windows-enrollment-errors)

articles/active-directory/devices/media/troubleshoot-device-windows-joined/devices-troubleshoot-windows.png

@@ -6,7 +6,7 @@ services: active-directory
 ms.service: active-directory
 ms.subservice: devices
 ms.topic: troubleshooting
-ms.date: 02/15/2022
+ms.date: 08/29/2022
 
 ms.author: joflore
 author: MicrosoftGuyJFlo
@@ -508,7 +508,7 @@ Use Event Viewer to look for the log entries that are logged by the Azure AD Clo
 > [!NOTE]
 > When you're collecting network traces, it's important to *not* use Fiddler during repro.
 
-1.    Run `netsh trace start scenario=internetClient_dbg capture=yes persistent=yes`.
+1. Run `netsh trace start scenario=internetClient_dbg capture=yes persistent=yes`.
 1. Lock and unlock the device. For hybrid-joined devices, wait a minute or more to allow the PRT acquisition task to finish.
 1. Run `netsh trace stop`.
 1. Share the *nettrace.cab* file with Support.