Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into us370875-cli-posh-nat

Author: asudbring

.openpublishing.redirection.json

@@ -1,5 +1,80 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/automation/change-tracking/enable-from-portal.md",
+      "redirect_url": "/azure/automation/change-tracking/enable-vms-monitoring-agent",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/change-tracking/enable-from-vm.md",
+      "redirect_url": "/azure/automation/change-tracking/enable-vms-monitoring-agent",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/change-tracking/enable-from-automation-account.md",
+      "redirect_url": "/azure/automation/change-tracking/enable-vms-monitoring-agent",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/change-tracking/configure-alerts.md",
+      "redirect_url": "/azure/automation/change-tracking/overview-monitoring-agent",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/change-tracking/enable-from-runbook.md",
+      "redirect_url": "/azure/automation/change-tracking/manage-change-tracking-monitoring-agent",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/change-tracking/manage-change-tracking.md",
+      "redirect_url": "/azure/automation/change-tracking/manage-change-tracking-monitoring-agent",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/change-tracking/manage-inventory-vms.md",
+      "redirect_url": "/azure/automation/change-tracking/manage-change-tracking-monitoring-agent",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/change-tracking/manage-scope-configurations.md",
+      "redirect_url": "/azure/automation/change-tracking/enable-vms-monitoring-agent",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/change-tracking/overview.md",
+      "redirect_url": "/azure/automation/change-tracking/overview-monitoring-agent",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/change-tracking/remove-feature.md",
+      "redirect_url": "/azure/automation/change-tracking/overview-monitoring-agent",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/change-tracking/remove-vms-from-change-tracking.md",
+      "redirect_url": "/azure/automation/change-tracking/overview-monitoring-agent",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/how-to/region-mappings.md",
+      "redirect_url": "/azure/automation/change-tracking/region-mappings-monitoring-agent",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/automation-tutorial-installed-software.md",
+      "redirect_url": "/azure/automation/change-tracking/overview-monitoring-agent",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/troubleshoot/change-tracking.md",
+      "redirect_url": "/azure/automation/change-tracking/guidance-migration-log-analytics-monitoring-agent",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/troubleshoot/onboarding.md",
+      "redirect_url": "/azure/automation/change-tracking/guidance-migration-log-analytics-monitoring-agent",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/migrate/tutorial-modernize-asp-net-aks.md",
       "redirect_url": "/azure/migrate/migrate-services-overview",
@@ -1830,6 +1905,16 @@
       "redirect_url": "/previous-versions/azure/devtest-labs/devtest-lab-integrate-ci-cd",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/devtest-labs/devtest-lab-configure-lab-level-secrets.md",
+      "redirect_url": "/azure/devtest-labs/devtest-lab-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/devtest-labs/devtest-lab-trusted-launch.md",
+      "redirect_url": "/azure/devtest-labs/devtest-lab-overview",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/devtest-labs/integrate-environments-devops-pipeline.md",
       "redirect_url": "/previous-versions/azure/devtest-labs/integrate-environments-devops-pipeline",
@@ -1865,6 +1950,11 @@
       "redirect_url": "/azure/api-management/monitor-api-management",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/vpn-gateway/vpn-gateway-cross-premises-options.md",
+      "redirect_url": "/previous-versions/azure/vpn-gateway/vpn-gateway-about-vpn-gateway-settings",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/vpn-gateway/vpn-gateway-about-forced-tunneling.md",
       "redirect_url": "/previous-versions/azure/vpn-gateway/vpn-gateway-about-forced-tunneling",
@@ -4085,36 +4175,6 @@
       "redirect_url": "/azure/notification-hubs/notification-hubs-push-notification-http2-token-authentication",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/openshift/howto-encrypt-data-disks.md",
-      "redirect_url": "/azure/openshift/howto-byok",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/openshift/howto-deploy-java-jboss-enterprise-application-platform-with-auto-redeploy.md",
-      "redirect_url": "/azure/openshift/index",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/openshift/quickstart-portal.md",
-      "redirect_url": "/azure/openshift/create-cluster",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/openshift/tutorial-connect-cluster.md",
-      "redirect_url": "/azure/openshift/connect-cluster",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/openshift/tutorial-create-cluster.md",
-      "redirect_url": "/azure/openshift/create-cluster",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/openshift/tutorial-delete-cluster.md",
-      "redirect_url": "/azure/openshift/delete-cluster",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/operator-service-manager/overview.md",
       "redirect_url": "azure/operator-service-manager/azure-operator-service-manager-overview",

articles/active-directory-b2c/whats-new-docs.md

