Merge pull request #260591 from MicrosoftDocs/main

Merge main to live, 4 AM

Author: v-ccolin

.openpublishing.redirection.azure-monitor.json

@@ -6463,6 +6463,11 @@
             "source_path_from_root": "/articles/azure-monitor/logs/resource-expression.md",
             "redirect_url": "/azure/azure-monitor/logs/cross-workspace-query",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/vm/vminsights-configure-workspace.md",
+            "redirect_url": "/azure/azure-monitor/vm/vminsights-enable-overview",
+            "redirect_document_id": false
         }
     ]
 }

articles/active-directory-b2c/configure-tokens.md

@@ -28,7 +28,7 @@ You can configure the token lifetime, including:
 
 - **Access and ID token lifetimes (minutes)** - The lifetime of the OAuth 2.0 bearer token and ID tokens. The default is 60 minutes (1 hour). The minimum (inclusive) is 5 minutes. The maximum (inclusive) is 1,440 minutes (24 hours).
 - **Refresh token lifetime (days)** - The maximum time period before which a refresh token can be used to acquire a new access token, if your application had been granted the `offline_access` scope. The default is 14 days. The minimum (inclusive) is one day. The maximum (inclusive) 90 days.
-- **Refresh token sliding window lifetime** - The refresh token sliding window type. `Bounded` indicates that the refresh token can be extended as specify in the **Lifetime length (days)**. `No expiry` indicates that the refresh token sliding window lifetime never expires.
+- **Refresh token sliding window lifetime** - The refresh token sliding window type. `Bounded` indicates that the refresh token can be extended as specified in the **Lifetime length (days)**. `No expiry` indicates that the refresh token sliding window lifetime never expires.
 - **Lifetime length (days)** - After this time period elapses the user is forced to reauthenticate, irrespective of the validity period of the most recent refresh token acquired by the application. The value must be greater than or equal to the **Refresh token lifetime** value.
 
 The following diagram shows the refresh token sliding window lifetime behavior.

articles/ai-studio/how-to/prompt-flow-tools/python-tool.md

@@ -133,7 +133,7 @@ from promptflow import tool
 from promptflow.connections import CustomConnection
 
 @tool
-def my_python_tool(message:str, myconn:CustomConnection) -> str:
+def my_python_tool(message: str, myconn: CustomConnection) -> str:
     # Get authentication key-values from the custom connection
     connection_key1_value = myconn.key1
     connection_key2_value = myconn.key2

articles/azure-monitor/toc.yml

@@ -408,8 +408,6 @@ items:
           href: vm/vminsights-enable-hybrid.md
         - name: Dependency Agent
           href: vm/vminsights-dependency-agent-maintenance.md
-        - name: Configure workspace 
-          href: vm/vminsights-configure-workspace.md
         - name: Migrate from deprecated VM insights policies 
           href: vm/vminsights-migrate-deprecated-policies.md          
       - name: Map dependencies

articles/azure-monitor/vm/media/vminsights-configure-workspace/log-analytics-workspaces.png

@@ -17,7 +17,7 @@ To enable hybrid VMs, first enable [Azure Arc for servers](../../azure-arc/serve
 
 ## Prerequisites
 
-- [Create and configure a Log Analytics workspace](./vminsights-configure-workspace.md).
+- [Create a Log Analytics workspace](../logs/quick-create-workspace.md).
 - See [Supported operating systems](./vminsights-enable-overview.md#supported-operating-systems) to ensure that the operating system of the virtual machine or virtual machine scale set you're enabling is supported.
 
 ## Overview

articles/azure-monitor/vm/media/vminsights-configure-workspace/remove-solution.png

@@ -20,6 +20,9 @@ This article provides an overview of how to enable VM insights to monitor the he
 - On-premises virtual machines.
 - Virtual machines hosted in another cloud environment.
 
+> [!NOTE]
+> Configuring a Log Analytics workspace for using VM insights by using the Log Analytics agent is no longer supported.
+
 ## Installation options and supported machines
 
 The following table shows the installation methods available for enabling VM insights on supported machines.
@@ -120,8 +123,6 @@ If you associate a data collection rule with the Map feature enabled to a machin
 
 - You must remove the Log Analytics agent yourself from any machines that are using it. Before you do this step, ensure that the machine isn't relying on any other solutions that require the Log Analytics agent. For more information, see [Migrate to Azure Monitor Agent from Log Analytics agent](../agents/azure-monitor-agent-migration.md).
 
-- After you verify that no Log Analytics agents are still connected to your Log Analytics workspace, you can [remove the VM Insights solution from the workspace](vminsights-configure-workspace.md#remove-the-vminsights-solution-from-a-workspace). It's no longer needed.
-
     > [!NOTE]
     > To check if you have any machines with both agents sending data to your Log Analytics workspace, run the following [log query](../logs/log-query-overview.md) in [Log Analytics](../logs/log-analytics-overview.md). This query will show the last heartbeat for each computer. If a computer has both agents, it will return two records, each with a different `category`. The Azure Monitor agent will have a `category` of *Azure Monitor Agent*. The Log Analytics agent will have a `category` of *Direct Agent*.
     >

articles/azure-monitor/vm/vminsights-configure-workspace.md

@@ -56,8 +56,6 @@ To assign a VM insights policy initiative to a subscription or management group
     1. (Optional) Change the **Assignment name** and add a **Description**.
     1. On the **Parameters** tab, select a **Log Analytics workspace** to which all virtual machines in the assignment will send data. For virtual machines to send data to different workspaces, create multiple assignments, each with their own scope.
 
-        If you're assigning a legacy initiative, the workspace must have the *VMInsights* solution installed, as described in [Configure Log Analytics workspace for VM insights](vminsights-configure-workspace.md).
-    
         :::image type="content" source="media/vminsights-enable-policy/assignment-workspace.png" lightbox="media/vminsights-enable-policy/assignment-workspace.png" alt-text="Screenshot that shows a workspace.":::
 
         > [!NOTE]