Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into migration-and-modernization-common-questions

Author: LHL407

articles/api-management/observability.md

@@ -6,7 +6,7 @@ author: dlepow
 
 ms.service: azure-api-management
 ms.topic: conceptual
-ms.date: 07/12/2024
+ms.date: 02/10/2025
 ms.author: danlep
 ---
 
@@ -16,16 +16,16 @@ ms.author: danlep
 
 Observability is the ability to understand the internal state of a system from the data it produces and the ability to explore that data to answer questions about what happened and why. 
 
-Azure API Management helps organizations centralize the management of all APIs. Since it serves as a single point of entry of all API traffic, it is an ideal place to observe the APIs.
+Azure API Management helps organizations centralize the management of all APIs. Since it serves as a single point of entry of all API traffic, it's an ideal place to observe the APIs.
 
 ## Overview
 
 Azure API Management allows you to choose to use the managed gateway or [self-hosted gateway](self-hosted-gateway-overview.md), either self-deployed or by using an [Azure Arc extension](how-to-deploy-self-hosted-gateway-azure-arc.md).
 
-The table below summarizes all the observability capabilities supported by API Management to operate APIs and what deployment models they support. These capabilities can be used by API publishers and others who have permissions to operate or manage the API Management instance. 
+The following table summarizes all the observability capabilities supported by API Management to operate APIs and what deployment models they support. API publishers and others with permissions to operate or manage the API Management instance can use these capabilities. 
 
 > [!NOTE]
-> For API consumers who use the developer portal, a built-in API report is available. It only provides information about their individual API usage during the preceding 90 days. Currently, the built-in API report is not available in the developer portal for the v2 service tiers.
+> For API consumers who use the developer portal, a built-in API report is available. It only provides information about their individual API usage during the preceding 90 days. Currently, the built-in API report isn't available in the developer portal for the v2 service tiers.
 >  
 | Tool        | Useful for    | Data lag | Retention | Sampling | Data kind | Supported Deployment Model(s) |
 |:------------- |:-------------|:---- |:----|:---- |:--- |:---- |
@@ -41,7 +41,7 @@ The table below summarizes all the observability capabilities supported by API M
 
 *2. Optional, depending on the configuration of the gateway*
 
-*3. The [self-hosted gateway](self-hosted-gateway-overview.md) currently does not send diagnostic logs to Azure Monitor. However, it is possible to configure and persist logs locally where the self-hosted gateway is deployed. For more information, please see [configuring local metrics and logs for self-hosted gateway](how-to-configure-local-metrics-logs.md)*
+*3. The [self-hosted gateway](self-hosted-gateway-overview.md) currently doesn't send diagnostic logs to Azure Monitor. However, it's possible to configure and persist logs locally where the self-hosted gateway is deployed. For more information, please see [configuring local metrics and logs for self-hosted gateway](how-to-configure-local-metrics-logs.md)*
 
 ## Next Steps
 

articles/app-service/app-service-hybrid-connections.md

@@ -6,8 +6,9 @@ author: madsd
 ms.author: madsd
 ms.topic: how-to
 ms.custom: devx-track-azurepowershell, devx-track-azurecli
-ms.date: 02/13/2023
+ms.date: 01/30/2025
 ms.tool: azure-cli, azure-powershell
+#customer intent: As a deployment engineer, I want to integrate web apps in Azure App Service with our Azure virtual networks.
 ---
 
 # Enable virtual network integration in Azure App Service
@@ -21,23 +22,25 @@ The virtual network integration feature requires:
 - An App Service pricing tier [that supports virtual network integration](./overview-vnet-integration.md).
 - A virtual network in the same region with an empty subnet.
 
-The subnet must be delegated to Microsoft.Web/serverFarms. If the delegation isn't done before integration, the provisioning process configures this delegation. The subnet must be allocated an IPv4 `/28` block (16 addresses). We recommend that you have a minimum of 64 addresses (IPv4 `/26` block) to allow for maximum horizontal scale.
+The subnet must be delegated to Microsoft.Web/serverFarms. If you don't delegate before integration, the provisioning process configures this delegation. The subnet must be allocated an IPv4 `/28` block (16 addresses). We recommend that you have a minimum of 64 addresses (IPv4 `/26` block) to allow for maximum horizontal scale.
 
