Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)

Author: Learn Build Service GitHub App

articles/ai-services/openai/concepts/model-retirements.md

@@ -4,7 +4,7 @@ titleSuffix: Azure OpenAI
 description: Learn about the model deprecations and retirements in Azure OpenAI.
 ms.service: azure-ai-openai
 ms.topic: conceptual
-ms.date: 04/24/2024
+ms.date: 05/01/2024
 ms.custom: 
 manager: nitinme
 author: mrbullwinkle

articles/ai-services/openai/concepts/models.md

@@ -74,7 +74,7 @@ See [model versions](../concepts/model-versions.md) to learn about how Azure Ope
 
 > [!IMPORTANT]
 >
-> - `gpt-4` versions 1106-Preview and 0125-Preview will be upgraded with a stable version of `gpt-4` in the future. The deployment upgrade of `gpt-4` 1106-Preview to `gpt-4` 0125-Preview scheduled for March 8, 2024 is no longer taking place.  Deployments of `gpt-4` versions 1106-Preview and 0125-Preview set to "Auto-update to default" and "Upgrade when expired" will start to be upgraded after the stable version is released.  For each deployment, a model version upgrade takes place with no interruption in service for API calls.  Upgrades are staged by region and the full upgrade process is expected to take 2 weeks. Deployments of `gpt-4` versions 1106-Preview and 0125-Preview set to "No autoupgrade" will not be upgraded and will stop operating when the preview version is upgraded in the region.
+> - `gpt-4` versions 1106-Preview and 0125-Preview will be upgraded with a stable version of `gpt-4` in the future. Deployments of `gpt-4` versions 1106-Preview and 0125-Preview set to "Auto-update to default" and "Upgrade when expired" will start to be upgraded after the stable version is released.  For each deployment, a model version upgrade takes place with no interruption in service for API calls.  Upgrades are staged by region and the full upgrade process is expected to take 2 weeks. Deployments of `gpt-4` versions 1106-Preview and 0125-Preview set to "No autoupgrade" will not be upgraded and will stop operating when the preview version is upgraded in the region. See [Azure OpenAI model retirements and deprecations](./model-retirements.md) for more information on the timing of the upgrade.
 
 ## GPT-3.5
 

articles/ai-services/openai/includes/gpt-4-turbo.md

@@ -21,7 +21,7 @@ This is the replacement for the following preview models:
 ### Differences between OpenAI and Azure OpenAI GPT-4 Turbo with Vision GA model
 
 - OpenAI's version of the latest `0409` turbo model supports JSON mode and function calling for all inference requests.
-- Azure OpenAI's version of the latest `turbo-2024-04-09` currently doesn't support the use of JSON mode and function calling when making inference requests with image (vision) input. Text based input requests do support JSON mode and function calling.
+- Azure OpenAI's version of the latest `turbo-2024-04-09` currently doesn't support the use of JSON mode and function calling when making inference requests with image (vision) input. Text based input requests (requests without `image_url` and inline images) do support JSON mode and function calling.
 
 ### Differences from gpt-4 vision-preview
 

articles/ai-services/openai/whats-new.md

@@ -10,7 +10,7 @@ ms.custom:
   - ignite-2023
   - references_regions
 ms.topic: whats-new
-ms.date: 04/18/2024
+ms.date: 05/01/2024
 recommendations: false
 ---
 

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

@@ -2,7 +2,7 @@
 title: 'Quickstart: Deploy an Azure Kubernetes Service (AKS) cluster using Bicep'
 description: Learn how to quickly deploy a Kubernetes cluster using a Bicep file and deploy an application in Azure Kubernetes Service (AKS).
 ms.topic: quickstart
-ms.date: 12/27/2023
+ms.date: 04/28/2024
 author: tamram
 ms.author: tamram
 

articles/automation/change-tracking/guidance-migration-log-analytics-monitoring-agent.md

@@ -5,7 +5,7 @@ author: snehasudhirG
 services: automation
 ms.subservice: change-inventory-management
 ms.topic: conceptual
-ms.date: 02/07/2024
+ms.date: 05/01/2024
 ms.author: sudhirsneha
 ms.custom:
 ---
