Merge branch 'avd-autoscale-diagnostics' of https://github.com/dknappettmsft/azure-docs-pr into autoscale-diagnostics-2

Author: sipastak

.openpublishing.redirection.virtual-desktop.json

@@ -404,6 +404,11 @@
             "source_path_from_root": "/articles/virtual-desktop/whats-new-client-microsoft-store.md",
             "redirect_url": "/azure/virtual-desktop/whats-new-client-windows",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/autoscale-scaling-plan.md",
+            "redirect_url": "/azure/virtual-desktop/autoscale-create-assign-scaling-plan",
+            "redirect_document_id": true
         }
     ]
 }

articles/virtual-desktop/TOC.yml

@@ -415,9 +415,9 @@
           - name: Create and assign a scaling plan
             displayName: autoscale, scale, virtual machines, vms
             href: autoscale-scaling-plan.md
-          - name: Set up autoscale diagnostics
-            displayName: autoscale, scale, virtual machines, vms
-            href: autoscale-diagnostics.md
+          - name: Monitor Autoscale operations
+            displayName: monitoring, scale, scaling, avd insights, avdi
+            href: autoscale-monitor-operations-insights.md
         - name: Azure Automation and Azure Logic Apps
           items:
           - name: Scale with a runbook and logic app
@@ -520,12 +520,12 @@
       href: multimedia-redirection.md
   - name: Monitor
     items:
-      - name: Use Azure Virtual Desktop Insights
-        displayName: avd insights, avdi, monitoring, diagnostics
-        href: insights.md
-      - name: Use diagnostics with Log Analytics
+      - name: Send diagnostic data to Log Analytics
         displayName: monitoring
         href: diagnostics-log-analytics.md
+      - name: Enable Insights
+        displayName: avd insights, avdi, monitoring, diagnostics
+        href: insights.md
       - name: Set up diagnostics to monitor Agent updates
         displayName: monitoring
         href: agent-updates-diagnostics.md
@@ -538,6 +538,12 @@
       - name: Collect and query user connection quality data
         displayName: monitoring, network, graphics
         href: connection-quality-monitoring.md
+      - name: Monitor Autoscale operations with Insights
+        displayName: monitoring, scale, scaling, avd insights, avdi
+        href: autoscale-monitor-operations-insights.md
+      - name: Set up diagnostics for Autoscale
+        displayName: monitoring, scale, scaling
+        href: autoscale-diagnostics.md
       - name: Resolve Azure Advisor recommendations
         displayName: monitoring
         href: azure-advisor-recommendations.md

articles/virtual-desktop/autoscale-scaling-plan.md renamed to articles/virtual-desktop/autoscale-create-assign-scaling-plan.md

@@ -445,6 +445,6 @@ To assign a scaling plan to existing host pools:
 
 Now that you've created your scaling plan, here are some things you can do:
 
-- [Enable diagnostics for your scaling plan](autoscale-diagnostics.md)
+- [Monitor Autoscale operations with Insights](autoscale-diagnostics.md)
 
 If you'd like to learn more about terms used in this article, check out our [autoscale glossary](autoscale-glossary.md). For examples of how autoscale works, see [Autoscale example scenarios](autoscale-scenarios.md). You can also look at our [Autoscale FAQ](autoscale-faq.yml) if you have other questions.

articles/virtual-desktop/autoscale-diagnostics.md

@@ -1,40 +1,23 @@
 ---
-title: Set up diagnostics for autoscale in Azure Virtual Desktop
+title: Set up diagnostics for Autoscale in Azure Virtual Desktop
 description: How to set up diagnostic reports for the scaling service in your Azure Virtual Desktop deployment.
 author: Heidilohr
 ms.topic: how-to
 ms.date: 11/01/2023
 ms.author: helohr
 ---
-# Set up diagnostics for autoscale in Azure Virtual Desktop
+# Set up diagnostics for Autoscale in Azure Virtual Desktop
 