-If the virtual network is in a different subscription than the app, you must ensure that the subscription with the virtual network is registered for the `Microsoft.Web` resource provider. You can explicitly register the provider [by following this documentation](../azure-resource-manager/management/resource-providers-and-types.md#register-resource-provider), but it's automatically registered when creating the first web app in a subscription.
+If the virtual network is in a different subscription than the app, ensure that the subscription with the virtual network is registered for the `Microsoft.Web` resource provider. The provider is registered when you create the first web app in a subscription. To explicitly register the provider, see [Register resource provider](../azure-resource-manager/management/resource-providers-and-types.md#register-resource-provider).
 
 ## Configure in the Azure portal
 
-1. Go to **Networking** in the App Service portal. Under **Outbound traffic configuration**, select **Virtual network integration**.
+1. Go to your app in the Azure portal. Select **Settings** > **Networking**. Under **Outbound traffic configuration**, next to **Virtual network integration**, select the **Not configured** link.
 
 1. Select **Add virtual network integration**.
 
-    :::image type="content" source="./media/configure-vnet-integration-enable/vnetint-app.png" alt-text="Screenshot that shows selecting Virtual network integration.":::
+   :::image type="content" source="./media/configure-vnet-integration-enable/vnetint-app.png" alt-text="Screenshot that shows selecting Virtual network integration.":::
 
-1. The dropdown list contains all the virtual networks in your subscription in the same region. Select an empty pre-existing subnet or create a new subnet.
+1. Select a subscription and virtual network.
 
-    :::image type="content" source="./media/configure-vnet-integration-enable/vnetint-add-vnet.png" alt-text="Screenshot that shows selecting the virtual network.":::
+1. Under **Subnet**, the dropdown list contains all the virtual networks in your subscription in the same region. Select an empty preexisting subnet or create a new subnet. Select **Connect**.
 
-During the integration, your app is restarted. When integration is finished, you see details on the virtual network you're integrated with.
+   :::image type="content" source="./media/configure-vnet-integration-enable/vnetint-add-vnet.png" alt-text="Screenshot that shows selecting the virtual network.":::
+
+During the integration, your app is restarted. When integration finishes, you see details on the virtual network that you integrated with.
 
 ## Configure with the Azure CLI
 
@@ -48,53 +51,53 @@ az webapp vnet-integration add --resource-group <group-name> --name <app-name> -
 ```
 
 > [!NOTE]
-> The command checks if the subnet is delegated to Microsoft.Web/serverFarms and applies the necessary delegation if it isn't configured. If the subnet was configured, and you don't have permissions to check it, or if the virtual network is in another subscription, you can use the `--skip-delegation-check` parameter to bypass the validation.
+> The command checks if the subnet is delegated to Microsoft.Web/serverFarms. If it isn't configured, the command applies the necessary delegation. If the subnet was configured and you don't have permissions to check it, or if the virtual network is in another subscription, you can use the `--skip-delegation-check` parameter to bypass the validation.
 
 ## Configure with Azure PowerShell
 
-Prepare parameters.
+1. Prepare parameters.
 
-```azurepowershell
-$siteName = '<app-name>'
-$vNetResourceGroupName = '<group-name>'
-$webAppResourceGroupName = '<group-name>'
-$vNetName = '<vnet-name>'
-$integrationSubnetName = '<subnet-name>'
-$vNetSubscriptionId = '<subscription-guid>'
-```
+   ```azurepowershell
+   $siteName = '<app-name>'
+   $vNetResourceGroupName = '<group-name>'
+   $webAppResourceGroupName = '<group-name>'
+   $vNetName = '<vnet-name>'
+   $integrationSubnetName = '<subnet-name>'
+   $vNetSubscriptionId = '<subscription-guid>'
+   ```
 
-> [!NOTE]
-> If the virtual network is in another subscription than webapp, you can use the *Set-AzContext -Subscription "xxxx-xxxx-xxxx-xxxx"* command to set the current subscription context. Set the current subscription context to the subscription where the virtual network was deployed.
+   > [!NOTE]
+   > If the virtual network is in another subscription than webapp, you can use the `Set-AzContext -Subscription "xxxx-xxxx-xxxx-xxxx"` command to set the current subscription context. Set the current subscription context to the subscription where the virtual network was deployed.
 
-Check if the subnet is delegated to Microsoft.Web/serverFarms.
+1. Check if the subnet is delegated to Microsoft.Web/serverFarms.
 
-```azurepowershell
-$vnet = Get-AzVirtualNetwork -Name $vNetName -ResourceGroupName $vNetResourceGroupName
-$subnet = Get-AzVirtualNetworkSubnetConfig -Name $integrationSubnetName -VirtualNetwork $vnet
-Get-AzDelegation -Subnet $subnet
-```
+   ```azurepowershell
+   $vnet = Get-AzVirtualNetwork -Name $vNetName -ResourceGroupName $vNetResourceGroupName
+   $subnet = Get-AzVirtualNetworkSubnetConfig -Name $integrationSubnetName -VirtualNetwork $vnet
+   Get-AzDelegation -Subnet $subnet
+   ```
 
-If your subnet isn't delegated to Microsoft.Web/serverFarms, add delegation using below commands.
+1. If your subnet isn't delegated to Microsoft.Web/serverFarms, add delegation using these commands.
 
-```azurepowershell
-$subnet = Add-AzDelegation -Name "myDelegation" -ServiceName "Microsoft.Web/serverFarms" -Subnet $subnet
-Set-AzVirtualNetwork -VirtualNetwork $vnet
-```
+   ```azurepowershell
+   $subnet = Add-AzDelegation -Name "myDelegation" -ServiceName "Microsoft.Web/serverFarms" -Subnet $subnet
+   Set-AzVirtualNetwork -VirtualNetwork $vnet
+   ```
 
-Configure virtual network integration.
+1. Configure virtual network integration.
 
-> [!NOTE]
-> If the webapp is in another subscription than virtual network, you can use the *Set-AzContext -Subscription "xxxx-xxxx-xxxx-xxxx"* command to set the current subscription context. Set the current subscription context to the subscription where the web app was deployed.
-
-```azurepowershell
-$subnetResourceId = "/subscriptions/$vNetSubscriptionId/resourceGroups/$vNetResourceGroupName/providers/Microsoft.Network/virtualNetworks/$vNetName/subnets/$integrationSubnetName"
-$webApp = Get-AzResource -ResourceType Microsoft.Web/sites -ResourceGroupName $webAppResourceGroupName -ResourceName $siteName
-$webApp.Properties.virtualNetworkSubnetId = $subnetResourceId
-$webApp.Properties.vnetRouteAllEnabled = 'true'
-$webApp | Set-AzResource -Force
-```
+   ```azurepowershell
+   $subnetResourceId = "/subscriptions/$vNetSubscriptionId/resourceGroups/$vNetResourceGroupName/providers/Microsoft.Network/virtualNetworks/$vNetName/subnets/$integrationSubnetName"
+   $webApp = Get-AzResource -ResourceType Microsoft.Web/sites -ResourceGroupName $webAppResourceGroupName -ResourceName $siteName
+   $webApp.Properties.virtualNetworkSubnetId = $subnetResourceId
+   $webApp.Properties.vnetRouteAllEnabled = 'true'
+   $webApp | Set-AzResource -Force
+   ```
+
+   > [!NOTE]
+   > If the webapp is in another subscription than virtual network, you can use the `Set-AzContext -Subscription "xxxx-xxxx-xxxx-xxxx"` command to set the current subscription context. Set the current subscription context to the subscription where the web app was deployed.
 
-## Next steps
+## Related content
 
 - [Configure virtual network integration routing](./configure-vnet-integration-routing.md)
 - [General networking overview](./networking-features.md)

articles/app-service/app-service-ip-restrictions.md

@@ -2,21 +2,22 @@
 title: Authentication types by deployment methods
 description: Learn the available types of authentication with Azure App Service when deploying your application code.
 ms.topic: article
-ms.date: 01/26/2024
+ms.date: 01/24/2025
 author: cephalin
 ms.author: cephalin
+#customer intent: As an app developer, I want to understand the authentication options available for different deployment methods in Azure App Service.
 ---
 
 # Authentication types by deployment methods in Azure App Service
 
-Azure App Service lets you deploy your web application code and configuration by using multiple options. These deployment options may support one or more authentication mechanisms. This article provides details about various authentication mechanisms supported by different deployment methods. 
+Azure App Service lets you deploy your web application code and configuration by using multiple options. These deployment options support one or more authentication mechanisms. This article provides details about various authentication mechanisms supported by different deployment methods.
 
 > [!NOTE]
 > To disable basic authentication for your App Service app, see [Disable basic authentication in App Service deployments](configure-basic-auth-disable.md). 
 
 |Deployment method|Authentication  |Reference Documents |
 |:----|:----|:----|
-|Azure CLI |Microsoft Entra ID | In Azure CLI, version 2.48.1 or higher, the following commands have been modified to use Microsoft Entra if basic authentication is turned off for your web app or function app:<br/>- [az webapp up](/cli/azure/webapp#az-webapp-up)<br/>- [az webapp deploy](/cli/azure/webapp#az-webapp-deploy)<br/>- [az webapp log deployment show](/cli/azure/webapp/log/deployment#az-webapp-log-deployment-show)<br/>- [az webapp log deployment list](/cli/azure/webapp/log/deployment#az-webapp-log-deployment-list)<br/>- [az webapp log download](/cli/azure/webapp/log#az-webapp-log-download)<br/>- [az webapp log tail](/cli/azure/webapp/log#az-webapp-log-tail)<br/>- [az webapp browse](/cli/azure/webapp#az-webapp-browse)<br/>- [az webapp create-remote-connection](/cli/azure/webapp#az-webapp-create-remote-connection)<br/>- [az webapp ssh](/cli/azure/webapp#az-webapp-ssh)<br/>- [az functionapp deploy](/cli/azure/functionapp#az-functionapp-deploy)<br/>- [az functionapp log deployment list](/cli/azure/functionapp/log/deployment#az-functionapp-log-deployment-list)<br/>- [az functionapp log deployment show](/cli/azure/functionapp/log/deployment#az-functionapp-log-deployment-show)<br/>- [az functionapp deployment source config-zip](/cli/azure/functionapp/deployment/source#az-functionapp-deployment-source-config-zip)<br/>For more information, see [az appservice](/cli/azure/appservice) and [az webapp](/cli/azure/webapp). |
+|Azure CLI |Microsoft Entra ID | In Azure CLI, version 2.48.1 or higher, the following commands use Microsoft Entra if basic authentication is turned off for your web app or function app:<br/>- [az webapp up](/cli/azure/webapp#az-webapp-up)<br/>- [az webapp deploy](/cli/azure/webapp#az-webapp-deploy)<br/>- [az webapp log deployment show](/cli/azure/webapp/log/deployment#az-webapp-log-deployment-show)<br/>- [az webapp log deployment list](/cli/azure/webapp/log/deployment#az-webapp-log-deployment-list)<br/>- [az webapp log download](/cli/azure/webapp/log#az-webapp-log-download)<br/>- [az webapp log tail](/cli/azure/webapp/log#az-webapp-log-tail)<br/>- [az webapp browse](/cli/azure/webapp#az-webapp-browse)<br/>- [az webapp create-remote-connection](/cli/azure/webapp#az-webapp-create-remote-connection)<br/>- [az webapp ssh](/cli/azure/webapp#az-webapp-ssh)<br/>- [az functionapp deploy](/cli/azure/functionapp#az-functionapp-deploy)<br/>- [az functionapp log deployment list](/cli/azure/functionapp/log/deployment#az-functionapp-log-deployment-list)<br/>- [az functionapp log deployment show](/cli/azure/functionapp/log/deployment#az-functionapp-log-deployment-show)<br/>- [az functionapp deployment source config-zip](/cli/azure/functionapp/deployment/source#az-functionapp-deployment-source-config-zip)<br/>For more information, see [az appservice](/cli/azure/appservice) and [az webapp](/cli/azure/webapp). |
 |Azure PowerShell |Microsoft Entra | In Azure PowerShell, version 9.7.1 or above, Microsoft Entra is available for App Service. For more information, see [PowerShell samples for Azure App Service](samples-powershell.md). |
 |SCM/Kudu/OneDeploy REST endpoint |Basic authentication<br/>Microsoft Entra |[Deploy files to App Service](deploy-zip.md) |
 |Kudu UI |Basic authentication<br/>Microsoft Entra |[Deploy files to App Service](deploy-zip.md)|