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

Author: Learn Build Service GitHub App

articles/active-directory/app-provisioning/on-premises-scim-provisioning.md

@@ -42,10 +42,10 @@ Once the agent is installed, no further configuration is necesary on-prem, and a
  4.  Select the agent that you installed from the dropdown list and select **Assign Agent(s)**.
  5.  Now either wait 10 minutes or restart the **Microsoft Azure AD Connect Provisioning Agent** before proceeding to the next step & testing the connection.
  6.  In the **Tenant URL** field, provide the SCIM endpoint URL for your application. The URL is typically unique to each target application and must be resolveable by DNS. An example for a scenario where the agent is installed on the same host as the application is https://localhost:8585/scim ![Screenshot that shows assigning an agent.](./media/on-premises-scim-provisioning/scim-2.png) 
->[!NOTE]
->The Azure AD provisioning service currently drops everything in the URL after the hostname.
-
  7.  Select **Test Connection**, and save the credentials. The application SCIM endpoint must be actively listening for inbound provisioning requests, otherwise the test will fail. Use the steps [here](on-premises-ecma-troubleshoot.md#troubleshoot-test-connection-issues) if you run into connectivity issues. 
+ >[!NOTE]
+> If the test connection fails, you will see the request made. Please note that while the URL in the test connection error message is truncated, the actual request sent to the aplication contains the entire URL provided above. 
+
  8.  Configure any [attribute mappings](customize-application-attributes.md) or [scoping](define-conditional-rules-for-provisioning-user-accounts.md) rules required for your application.
  9.  Add users to scope by [assigning users and groups](../../active-directory/manage-apps/add-application-portal-assign-users.md) to the application.
  10.  Test provisioning a few users [on demand](provision-on-demand.md).

articles/active-directory/authentication/concept-certificate-based-authentication-technical-deep-dive.md

@@ -95,7 +95,7 @@ If CBA enabled user cannot use MF cert (such as on mobile device without smart c
 ## MFA with Single-factor certificate-based authentication
 
 Azure AD CBA can be used as a second factor to meet MFA requirements with single-factor certificates. 
-Some of the supported combintaions are
+Some of the supported combinations are
 
 1. CBA (first factor) + passwordless phone sign-in (PSI as second factor)
 1. CBA (first factor) + FIDO2 security keys (second factor) 

articles/active-directory/external-identities/azure-ad-account.md

@@ -22,7 +22,7 @@ Azure Active Directory is available as an identity provider option for B2B colla
 
 ## Guest sign-in using Azure Active Directory accounts
 
-Azure Active Directory is available in the list of External Identities identity providers by default. No further configuration is needed to allow guest users to sign in with their Azure AD account using either the invitation flow or a self-service sign-up user flow.
+If you want to enable guest users to sign in with their Azure AD account, you can use either the invitation flow or a self-service sign-up user flow. No additional configuration is required.
 
 :::image type="content" source="media/azure-ad-account/azure-ad-account-identity-provider.png" alt-text="Screenshot of Azure AD account in the identity provider list." lightbox="media/azure-ad-account/azure-ad-account-identity-provider.png":::
 

articles/active-directory/fundamentals/concept-secure-remote-workers.md

@@ -34,7 +34,7 @@ This guide assumes that your cloud only or hybrid identities have been establish
 
 ### Guided walkthrough
 
-For a guided walkthrough of many of the recommendations in this article, see the [Set up Azure AD](https://go.microsoft.com/fwlink/?linkid=2221308) guide.
+For a guided walkthrough of many of the recommendations in this article, see the [Set up Azure AD](https://go.microsoft.com/fwlink/?linkid=2224193) guide when signed in to the Microsoft 365 Admin Center.  To review best practices without signing in and activating automated setup features, go to the [M365 Setup portal](https://go.microsoft.com/fwlink/?linkid=2221308).
 
 ## Guidance for Azure AD Free, Office 365, or Microsoft 365 customers.
 

articles/app-service/app-service-undelete.md

@@ -3,7 +3,7 @@ title: Restore deleted apps
 description: Learn how to restore a deleted app in Azure App Service. Avoid the headache of an accidentally deleted app.
 author: seligj95
 ms.author: jordanselig
-ms.date: 11/4/2022
+ms.date: 4/3/2023
 ms.topic: article 
 ms.custom: devx-track-azurepowershell
 ---
@@ -14,8 +14,8 @@ If you happened to accidentally delete your app in Azure App Service, you can re
 
 > [!NOTE]
 > - Deleted apps are purged from the system 30 days after the initial deletion. After an app is purged, it can't be recovered.
-> - Undelete functionality isn't supported for the Consumption plan.
-> - Apps Service apps running in an App Service Environment don't support snapshots. Therefore, undelete functionality and clone functionality aren't supported for App Service apps running in an App Service Environment.
+> - Undelete functionality isn't supported for function apps hosted on the Consumption plan or Elastic Premium plan.
+> - App Service apps running in an App Service Environment don't support snapshots. Therefore, undelete functionality and clone functionality aren't supported for App Service apps running in an App Service Environment.
 >
 
 ## Re-register App Service resource provider
@@ -49,12 +49,12 @@ The detailed information includes:
 ## Restore deleted app
 
 >[!NOTE]
->- `Restore-AzDeletedWebApp` isn't supported for function apps.
+>- `Restore-AzDeletedWebApp` isn't supported for function apps hosted on the Consumption plan or Elastic Premium plan.
 >- The Restore-AzDeletedWebApp cmdlet restores a deleted web app. The web app specified by TargetResourceGroupName, TargetName, and TargetSlot will be overwritten with the contents and settings of the deleted web app. If the target parameters are not specified, they will automatically be filled with the deleted web app's resource group, name, and slot. If the target web app does not exist, it will automatically be created in the app service plan specified by TargetAppServicePlanName.
 >- By default `Restore-AzDeletedWebApp` will restore both your app configuration as well any content. If you want to only restore content, you use the **`-RestoreContentOnly`** flag with this commandlet.
 
 
-Once the app you want to restore has been identified, you can restore it using `Restore-AzDeletedWebApp`, please see below examples
+After identifying the app you want to restore, you can restore it using `Restore-AzDeletedWebApp`, as shown in the following examples.
 >*You can find the full commandlet reference here: **[Restore-AzDeletedWebApp](/powershell/module/az.websites/restore-azdeletedwebapp)*** .
 
 >Restore to the original app name:
@@ -90,16 +90,43 @@ Restore-AzDeletedWebApp -ResourceGroupName <original_rg> -Name <original_app> -D
 
 The inputs for command are:
 
-- **Target Resource Group**: Target resource group where the app will be restored
+- **Target Resource Group**: Target resource group where the app is to be restored
 - **TargetName**: Target app for the deleted app to be restored to
 - **TargetAppServicePlanName**: App Service plan linked to the app
 - **Name**: Name for the app, should be globally unique.
 - **ResourceGroupName**: Original resource group for the deleted app 
 - **Slot**: Slot for the deleted app 
-- **RestoreContentOnly**: By default `Restore-AzDeletedWebApp` will restore both your app configuration as well any content. If you want to only restore content, you can use the `-RestoreContentOnly` flag with this commandlet.
+- **RestoreContentOnly**: By default `Restore-AzDeletedWebApp` restores both your app configuration as well any content. If you want to only restore content, you can use the `-RestoreContentOnly` flag with this commandlet.
 
 > [!NOTE]
 > If the app was hosted on and then deleted from an App Service Environment, it can be restored only if the corresponding App Service Environment still exists.
 
+## Restore deleted function app 
+
+If the function app was hosted on a **Dedicated app service plan**, it can be restored, as long as it was using the default App Service storage.
+
+1. Fetch the DeletedSiteId of the app version you want to restore, using Get-AzDeletedWebApp cmdlet:
+
+```powershell
+Get-AzDeletedWebApp -ResourceGroupName <RGofDeletedApp> -Name <NameofApp> 
+```
+2. Create a new function app in a Dedicated plan. Refer to the instructions for [how to create an app in the portal](../azure-functions/functions-create-function-app-portal.md#create-a-function-app).
+3. Restore to the newly created function app using this cmdlet:
+
+```powershell
+Restore-AzDeletedWebApp -ResourceGroupName <RGofnewapp> -Name <newApp> -deletedId "/subscriptions/xxxx/providers/Microsoft.Web/locations/xxxx/deletedSites/xxxx"
+```
+
+Currently there's no support for Undelete (Restore-AzDeletedWebApp) Function app that's hosted in a Consumption plan or Elastic premium plan since the content resides on Azure Files in a Storage account. If you haven't 'hard' deleted that Azure Files storage account, or if the account exists and file shares haven't been deleted, then you may use the steps as workaround:
+ 
+
+1. Create a new function app in a Consumption or Premium plan. Refer the instructions for [how to create an app in the portal](../azure-functions/functions-create-function-app-portal.md#create-a-function-app).
+2. Set the following [app settings](../azure-functions/functions-how-to-use-azure-function-app-settings.md?tabs=portal#settings) to refer to the old storage account , which contains the content from the previous app.
+
+    | App Setting      | Suggested value  | 
+    | ------------ | ---------------- | 
+    | **AzureWebJobsStorage** | Connection String for the storage account used by the deleted app. | 
+    | **WEBSITE_CONTENTAZUREFILECONNECTIONSTRING** | Connection String for the storage account used by the deleted app. | 
+    | **WEBSITE_CONTENTSHARE** | File share on storage account used by the deleted app. | 
 
 

articles/azure-functions/functions-networking-options.md

@@ -283,6 +283,15 @@ The following APIs let you programmatically manage regional virtual network inte
 + **Azure CLI**: Use the [`az functionapp vnet-integration`](/cli/azure/functionapp/vnet-integration) commands to add, list, or remove a regional virtual network integration.  
 + **ARM templates**: Regional virtual network integration can be enabled by using an Azure Resource Manager template. For a full example, see [this Functions quickstart template](https://azure.microsoft.com/resources/templates/function-premium-vnet-integration/).
 
+## Testing
+
+When testing functions in a function app with private endpoints, you must do your testing from within the same virtual network, such as on a virtual machine (VM) in that network. To use the **Code + Test** option in the portal from that VM, you need to add following [CORS origins](./functions-how-to-use-azure-function-app-settings.md?tabs=portal#cors) to your function app:
+
+* https://functions-next.azure.com
+* https://functions-staging.azure.com
+* https://functions.azure.com
+* https://portal.azure.com
+
 ## Troubleshooting
 
 [!INCLUDE [app-service-web-vnet-troubleshooting](../../includes/app-service-web-vnet-troubleshooting.md)]

articles/azure-monitor/app/ip-collection.md

@@ -2,7 +2,7 @@
 title: Application Insights IP address collection | Microsoft Docs
 description: Understand how Application Insights handles IP addresses and geolocation.
 ms.topic: conceptual
-ms.date: 11/15/2022
+ms.date: 04/06/2023
 ms.custom: devx-track-js
 ms.reviewer: saars
 ---
@@ -126,6 +126,16 @@ Content-Length: 54
 }
 ```
 
+### Powershell
+
+The Powershell 'Update-AzApplicationInsights' cmdlet can disable IP masking with the `DisableIPMasking` parameter.
+
+```powershell
+Update-AzApplicationInsights -Name "aiName" -ResourceGroupName "rgName" -DisableIPMasking $false
+```
+
+For more information on the 'Update-AzApplicationInsights' cmdlet, see [Update-AzApplicationInsights](https://learn.microsoft.com/powershell/module/az.applicationinsights/update-azapplicationinsights)
+
 ## Telemetry initializer
 
 If you need a more flexible alternative than `DisableIpMasking`, you can use a [telemetry initializer](./api-filtering-sampling.md#addmodify-properties-itelemetryinitializer) to copy all or part of the IP address to a custom field. The code for this class is the same across .NET versions.

articles/azure-monitor/app/migrate-from-instrumentation-keys-to-connection-strings.md

@@ -2,7 +2,7 @@
 title: Migrate from Application Insights instrumentation keys to connection strings
 description: Learn the steps required to upgrade from Azure Monitor Application Insights instrumentation keys to connection strings.
 ms.topic: conceptual
-ms.date: 02/14/2022
+ms.date: 05/06/2023
 ms.reviewer: cogoodson
 ---
 

articles/azure-monitor/app/worker-service.md

@@ -569,7 +569,7 @@ This section provides answers to common questions.
 
 | .NET Core app scenario | Package  |
 |---------|---------|
-| Without HostedServices                              | AspNetCore                     |
+| Without HostedServices                              | WorkerService                     |
 | With HostedServices                                 | AspNetCore (not WorkerService) |
 | With HostedServices, monitoring only HostedServices | WorkerService (rare scenario)  |
 

articles/azure-monitor/faq.yml

@@ -925,7 +925,7 @@ sections:
       - question: |
           Can I test OpenTelemetry in a web browser today?
         answer: |
-          The [OpenTelemetry web sandbox](https://github.com/open-telemetry/opentelemetry-sandbox-web-js) is a fork designed to make OpenTelemetry work in a browser. It's not yet possible to send telemetry to Application Insights or 1DS Collector. The SDK doesn't currently have defined general client events.
+          The [OpenTelemetry web sandbox](https://github.com/open-telemetry/opentelemetry-sandbox-web-js) is a fork designed to make OpenTelemetry work in a browser. It's not yet possible to send telemetry to Application Insights. The SDK doesn't currently have defined general client events.
 
       - question: |
           How do I determine if OpenTelemetry is right for me?
@@ -1198,7 +1198,7 @@ sections:
           * Monitored VMs are now included in the server port group nodes. The donut chart shows the proportion of monitored versus unmonitored machines in the group. It can also be used to filter the list of machines when the group is expanded.
           * The map style was updated to be more consistent with App Map from Application insights.
           * The side panes have been updated and don't have the full set of integrations that were supported in Service Map: Update Management, Change Tracking, Security, and Service Desk.
-          * The option for choosing groups and machines to map was updated and now supports subscriptions, resource groups, Azure virtual machine scale sets, and cloud services.
+          * The option for choosing groups and machines to map was updated and now supports subscriptions, resource groups, Azure Virtual Machine Scale Sets, and cloud services.
           * You can't create new Service Map machine groups in the VM insights Map feature.
           
       - question: |
@@ -1225,7 +1225,7 @@ sections:
       - question: |
           How does the Map feature handle duplicate IPs across different virtual networks and subnets?
         answer: |
-          If you're duplicating IP ranges either with VMs or Azure virtual machine scale sets across subnets and virtual networks, VM insights Map might display incorrect information. This issue is known. We're investigating options to improve this experience.
+          If you're duplicating IP ranges either with VMs or Azure Virtual Machine Scale Sets across subnets and virtual networks, VM insights Map might display incorrect information. This issue is known. We're investigating options to improve this experience.
 
       - question: |
           Does the Map feature support IPv6?