-Diagnostics lets you monitor potential issues and fix them before they interfere with your autoscale scaling plan.
+Diagnostics lets you monitor potential issues and fix them before they interfere with your Autoscale scaling plan.
 
-Currently, you can either send diagnostic logs for autoscale to an Azure Storage account or consume logs with Microsoft Azure Event Hubs. If you're using an Azure Storage account, make sure it's in the same region as your scaling plan. Learn more about diagnostic settings at [Create diagnostic settings](../azure-monitor/essentials/diagnostic-settings.md). For more information about resource log data ingestion time, see [Log data ingestion time in Azure Monitor](../azure-monitor/logs/data-ingestion-time.md).
+Currently, you can either send diagnostic logs for Autoscale to an Azure Storage account or consume logs with Microsoft Azure Event Hubs. If you're using an Azure Storage account, make sure it's in the same region as your scaling plan. Learn more about diagnostic settings at [Create diagnostic settings](../azure-monitor/essentials/diagnostic-settings.md). For more information about resource log data ingestion time, see [Log data ingestion time in Azure Monitor](../azure-monitor/logs/data-ingestion-time.md).
 
-## Enable diagnostics for scaling plans
-
-#### [Pooled host pools](#tab/pooled-autoscale)
-
-To enable diagnostics for your scaling plan for pooled host pools:
-
-1. Open the [Azure portal](https://portal.azure.com).
-
-1. In the search bar, type *Azure Virtual Desktop* and select the matching service entry.
-
-1. Select **Scaling plans**, then select the scaling plan you'd like the report to track.
+> [!TIP]
+> For pooled host pools, we recommend you use Autoscale diagnostic data integrated with Insights in Azure Virtual Desktop, which providing a more comprehensive view of your Autoscale operations. For more information, see [Monitor Autoscale operations with Insights in Azure Virtual Desktop](autoscale-monitor-operations-insights.md).
 
-1. Go to **Diagnostic Settings** and select **Add diagnostic setting**.
-
-1. Enter a name for the diagnostic setting.
-
-1. Next, select **Autoscale logs for pooled host pools** and choose either **storage account** or **event hub** depending on where you want to send the report.
-
-1. Select **Save**.
-
-#### [Personal host pools](#tab/personal-autoscale)
+## Enable diagnostics for scaling plans
 
-To enable diagnostics for your scaling plan for personal host pools:
+To enable diagnostics for your scaling plan:
 
 1. Open the [Azure portal](https://portal.azure.com).
 
@@ -46,13 +29,14 @@ To enable diagnostics for your scaling plan for personal host pools:
 
 1. Enter a name for the diagnostic setting.
 
-1. Next, select **Autoscale logs for personal host pools** and choose either **storage account** or **event hub** depending on where you want to send the report.
+1. Next, select **Autoscale logs** and choose either **Archive to a storage account** or **Stream to an event hub** depending on where you want to send the report.
 
 1. Select **Save**.
 
----
+> [!NOTE]
+> If you select **Archive to a storage account**, you'll need to [Migrate from diagnostic settings storage retention to Azure Storage lifecycle management](../azure-monitor/essentials/migrate-to-azure-storage-lifecycle-policy.md).
 
-## Find autoscale diagnostic logs in Azure Storage
+## Find Autoscale diagnostic logs in Azure Storage
 
 After you've configured your diagnostic settings, you can find the logs by following these instructions:
 
@@ -105,4 +89,4 @@ The following JSON file is an example of what you'll see when you open a report:
 - [Assign your scaling plan to new or existing host pools](autoscale-new-existing-host-pool.md).
 - Learn more about terms used in this article at our [autoscale glossary](autoscale-glossary.md).
 - For examples of how autoscale works, see [Autoscale example scenarios](autoscale-scenarios.md).
-- View our [autoscale FAQ](autoscale-faq.yml) to answer commonly asked questions.
+- View our [autoscale FAQ](autoscale-faq.yml) to answer commonly asked questions.