@@ -17,21 +17,24 @@ manager: CelesteDG
 
 Welcome to what's new in Azure Active Directory B2C documentation. This article lists new and significantly updated docs from the past three months. To learn what's new with the B2C service, see [What's new in Microsoft Entra ID](../active-directory/fundamentals/whats-new.md), [Azure AD B2C developer release notes](custom-policy-developer-notes.md) and [What's new in Microsoft Entra External ID](/entra/external-id/whats-new-docs).
 
-## January 2025
+## February 2025
 
 ### Updated articles
 
-- [Azure Active Directory B2C service limits and restrictions](service-limits.md) - Updated limits
+- [Enable multifactor authentication in Azure Active Directory B2C](multi-factor-authentication.md) - Added SMS pricing
+- [Page layout versions](page-layout.md) - Updated the latest versions of the self-asserted and MFA pages
+- [Azure AD B2C: Frequently asked questions (FAQ)](faq.yml) - Added billing name change for SMS phone
+- [Enable CAPTCHA in Azure Active Directory B2C](add-captcha.md) - Added CAPTCHA feature flag
 
-## December 2024
+## January 2025
 
 ### Updated articles
 
-- [Tutorial: Configure Nok Nok S3 Authentication Suite with Azure AD B2C for FIDO passkey authentication](partner-nok-nok.md) - Updated scenarios
+- [Azure Active Directory B2C service limits and restrictions](service-limits.md) - Updated limits
 
-## November 2024
+## December 2024
 
 ### Updated articles
 
-- [Azure Active Directory B2C: Region availability & data residency](data-residency.md) - Updated data residency location
+- [Tutorial: Configure Nok Nok S3 Authentication Suite with Azure AD B2C for FIDO passkey authentication](partner-nok-nok.md) - Updated scenarios
 

articles/api-center/includes/delete-api-integration.md

