Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into dtl-managedidentity

Author: anishtrakru

articles/api-management/api-management-howto-ip-addresses.md

@@ -39,7 +39,7 @@ Public IP addresses will be part of the response:
   "properties": {
     ...
     "publicIPAddresses": [
-      "13.77.143.53"
+      "172.31.0.1"
     ],
     ...
   }
@@ -70,7 +70,7 @@ GET https://management.azure.com/subscriptions/<subscription-id>/resourceGroups/
   "properties": {
     ...
     "publicIPAddresses": [
-      "13.85.20.170"
+      "172.31.0.1"
     ],
     "privateIPAddresses": [
       "192.168.1.5"

articles/api-management/media/api-management-howto-ip-addresses/public-ip.png

@@ -16,7 +16,11 @@ App Service Environment is a single-tenant deployment of Azure App Service that
 
 ## Subnet requirements
 
-You must delegate the subnet to `Microsoft.Web/hostingEnvironments`, and the subnet must be empty.
+The following are the minimum set of requirements for the subnet your App Service Environment is in.
+
+- The subnet must be delegated to `Microsoft.Web/hostingEnvironments`.
+- The subnet must be empty.
+- The subnet's `addressPrefix` property must be formatted as a string, not an array. 
 
 The size of the subnet can affect the scaling limits of the App Service plan instances within the App Service Environment. For production scale, we recommend a `/24` address space (256 addresses) for your subnet. If you plan to scale near max capacity of 200 instances in our App Service Environment and you plan frequent up/down scale operations, we recommend a `/23` address space (512 addresses) for your subnet.
 

articles/api-management/media/api-management-howto-ip-addresses/vnet-ip.png

@@ -252,46 +252,42 @@
               href: automation-dsc-extension-history.md
             - name: Troubleshoot State Configuration issues
               href: troubleshoot/desired-state-configuration.md
-    - name: Change tracking and inventory 
+    - name: Change Tracking and Inventory using AMA
       items:
-        - name: Use Azure Monitoring Agent (AMA)
-          items:
-            - name: Overview
-              items:
-                - name: About Change tracking and inventory
-                  href: change-tracking/overview-monitoring-agent.md
-                - name: Change tracking extension version
-                  href: change-tracking/extension-version-details.md
-            - name: Supported regions
-              href: change-tracking/region-mappings-monitoring-agent.md
-            - name: Enable change tracking and inventory
-              href: change-tracking/enable-vms-monitoring-agent.md
-            - name: Manage change tracking and inventory
-              href: change-tracking/manage-change-tracking-monitoring-agent.md
-            - name: Configure alerts
-              href: change-tracking/configure-alerts.md
-        - name: Migration guidance
-          items:
-            - name: Migration from Log Analytics to Azure Monitoring Agent version
-              href: change-tracking/guidance-migration-log-analytics-monitoring-agent.md
-        - name: Use Log Analytics (Retired)
+        - name: About Change tracking and inventory
+          href: change-tracking/overview-monitoring-agent.md
+        - name: Change tracking extension version
+          href: change-tracking/extension-version-details.md
+        - name: Supported regions
+          href: change-tracking/region-mappings-monitoring-agent.md
+        - name: Enable change tracking and inventory
+          href: change-tracking/enable-vms-monitoring-agent.md
+        - name: Manage change tracking and inventory
+          href: change-tracking/manage-change-tracking-monitoring-agent.md
+        - name: Configure alerts
+          href: change-tracking/configure-alerts.md
+    - name: Migration from Change Tracking and Inventory using AMA to Change Tracking using LA (Retired)
+      items:
+        - name: Migration from Log Analytics to Azure Monitoring Agent version
+          href: change-tracking/guidance-migration-log-analytics-monitoring-agent.md
+    - name: Change Tracking and Inventory using Log Analytics (Retired)
+      items:
+        - name: Overview
+          href: change-tracking/overview.md
+        - name: Support regions for linked Log Analytics workspace
+          href: how-to/region-mappings.md
+        - name: Discover the software installed on your VMs
+          href: automation-tutorial-installed-software.md
+        - name: Enable
           items:
-            - name: Overview
-              href: change-tracking/overview.md
-            - name: Support regions for linked Log Analytics workspace
-              href: how-to/region-mappings.md
-            - name: Discover the software installed on your VMs
-              href: automation-tutorial-installed-software.md
-            - name: Enable
-              items:
-                - name: Enable from the Azure portal
-                  href: change-tracking/enable-from-portal.md
-                - name: Enable from an Azure VM
-                  href: change-tracking/enable-from-vm.md
-                - name: Enable from an Automation account
-                  href: change-tracking/enable-from-automation-account.md
-                - name: Enable from a runbook
-                  href: change-tracking/enable-from-runbook.md
+            - name: Enable from the Azure portal
+              href: change-tracking/enable-from-portal.md
+            - name: Enable from an Azure VM
+              href: change-tracking/enable-from-vm.md
+            - name: Enable from an Automation account
+              href: change-tracking/enable-from-automation-account.md
+            - name: Enable from a runbook
+              href: change-tracking/enable-from-runbook.md
             - name: Manage change tracking and inventory
               href: change-tracking/manage-change-tracking.md
             - name: Manage inventory collection from VMs
@@ -300,18 +296,18 @@
               href: change-tracking/manage-scope-configurations.md
             - name: Configure alerts
               href: change-tracking/configure-alerts.md
-            - name: Disable
-              items:
-                - name: Remove Change Tracking and Inventory
-                  href: change-tracking/remove-feature.md
-                - name: Remove machines
-                  href: change-tracking/remove-vms-from-change-tracking.md
-            - name: Troubleshoot
-              items:
-                - name: Troubleshoot feature deployment issues
-                  href: troubleshoot/onboarding.md
-                - name: Troubleshoot Change Tracking and Inventory issues
-                  href: troubleshoot/change-tracking.md      
+        - name: Disable
+          items:
+            - name: Remove Change Tracking and Inventory
+              href: change-tracking/remove-feature.md
+            - name: Remove machines
+              href: change-tracking/remove-vms-from-change-tracking.md
+        - name: Troubleshoot
+          items:
+            - name: Troubleshoot feature deployment issues
+              href: troubleshoot/onboarding.md
+            - name: Troubleshoot Change Tracking and Inventory issues
+              href: troubleshoot/change-tracking.md      
     - name: Update Management (Retired)
       items:
         - name: Overview

articles/api-management/media/api-management-using-with-vnet/verify-network-connectivity-status.png

@@ -2,7 +2,7 @@
 title: Script sample - Create a data collection rule in change tracking.
 description: Learn about how to create a data collection rule
 ms.topic: sample
-ms.date: 06/28/2023
+ms.date: 11/15/2024
 author: SnehaSudhirG
 ms.author: sudhirsneha
 ---
@@ -366,7 +366,7 @@ This script helps you to create a data collection rule in Change tracking and in
 
 ## Execute the script
 
-Save the above script on your machine with a name as *CtDcrCreation.json*. For more information, see [Enable Change Tracking and Inventory using Azure Monitoring Agent (Preview)](enable-vms-monitoring-agent.md#enable-change-tracking-at-scale-using-azure-monitoring-agent).
+Save the above script on your machine with a name as *CtDcrCreation.json*. For more information, see [Enable Change Tracking and Inventory using Azure Monitoring Agent](enable-vms-monitoring-agent.md#enable-change-tracking-at-scale-using-policy).
 
 > [!NOTE]
 > A reference JSON script to configure windows file settings:

articles/api-management/media/get-started-create-service-instance/get-started-create-service-instance-created-1.png

@@ -3,9 +3,12 @@ title: Enable Azure Automation Change Tracking for single machine and multiple m
 description: This article tells how to enable the Change Tracking feature for single machine and multiple machines at scale from the Azure portal.
 services: automation
 ms.subservice: change-inventory-management
-ms.date: 10/29/2024
+ms.date: 11/15/2024
 ms.topic: how-to
 ms.service: azure-automation
+ms.author: sudhirsneha
+author: SnehaSudhirG
+zone_pivot_groups: enable-change-tracking-inventory-using-monitoring-agent
 ---
 
 # Enable Change Tracking and Inventory using Azure Monitoring Agent
@@ -22,7 +25,11 @@ This article describes how you can enable [Change Tracking and Inventory](overvi
 
 ## Enable Change Tracking and Inventory
 
-This section provides detailed procedure on how you can enable change tracking on a single VM and multiple VMs.
+::: zone pivot="single-portal"
+
+### Enable change tracking and inventory for single VM from Azure portal
+
+This section provides detailed procedure on how you can enable change tracking on a single Azure VM and Arc-enabled VM.
 
 #### [Single Azure VM -portal](#tab/singlevm)
 
@@ -45,6 +52,30 @@ This section provides detailed procedure on how you can enable change tracking o
 > - When you enable Change Tracking in the Azure portal using the Azure Monitoring Agent, the process automatically creates a Data Collection Rule (DCR). This rule will appear in the resource group with a name in the format ct-dcr-aaaaaaaaa. After the rule is created, add the required resources.
 > - It usually takes up to two to three minutes to successfully onboard and enable the virtual machine(s). After you enable a virtual machine for change tracking, you can make changes to the files, registries, or software for the specific VM.
 
+#### [Single Azure Arc VM - portal](#tab/singlearcvm)
+
+1. Sign in to [Azure portal](https://portal.azure.com). Search for and select **Machines-Azure Arc**.
+
+   :::image type="content" source="media/enable-vms-monitoring-agent/select-arc-machines-portal.png" alt-text="Screenshot showing how to select Azure Arc machines from the portal." lightbox="media/enable-vms-monitoring-agent/select-arc-machines-portal.png":::
+
+1. Select the Azure-Arc machine for which you want to enable Change Tracking.
+1. Under **Operations**, select **Change tracking** to view the change tracking and inventory page.
+1. In the **Stay up-to-date with all changes** layout, select **Enable using AMA agent (Recommended)** option and **Enable**. 
+
+   :::image type="content" source="media/enable-vms-monitoring-agent/select-change-tracking-arc-vm.png" alt-text="Screenshot showing to select change tracking option for a single Azure arc virtual machine from the portal." lightbox="media/enable-vms-monitoring-agent/select-change-tracking-arc-vm.png":::
+
+   It will initiate the deployment and the notification appears on the top right corner of the screen.
+
+---
+
+:::zone-end
+
+::: zone pivot="multiple-portal-cli"
+
+### Enable change tracking and inventory for multiple VMs using Azure portal and Azure CLI
+
+This section provides detailed procedure on how you can enable change tracking and inventory on multiple Azure VMs and Azure Arc-enabled VMs.
+
 #### [Multiple Azure VMs - portal](#tab/multiplevms)
 
 1. Sign in to [Azure portal](https://portal.azure.com) and navigate to **Virtual machines**.
@@ -69,22 +100,6 @@ This section provides detailed procedure on how you can enable change tracking o
 1. Select **Enable** to initiate the deployment.
 1. A notification appears on the top right corner of the screen indicating the status of deployment.
 
-
-#### [Single Azure Arc VM - portal](#tab/singlearcvm)
-
-1. Sign in to [Azure portal](https://portal.azure.com). Search for and select **Machines-Azure Arc**.
-
-   :::image type="content" source="media/enable-vms-monitoring-agent/select-arc-machines-portal.png" alt-text="Screenshot showing how to select Azure Arc machines from the portal." lightbox="media/enable-vms-monitoring-agent/select-arc-machines-portal.png":::
-
-1. Select the Azure-Arc machine for which you want to enable Change Tracking.
-1. Under **Operations**, select **Change tracking** to view the change tracking and inventory page.
-1. In the **Stay up-to-date with all changes** layout, select **Enable using AMA agent (Recommended)** option and **Enable**. 
-
-   :::image type="content" source="media/enable-vms-monitoring-agent/select-change-tracking-arc-vm.png" alt-text="Screenshot showing to select change tracking option for a single Azure arc virtual machine from the portal." lightbox="media/enable-vms-monitoring-agent/select-change-tracking-arc-vm.png":::
-
-   It will initiate the deployment and the notification appears on the top right corner of the screen.
-   
-
 #### [Arc-enabled VMs - portal/CLI](#tab/arcvms)
 
 To enable the Change Tracking and Inventory on Arc-enabled servers, ensure that the custom Change Tracking Data collection rule is associated to the Arc-enabled VMs. 
@@ -119,9 +134,13 @@ Follow these steps to associate the data collection rule to the Arc-enabled VMs:
    az connectedmachine extension create  --name ChangeTracking-Windows  --publisher Microsoft.Azure.ChangeTrackingAndInventory --type-handler-version 2.20  --type ChangeTracking-Windows  --machine-name XYZ --resource-group XYZ-RG  --location X --enable-auto-upgrade
    ```   
 --- 
+:::zone-end
 
+::: zone pivot="at-scale-policy"
 
-## Enable Change Tracking at scale using Azure Monitoring Agent
+### Enable Change Tracking at scale using policy
+
+This section provides detailed procedure on how you can enable change tracking and inventory at scale using policy.
 
 ### Prerequisite
 - You must [create the Data collection rule](#create-data-collection-rule).
@@ -173,15 +192,17 @@ Using the Deploy if not exist (DINE) policy, you can enable Change tracking with
    1. Provide the **Data Collection Rule Resource id**. Learn more on [how to obtain the Data Collection Rule Resource ID after you create the Data collection rule](#create-data-collection-rule).
    1. Select **Review + create**.
 
+:::zone-end
 
 ### Create data collection rule
+
 1. Download [CtDcrCreation.json](change-tracking-data-collection-rule-creation.md) file on your machine.
 1. Go to Azure portal and in the search, enter *Deploy a custom template*.
 1. In the **Custom deployment** page > **select a template**, select **Build your own template in the editor**.
    :::image type="content" source="media/enable-vms-monitoring-agent/build-template.png" alt-text="Screenshot to get started with building a template.":::
 1. In the **Edit template**, select **Load file** to upload the *CtDcrCreation.json* file.
 1. Select **Save**.
-1. In the **Custom deployment** > **Basics** tab, provide **Subscription** and **Resource group** where you want to deploy the Data Collection Rule. The **Data Collection Rule Name** is optional. The resource group must be same as the resource group associated with the Log Analytic workspace id chosen here.
+1. In the **Custom deployment** > **Basics** tab, provide **Subscription** and **Resource group** where you want to deploy the Data Collection Rule. The **Data Collection Rule Name** is optional. The resource group must be same as the resource group associated with the Log Analytic workspace ID chosen here.
 
    :::image type="content" source="media/enable-vms-monitoring-agent/build-template-basics.png" alt-text="Screenshot to provide subscription and resource group details to deploy data collection rule.":::
 

articles/app-service/environment/networking.md

@@ -3,7 +3,7 @@ title: Manage Change Tracking and Inventory in Azure Automation
 description: This article tells how to use Change Tracking and Inventory to track software and Microsoft service changes in your environment.
 services: automation
 ms.subservice: change-inventory-management
-ms.date: 09/19/2024
+ms.date: 11/14/2024
 ms.topic: how-to
 ms.service: azure-automation
 ---