Merge pull request #272025 from MicrosoftDocs/main

4/12/2024 AM Publish

Author: Taojunshen

articles/aks/learn/quick-kubernetes-deploy-portal.md

@@ -400,7 +400,7 @@ To deploy the application, you use a manifest file to create all the objects req
 
 When the application runs, a Kubernetes service exposes the application front end to the internet. This process can take a few minutes to complete.
 
-1. Check the status of the deployed pods using the [kubectl get pods][kubectl-get] command. Make all pods are `Running` before proceeding.
+1. Check the status of the deployed pods using the [kubectl get pods][kubectl-get] command. Make sure all pods are `Running` before proceeding.
 
     ```console
     kubectl get pods

articles/aks/media/howto-deploy-java-wls-app/marketplace-search-results.png

@@ -52,6 +52,7 @@ When an API Management service instance is hosted in a VNet, the ports in the fo
 | * / 4290              | Inbound & Outbound | UDP                | VirtualNetwork / VirtualNetwork     | Sync Counters for [Rate Limit](rate-limit-policy.md) policies between machines (optional)        | External & Internal  |
 | * / 6390                       | Inbound            | TCP                | AzureLoadBalancer / VirtualNetwork | **Azure Infrastructure Load Balancer**                          | External & Internal  |
 | * / 443                       | Inbound            | TCP                | AzureTrafficManager / VirtualNetwork | **Azure Traffic Manager**  routing for multi-region deployment                        | External |
+| * / 6391                       | Inbound            | TCP                | AzureLoadBalancer / VirtualNetwork | Monitoring of individual machine health (Optional)                          | External & Internal  |
 
 ### [stv1](#tab/stv1)
 

articles/api-management/virtual-network-reference.md

@@ -80,7 +80,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     # checkout the repo
-    - name: 'Checkout Github Action'
+    - name: 'Checkout GitHub Action'
       uses: actions/checkout@main
 
     - uses: azure/docker-login@v1

articles/app-service/deploy-best-practices.md

@@ -60,7 +60,7 @@ Sign in to the [Azure portal](https://portal.azure.com/) and follow these steps
         1. *Runtime stack* → **.NET 7 (STS)**.
         1. *Add Azure Cache for Redis?* → **Yes**.
         1. *Hosting plan* → **Basic**. When you're ready, you can [scale up](manage-scale-up.md) to a production pricing tier later.
-        1. **SQLAzure** is selected by default as the database engine. Azure SQL Database is a fully managed platform as a service (PaaS) database engine that's always running on the latest stable version of the SQL Server.
+        1. Select **SQLAzure** as the database engine. Azure SQL Database is a fully managed platform as a service (PaaS) database engine that's always running on the latest stable version of the SQL Server.
         1. Select **Review + create**.
         1. After validation completes, select **Create**.
     :::column-end:::

articles/app-service/tutorial-dotnetcore-sqldb-app.md

@@ -262,7 +262,7 @@
                   href: change-tracking/extension-version-details.md
             - name: Supported regions
               href: change-tracking/region-mappings-monitoring-agent.md
-            - name: Enable change tracking from portal
+            - 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

articles/automation/TOC.yml

@@ -3,7 +3,7 @@ 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: 06/28/2023
+ms.date: 04/10/2024
 ms.topic: conceptual
 ---
 
@@ -23,7 +23,7 @@ This article describes how you can enable [Change Tracking and Inventory](overvi
 
 This section provides detailed procedure on how you can enable change tracking on a single VM and multiple VMs.
 
-#### [For a single VM](#tab/singlevm)
+#### [Single Azure VM -portal](#tab/singlevm)
 
 1. Sign in to [Azure portal](https://portal.azure.com) and navigate to **Virtual machines**.
 
@@ -41,7 +41,7 @@ This section provides detailed procedure on how you can enable change tracking o
    :::image type="content" source="media/enable-vms-monitoring-agent/deployment-success-inline.png" alt-text="Screenshot showing the notification of deployment." lightbox="media/enable-vms-monitoring-agent/deployment-success-expanded.png":::
 
 
-#### [For multiple VMs](#tab/multiplevms)
+#### [Multiple Azure VMs - portal](#tab/multiplevms)
 
 1. Sign in to [Azure portal](https://portal.azure.com) and navigate to **Virtual machines**.
 
@@ -64,6 +64,40 @@ 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.
+
+#### [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. 
+
+Follow these steps to associate the data collection rule to the Arc-enabled VMs:
+
+1. [Create Change Tracking Data collection rule](#create-data-collection-rule).
+1. Sign in to [Azure portal](https://portal.azure.com) and go to **Monitor** and under **Settings**, select **Data Collection Rules**.
+      
+   :::image type="content" source="media/enable-vms-monitoring-agent/monitor-menu-data-collection-rules.png" alt-text="Screenshot showing the menu option to access data collection rules from Azure Monitor." lightbox="media/enable-vms-monitoring-agent/monitor-menu-data-collection-rules.png":::
+
+1. Select the data collection rule that you have created in Step 1 from the listing page.
+1. In the data collection rule page, under **Configurations**, select **Resources** and then select **Add**.
+    
+   :::image type="content" source="media/enable-vms-monitoring-agent/select-resources.png" alt-text="Screenshot showing the menu option to select resources from the data collection rule page." lightbox="media/enable-vms-monitoring-agent/select-resources.png":::
+    
+1. In the **Select a scope**, from **Resource types**, select *Machines-Azure Arc* that is connected to the subscription and then select **Apply** to associate the *ctdcr* created in Step 1 to the Arc-enabled machine and it will also install the Azure Monitoring Agent extension.
+    
+   :::image type="content" source="media/enable-vms-monitoring-agent/scope-select-arc-machines.png" alt-text="Screenshot showing the selection of Arc-enabled machines from the scope." lightbox="media/enable-vms-monitoring-agent/scope-select-arc-machines.png":::
+    
+1. Install the Change Tracking extension as per the OS type for the Arc-enabled VM.
+    
+   **Linux**
+       
+   ```azurecli
+   az connectedmachine extension create  --name ChangeTracking-Linux  --publisher Microsoft.Azure.ChangeTrackingAndInventory --type-handler-version 2.20  --type ChangeTracking-Linux  --machine-name XYZ --resource-group XYZ-RG  --location X --enable-auto-upgrade
+   ```
+
+   **Windows**
+
+   ```azurecli
+   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
+   ```   
 --- 
 
 >[!NOTE]