@@ -23,8 +23,8 @@ You can delete an integration using the portal or the Azure CLI.
 #### [Portal](#tab/portal)
 
 1. In the [portal](https://portal.azure.com), navigate to your API center.
-1. Under **Assets**, select **Environments** > **Links (preview)**.
-1. Select the link, and then select **Delete** (trash can icon). 
+1. Under **Assets**, select **Environments** > **Integrations (preview)**.
+1. Select the integration, and then select **Delete** (trash can icon). 
 
 #### [Azure CLI](#tab/cli)
 

articles/api-center/index.yml

@@ -51,8 +51,8 @@ landingContent:
         links:
           - text: Manage inventory - Azure CLI
             url: manage-apis-azure-cli.md
-          - text: Import APIs from API Management
-            url: import-api-management-apis.md
+          - text: Synchronize APIs from API Management
+            url: synchronize-api-management-apis.md
           - text: Build and register APIs - VS Code extension
             url: use-vscode-extension.md
  # Card

articles/api-center/media/synchronize-api-management-apis/link-api-management-service.png

@@ -14,6 +14,9 @@ ms.custom: devx-track-azurecli
 
 This article shows how to integrate an API Management instance so that the instances's APIs are continuously kept up to date in your [API center](overview.md) inventory. 
 
+> [!TIP]
+> This article explains how to integrate an API Management instance from your API center. Alternatively, quickly set up integration directly from an API Management instance. In the left menu of your instance, under **APIs**, select **API Center**, and select a target API center in your subscription to synchronize APIs to.
+
 ## About integrating an API Management instance
 
 Although you can use the Azure CLI to [import](import-api-management-apis.md) APIs on demand from Azure API Management to Azure API Center, integrating (linking) an API Management instance enables continuous synchronization so that the API inventory stays up to date. Azure API Center can also synchronize APIs from sources including [Amazon API Gateway](synchronize-aws-gateway-apis.md). 
@@ -64,17 +67,18 @@ You can integrate an API Management instance using the portal or the Azure CLI.
 
 1. In the [portal](https://portal.azure.com), navigate to your API center.
 1. Under **Assets**, select **Environments**.
-1. Select **Links (preview)** > **+ Create a link**.
-1. In the **Link your Azure API Management Service** page:
+1. Select **Integrations (preview)** > **+ New integration** > **From Azure API Management**.
+1. In the **Integrate your Azure API Management Service** page:
     1. Select the **Subscription**, **Resource group**, and **Azure API Management service** that you want to integrate.
-    1. In **Link details**, enter an identifier.
+    1. In **Integration details**, enter an identifier.
+        If you haven't already configured a managed identity with access to the API Management instance, enable **Automatically configure managed identity and assign permissions**. This selection automatically assigns the API center's system-assigned managed identity the necessary permissions to synchronize APIs from the API Management instance.
     1. In **Environment details**, enter an **Environment title** (name), **Environment type**, and optional **Description**.
     1. In **API Details**:
         1. Select a **Lifecycle** for the synchronized APIs. (You can update this value for the APIs after they're added to your API center.)
         1. Optionally, select whether to include API definitions with the synchronized APIs.
 1. Select **Create**.
 
-:::image type="content" source="media/synchronize-api-management-apis/link-api-management-service.png" alt-text="Screenshot of integrating an Azure API Management Service in the portal.":::
+:::image type="content" source="media/synchronize-api-management-apis/link-api-management-service.png" alt-text="Screenshot of integrating an Azure API Management service in the portal.":::
 
 #### [Azure CLI](#tab/cli)
 

articles/api-center/media/synchronize-aws-gateway-apis/link-aws-gateway-service.png

@@ -4,7 +4,7 @@ description: Integrate an Amazon API Gateway to Azure API Center for automatic s
 author: dlepow
 ms.service: azure-api-center
 ms.topic: how-to
-ms.date: 01/23/2025
+ms.date: 02/10/2025
 ms.author: danlep 
 ms.custom: devx-track-azurecli
 # Customer intent: As an API program manager, I want to integrate my Azure API Management instance with my API center and synchronize API Management APIs to my inventory.
@@ -89,7 +89,26 @@ Take note of the **Secret identifier** of each secret, a URI similar to `https:/
 
 ## Integrate an Amazon API Gateway 
 
- 
+You can integrate an Amazon API Gateway using the portal or the Azure CLI.
+
+#### [Portal](#tab/portal)
+1. In the [portal](https://portal.azure.com), navigate to your API center.
+1. Under **Assets**, select **Environments**.
+1. Select **Integrations (preview)** > **+ New integration** > **From Amazon API Gateway**.
+1. In the **Integrate your Amazon API Gateway Service** page:
+    1. Enter the Key Vault secret identifiers for the AWS access key and secret access key, and the AWS region where the Amazon API Gateway is deployed.
+    1. In **Integration details**, enter an identifier.
+    1. In **Environment details**, enter an **Environment title** (name), **Environment type**, and optional **Description**.
+    1. In **API Details**:
+        1. Select a **Lifecycle** for the synchronized APIs. (You can update this value for the APIs after they're added to your API center.)
+        1. Optionally, select whether to include API definitions with the synchronized APIs.
+1. Select **Create**.
+
+
+:::image type="content" source="media/synchronize-aws-gateway-apis/link-aws-gateway-service.png" alt-text="Screenshot of integrating an Amazon API Gateway service in the portal.":::
+
+#### [Azure CLI](#tab/cli)
+
 Run the [az apic integration create aws](/cli/azure/apic/integration/create#az-apic-integration-create-aws) (preview) command to integrate an Amazon API Gateway to your API center. 
 
 * Provide the names of the resource group, API center, and integration. 
@@ -109,21 +128,7 @@ az apic integration create aws \
 
 The environment is added in your API center. The Amazon API Gateway APIs are imported to the API center inventory.
 
-## Delete an integration
-
-While an API source is integrated, you can't delete synchronized APIs from your API center. If you need to, you can delete the integration. When you delete an integration:
-
-* The synchronized APIs in your API center inventory are deleted
-* The environment and deployments associated with the API source are deleted
-
-To delete an integration using the Azure CLI, run the [az apic integration delete](/cli/azure/apic/integration#az-apic-integration-delete) (preview) command. Provide the names of the resource group, API center, and integration.
-
-```azurecli
-az apic integration delete \
-    --resource-group <resource-group-name> \
-    --service-name <api-center-name> \
-    --integration-name <integration-name> 
-```
+[!INCLUDE [delete-api-integration](includes/delete-api-integration.md)]
 
 ## Related content
 

articles/api-center/synchronize-api-management-apis.md

@@ -423,8 +423,8 @@
       href: api-management-howto-configure-notifications.md
   - name: Export APIs
     items:
-    - name: Inventory APIs in API Center
-      href: ../api-center/import-api-management-apis.md?toc=%2Fazure%2Fapi-management%2Ftoc.json&bc=/azure/api-management/breadcrumb/toc.json
+    - name: Synchronize APIs to API Center
+      href: ../api-center/synchronize-api-management-apis.md?toc=%2Fazure%2Fapi-management%2Ftoc.json&bc=/azure/api-management/breadcrumb/toc.json
     - name: Export APIs to Postman for API development
       displayName: collection
       href: export-api-postman.md

articles/api-center/synchronize-aws-gateway-apis.md

@@ -138,3 +138,6 @@ sections:
           When you clone an API, the new instance is created with a system-generated value for the name, which you can't change. To specify a name for the API, 
           manually create a new API and import the API definition. For more information, see [Import an API](api-management-howto-import-api.md).
 
+      - question: Can I integrate Azure API Management directly with Azure database solutions?  
+        answer: |
+          Yes, you can integrate Azure API Management directly with other Azure services without an intermediary. For example, Azure API Management can integrate directly with Azure Cosmos DB REST APIs for CRUD operations, eliminating the need for intermediate services like Azure Functions.