@@ -23,7 +23,12 @@ Using the Azure portal, you can migrate from Change Tracking & Inventory with LA
 
 ## Onboarding to Change tracking and inventory using Azure Monitoring Agent
 
-### [Using Azure portal - for single VM](#tab/ct-single-vm)
+### [Using Azure portal - Azure single VM](#tab/ct-single-vm)
+
+> [!NOTE]
+> To onboard Arc-enabled VMs, use the PowerShell Script. For more information, see the steps listed in tab Using PowerShell script - Arc-enabled VMs.
+
+To onboard through Azure portal, follow these steps:
 
 1. Sign in to the [Azure portal](https://portal.azure.com) and select your virtual machine
 1. Under **Operations** ,  select **Change tracking**.
@@ -35,7 +40,7 @@ Using the Azure portal, you can migrate from Change Tracking & Inventory with LA
 
    :::image type="content" source="media/guidance-migration-log-analytics-monitoring-agent/switch-versions-inline.png" alt-text="Screenshot that shows switching between log analytics and Azure Monitoring Agent after a successful migration." lightbox="media/guidance-migration-log-analytics-monitoring-agent/switch-versions-expanded.png":::
 
-### [Using Azure portal - for Automation account](#tab/ct-at-scale)
+### [Using Azure portal - Automation account](#tab/ct-at-scale)
 
 1. Sign in to [Azure portal](https://portal.azure.com) and select your Automation account.
 1. Under **Configuration Management**, select **Change tracking** and then select **Configure with AMA**.
@@ -58,7 +63,9 @@ Using the Azure portal, you can migrate from Change Tracking & Inventory with LA
 
    :::image type="content" source="media/guidance-migration-log-analytics-monitoring-agent/switch-versions-inline.png" alt-text="Screenshot that shows switching between log analytics and Azure Monitoring Agent after a successful migration." lightbox="media/guidance-migration-log-analytics-monitoring-agent/switch-versions-expanded.png":::
 
-### [Using PowerShell script](#tab/ps-policy)
+### [Using PowerShell script - Arc-enabled VMs](#tab/ps-policy)
+
+To onboard Arc-enabled VMs, follow the steps:
 
 #### Prerequisites
 
@@ -70,32 +77,59 @@ Follow these steps to migrate using scripts.
 
 #### Migration guidance
 
-1. Install the script and run it to conduct migrations.
-1. Ensure the new workspace resource ID is different from the one associated with the Change Tracking and Inventory using the LA version.
-1. Migrate settings for the following data types:
-    - Windows Services
-    - Linux Files
-    - Windows Files
-    - Windows Registry
-    - Linux Daemons
-1. Generate and associate a new DCR to transfer the settings to the Change Tracking and Inventory using AMA.
-
-#### Onboard at scale
-
-Use the [script](https://github.com/mayguptMSFT/AzureMonitorCommunity/blob/master/Azure%20Services/Azure%20Monitor/Agents/Migration%20Tools/DCR%20Config%20Generator/CTDcrGenerator/CTWorkSpaceSettingstoDCR.ps1) to migrate Change tracking workspace settings to a data collection rule.
-
-#### Parameters
-
-**Parameter** | **Required** | **Description** |
---- | --- | --- |
-`InputWorkspaceResourceId`| Yes | Resource ID of the workspace associated with Change Tracking & Inventory with Log Analytics. |
-`OutputWorkspaceResourceId`| Yes | Resource ID of the workspace associated with Change Tracking & Inventory with Azure Monitoring Agent. |
-`OutputDCRName`| Yes | Custom name of the new DCR created. |
-`OutputDCRLocation`| Yes | Azure location of the output workspace ID. |
-`OutputDCRTemplateFolderPath`| Yes | Folder path where DCR templates are created. |
-
+1. Install the [script](https://github.com/mayguptMSFT/AzureMonitorCommunity/blob/master/Azure%20Services/Azure%20Monitor/Agents/Migration%20Tools/DCR%20Config%20Generator/CTDcrGenerator/CTWorkSpaceSettingstoDCR.ps1) and run it to conduct migrations. The script does the following:
+
+    1. It ensures the new workspace resource ID is different from the one associated with the Change Tracking and Inventory using the LA version.
+
+    1. It migrates the settings for the following data types:
+       - Windows Services
+       - Linux Files
+       - Windows Files
+       - Windows Registry
+       - Linux Daemons
+      
+    1. The script consists of the following **Parameters**  that require an input from you. 
+
+      **Parameter** | **Required** | **Description** |
+      --- | --- | --- |
+      `InputWorkspaceResourceId`| Yes | Resource ID of the workspace associated with Change Tracking & Inventory with Log Analytics. |
+      `OutputWorkspaceResourceId`| Yes | Resource ID of the workspace associated with Change Tracking & Inventory with Azure Monitoring Agent. |
+      `OutputDCRName`| Yes | Custom name of the new DCR created. |
+      `OutputDCRLocation`| Yes | Azure location of the output workspace ID. |
+      `OutputDCRTemplateFolderPath`| Yes | Folder path where DCR templates are created. |
+
+1. A DCR template is generated when you run the above script and the template is available in `OutputDCRTemplateFolderPath`. You have to associate the new DCR to transfer the settings to the Change Tracking and Inventory using AMA.
+
+   1. Sign in to [Azure portal](https://portal.azure.com) and go to **Monitor** and under **Settings**, select **Data Collection Rules**.
+   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**.
+   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. For more information, see [Enable Change Tracking and Inventory - for Arc-enabled VMs - using portal/CLI](enable-vms-monitoring-agent.md#enable-change-tracking-and-inventory).
+ 
+   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
+   ```   
+
+   If the CT logs table schema does not exist, the script mentioned in Step 1 will fail. To troubleshoot, run the following script - 
+
+    ```azurepowershell-interactive
+
+    $psWorkspace = Get-AzOperationalInsightsWorkspace -ResourceGroupName $resourceGroup -Name $laws
+ 	 # Enabling CT solution on LA ws
+	 New-AzMonitorLogAnalyticsSolution -Type ChangeTracking -ResourceGroupName $resourceGroup -Location $psWorkspace.Location -WorkspaceResourceId $psWorkspace.ResourceId
+    ```
 ---
 
+
 ### Compare data across Log analytics Agent and Azure Monitoring Agent version
 
 After you complete the onboarding to Change tracking with AMA version, select **Switch to CT with AMA** on the landing page to switch across the two versions and compare the following events.

articles/azure-app-configuration/TOC.yml

@@ -31,6 +31,8 @@
           href: quickstart-azure-functions-csharp.md
     - name: Feature management
       items:
+        - name: Manage feature flags
+          href: manage-feature-flags.md
         - name: ASP.NET Core
           href: quickstart-feature-flag-aspnet-core.md
         - name: .NET/.NET Framework
@@ -118,8 +120,6 @@
           href: integrate-kubernetes-deployment-helm.md
     - name: Feature management
       items:
-        - name: Manage feature flags
-          href: manage-feature-flags.md
         - name: Use feature flags
           items:
             - name: ASP.NET Core

articles/azure-app-configuration/index.yml

@@ -8,7 +8,7 @@ metadata:
   ms.author: malev
   ms.service: azure-app-configuration
   ms.topic: landing-page
-  ms.date: 03/20/2023
+  ms.date: 04/11/2023
 
 # linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new
 
@@ -134,6 +134,8 @@ landingContent:
             url: concept-feature-management.md
       - linkListType: quickstart
         links:
+        - text: Manage feature flags
+          url: manage-feature-flags.md
         - text: ASP.NET Core app
           url: quickstart-feature-flag-aspnet-core.md
         - text: .NET/.NET Framework app
@@ -142,8 +144,6 @@ landingContent:
           url: quickstart-feature-flag-spring-boot.md
       - linkListType: tutorial
         links: 
-        - text: Manage feature flags
-          url: manage-feature-flags.md
         - text: Use feature flags in ASP.NET Core
           url: use-feature-flags-dotnet-core.md
         - text: Use feature flags in Spring Boot