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

Author: Banani-Rath

articles/active-directory/authentication/howto-mfa-getstarted.md

@@ -4,7 +4,7 @@ description: Learn about deployment considerations and strategy for successful i
 ms.service: active-directory
 ms.subservice: authentication
 ms.topic: how-to
-ms.date: 02/02/2022
+ms.date: 06/01/2022
 ms.author: mtillman
 author: mtillman
 manager: martinco
@@ -246,7 +246,7 @@ You can monitor authentication method registration and usage across your organiz
 
 The Azure AD sign in reports include authentication details for events when a user is prompted for MFA, and if any Conditional Access policies were in use. You can also use PowerShell for reporting on users registered for Azure AD Multi-Factor Authentication. 
 
-NPS extension and AD FS logs can be viewed from **Security** > **MFA** > **Activity report**.
+NPS extension and AD FS logs can be viewed from **Security** > **MFA** > **Activity report**. Inclusion of this activity in the [Sign-in logs](../reports-monitoring/concept-sign-ins.md) is currently in Preview.
 
 For more information, and additional Azure AD Multi-Factor Authentication reports, see [Review Azure AD Multi-Factor Authentication events](howto-mfa-reporting.md#view-the-azure-ad-sign-ins-report).
 

articles/active-directory/enterprise-users/groups-dynamic-membership.md

@@ -9,7 +9,7 @@ ms.service: active-directory
 ms.subservice: enterprise-users
 ms.workload: identity
 ms.topic: overview
-ms.date: 06/02/2022
+ms.date: 06/03/2022
 ms.author: curtand
 ms.reviewer: krbain
 ms.custom: it-pro
@@ -81,10 +81,10 @@ The following are the user properties that you can use to create a single expres
 
 ### Properties of type boolean
 
-| Properties | Allowed values | Usage |
-| --- | --- | --- |
-| accountEnabled |true false |user.accountEnabled -eq true |
-| dirSyncEnabled |true false |user.dirSyncEnabled -eq true |
+Properties | Allowed values | Usage
+--- | --- | ---
+accountEnabled |true false |user.accountEnabled -eq true
+dirSyncEnabled |true false |user.dirSyncEnabled -eq true
 
 ### Properties of type string
 
@@ -101,6 +101,7 @@ The following are the user properties that you can use to create a single expres
 | jobTitle |Any string value or *null* |(user.jobTitle -eq "value") |
 | mail |Any string value or *null* (SMTP address of the user) |(user.mail -eq "value") |
 | mailNickName |Any string value (mail alias of the user) |(user.mailNickName -eq "value") |
+| memberOf | Any string value (valid group object ID) | (device.memberof -any (group.objectId -in ['value'])) |
 | mobile |Any string value or *null* |(user.mobile -eq "value") |
 | objectId |GUID of the user object |(user.objectId -eq "11111111-1111-1111-1111-111111111111") |
 | onPremisesDistinguishedName (preview)| Any string value or *null* |(user.onPremisesDistinguishedName -eq "value") |
@@ -393,12 +394,13 @@ The following device attributes can be used.
  enrollmentProfileName | Apple Device Enrollment Profile name, Android Enterprise Corporate-owned dedicated device Enrollment Profile name, or Windows Autopilot profile name | (device.enrollmentProfileName -eq "DEP iPhones")
  isRooted | true false | (device.isRooted -eq true)
  managementType | MDM (for mobile devices) | (device.managementType -eq "MDM")
+ memberOf | Any string value (valid group object ID) | (user.memberof -any (group.objectId -in ['value'])) 
  deviceId | a valid Azure AD device ID | (device.deviceId -eq "d4fe7726-5966-431c-b3b8-cddc8fdb717d")
  objectId | a valid Azure AD object ID |  (device.objectId -eq "76ad43c9-32c5-45e8-a272-7b58b58f596d")
  devicePhysicalIds | any string value used by Autopilot, such as all Autopilot devices, OrderID, or PurchaseOrderID  | (device.devicePhysicalIDs -any _ -contains "[ZTDId]") (device.devicePhysicalIds -any _ -eq "[OrderID]:179887111881") (device.devicePhysicalIds -any _ -eq "[PurchaseOrderId]:76222342342")
  systemLabels | any string matching the Intune device property for tagging Modern Workplace devices | (device.systemLabels -contains "M365Managed")
 
-> [!Note]  
+> [!NOTE]
 > For the deviceOwnership when creating Dynamic Groups for devices you need to set the value equal to "Company". On Intune the device ownership is represented instead as Corporate. Refer to [OwnerTypes](/intune/reports-ref-devices#ownertypes) for more details. 
 
 ## Next steps

articles/aks/configure-azure-cni.md

@@ -59,7 +59,7 @@ The maximum number of pods per node in an AKS cluster is 250. The *default* maxi
 | -- | :--: | :--: | -- |
 | Azure CLI | 110 | 30 | Yes (up to 250) |
 | Resource Manager template | 110 | 30 | Yes (up to 250) |
-| Portal | 110 | 110 (configured in the Node Pools tab) | No |
+| Portal | 110 | 110 (configurable in the Node Pools tab) | Yes (up to 250) |
 
 ### Configure maximum - new clusters
 
@@ -72,7 +72,7 @@ A minimum value for maximum pods per node is enforced to guarantee space for sys
 | Networking | Minimum | Maximum |
 | -- | :--: | :--: |
 | Azure CNI | 10 | 250 |
-| Kubenet | 10 | 110 |
+| Kubenet | 10 | 250 |
 
 > [!NOTE]
 > The minimum value in the table above is strictly enforced by the AKS service. You can not set a maxPods value lower than the minimum shown as doing so can prevent the cluster from starting.
@@ -175,10 +175,10 @@ The planning of IPs for Kubernetes services and Docker bridge remain unchanged.
 
 The pods per node values when using Azure CNI with dynamic allocation of IPs have changed slightly from the traditional CNI behavior:
 
-|CNI|Deployment Method|Default|Configurable at deployment|
-|--|--| :--: |--|
-|Traditional Azure CNI|Azure CLI|30|Yes (up to 250)|
-|Azure CNI with dynamic allocation of IPs|Azure CLI|250|Yes (up to 250)|
+|CNI|Default|Configurable at deployment|
+|--| :--: |--|
+|Traditional Azure CNI|30|Yes (up to 250)|
+|Azure CNI with dynamic allocation of IPs|250|Yes (up to 250)|
 
 All other guidance related to configuring the maximum nodes per pod remains the same.
 

articles/azure-arc/servers/onboard-portal.md

@@ -23,7 +23,7 @@ The script to automate the download and installation, and to establish the conne
 
 1. On the **Servers - Azure Arc** page, select **Add** at the upper left.
 
-1. On the **Select a method** page, select the **Add servers using interactive script** tile, and then select **Generate script**.
+1. On the **Select a method** page, select the **Add a single server** tile, and then select **Generate script**.
 
 1. On the **Generate script** page, select the subscription and resource group where you want the machine to be managed within Azure. Select an Azure location where the machine metadata will be stored. This location can be the same or different, as the resource group's location.
 

articles/azure-functions/functions-bindings-azure-sql.md

@@ -4,7 +4,7 @@ description: Understand how to use Azure SQL bindings in Azure Functions.
 author: dzsquared
 ms.topic: reference
 ms.custom: event-tier1-build-2022
-ms.date: 5/24/2022
+ms.date: 6/3/2022
 ms.author: drskwier
 ms.reviewer: glenga
 zone_pivot_groups: programming-languages-set-functions-lang-workers
@@ -97,10 +97,17 @@ You can add the preview extension bundle by adding or replacing the following co
 
 ::: zone pivot="programming-language-python"  
 
+## Functions runtime
+
 > [!NOTE]
-> Python language support for the SQL bindings extension is only available for v4 of the [functions runtime](./set-runtime-version.md#view-and-update-the-current-runtime-version) and requires runtime v4.5.0 for deployment in Azure.  Learn more about determining the runtime in the [functions runtime](./set-runtime-version.md#view-and-update-the-current-runtime-version) documentation.  Please see the tracking [GitHub issue](https://github.com/Azure/azure-functions-sql-extension/issues/250) for the latest update on availability.
+> Python language support for the SQL bindings extension is only available for v4 of the [functions runtime](./set-runtime-version.md#view-and-update-the-current-runtime-version) and requires runtime v4.5.0 or greater for deployment in Azure.  Learn more about determining the runtime in the [functions runtime](./set-runtime-version.md#view-and-update-the-current-runtime-version) documentation.  Please see the tracking [GitHub issue](https://github.com/Azure/azure-functions-sql-extension/issues/250) for the latest update on availability.
 
-## Install bundle    
+The functions runtime required for local development and testing of Python functions isn't included in the current release of functions core tools and must be installed independently.  The latest instructions on installing a preview version of functions core tools are available in the tracking [GitHub issue](https://github.com/Azure/azure-functions-sql-extension/issues/250).
+
+Alternatively, a VS Code [development container](https://code.visualstudio.com/docs/remote/containers) definition can be used to expedite your environment setup.  The definition components are available in the SQL bindings [GitHub repository](https://github.com/Azure/azure-functions-sql-extension/tree/main/samples/samples-python/.devcontainer).
+
+
+## Install bundle
 
 The SQL bindings extension is part of a preview [extension bundle], which is specified in your host.json project file.  
 
@@ -120,7 +127,7 @@ You can add the preview extension bundle by adding or replacing the following co
 
 # [Preview Bundle v3.x](#tab/extensionv3)
 
-Python support is not available with the SQL bindings extension in the v3 version of the functions runtime.
+Python support isn't available with the SQL bindings extension in the v3 version of the functions runtime.
 
 ---
 

articles/azure-government/documentation-government-csp-list.md

@@ -71,7 +71,7 @@ Below you can find a list of all the authorized Cloud Solution Providers (CSPs),
 |[Bitscape](https://www.bitscape.com)|
 |[Bio Automation Support](https://www.stacsdna.com/)|
 |[Blackwood Associates, Inc. (dba BAI Federal)](https://www.blackwoodassociates.com/)|
-|[Blue Source Group, Inc.](https://www.blackwoodassociates.com/)|
+|[Blue Source Group, Inc.](https://bluesourcegroup.com/)|
 |[Blueforce Development Corporation](https://www.blueforcedev.com/)|
 |[Booz Allen Hamilton](https://www.boozallen.com/)|
 |[Bridge Partners LLC](https://www.bridgepartnersllc.com)|

articles/azure-monitor/alerts/action-groups.md

@@ -3,7 +3,7 @@ title: Create and manage action groups in the Azure portal
 description: Learn how to create and manage action groups in the Azure portal.
 author: dkamstra
 ms.topic: conceptual
-ms.date: 2/23/2022
+ms.date: 6/2/2022
 ms.author: dukek
 ms.custom: references_regions
 ---
@@ -95,10 +95,11 @@ Under **Instance details**:
 
 > [!NOTE]
 > When you configure an action to notify a person by email or SMS, they receive a confirmation indicating they have been added to the action group.
+
 ### Test an action group in the Azure portal (Preview)
 
 When creating or updating an action group in the Azure portal, you can **test** the action group.
-1. After creating an action rule, click on **Review + create**.  Select *Test action group*.
+1. After defining an action, click on **Review + create**.  Select *Test action group*.
 
     ![The Test Action Group](./media/action-groups/test-action-group.png)
 
@@ -118,11 +119,23 @@ To allow you to check the action groups are working as expected before you enabl
 
 All the details and links in Test email notifications for the alerts fired are a sample set for reference.
 
+#### Azure Resource Manager role membership requirements
+The following table describes the role membership requirements to use the *test actions* functionality
+
+| User's role membersip | Existing Action Group | Existing Resource Group and new Action Group | New Resource Group and new Action Group |
+| ---------- | ------------- | ----------- | ------------- |
+| Subscription Contribuutor | Supported | Supported | Supported |
+| Resource Group Contributor | Supported | Supported | Not Applicable |
+| Action Group resource Contributor | Supported | Not Applicable | Not Applicable |
+| Azure Monitor Contributor | Supported | Supported | Not Applicable |
+| Custom role | Supported | Supported | Not Applicable |
+
+
 > [!NOTE]
-> You may have a limited number of actions in a test Action Group. See the [rate limiting information](./alerts-rate-limiting.md) article.
+> You may perform a limited number of tests over a time period. See the [rate limiting information](./alerts-rate-limiting.md) article.
 >
 > You can opt in or opt out to the common alert schema through Action Groups, on the portal. You can [find common schema samples for test action groups for all the sample types](./alerts-common-schema-test-action-definitions.md).
-> You can opt in or opt out to the non-common alert schema through Action Groups, on the portal. You can [find non-common schema alert definitions](./alerts-non-common-schema-definitions.md).
+> You can [find non-common schema alert definitions](./alerts-non-common-schema-definitions.md).
 
 ## Manage your action groups
 

articles/azure-resource-manager/custom-providers/tutorial-custom-providers-create.md

@@ -3,7 +3,7 @@ title: Create and use a custom provider
 description: This tutorial shows how to create and use an Azure Custom Provider. Use custom providers to change workflows on Azure.
 author: jjbfour
 ms.topic: tutorial
-ms.date: 06/19/2019
+ms.date: 05/06/2022
 ms.author: jobreen 
 ms.custom: devx-track-azurecli
 ---
@@ -70,7 +70,7 @@ You can deploy the previous custom provider by using an Azure Resource Manager t
 
 ```JSON
 {
-    "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+    "$schema": "http://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
     "contentVersion": "1.0.0.0",
     "resources": [
         {
@@ -101,11 +101,11 @@ You can deploy the previous custom provider by using an Azure Resource Manager t
 
 ## Use custom actions and resources
 
-After you create a custom provider, you can use the new Azure APIs. The following tabs explain how to call and use a custom provider.
+After you create a custom provider, you can use the new Azure APIs. The following sections explain how to call and use a custom provider.
 
 ### Custom actions
 
-# [Azure CLI](#tab/azure-cli)
+#### Azure CLI
 
 > [!NOTE]
 > You must replace the `{subscriptionId}` and `{resourceGroupName}` placeholders with the subscription and resource group of where you deployed the custom provider.
@@ -121,15 +121,9 @@ az resource invoke-action --action myCustomAction \
 
 Parameter | Required | Description
 ---|---|---
-*action* | Yes | The name of the action defined in the custom provider
-*ids* | Yes | The resource ID of the custom provider
-*request-body* | No | The request body that will be sent to the endpoint
-
-# [Template](#tab/template)
-
-None.
-
----
+*action* | Yes | The name of the action defined in the custom provider.
+*ids* | Yes | The resource ID of the custom provider.
+*request-body* | No | The request body that will be sent to the endpoint.
 
 ### Custom resources
 
@@ -184,7 +178,7 @@ A sample Resource Manager template:
 
 ```JSON
 {
-    "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+    "$schema": "http://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
     "contentVersion": "1.0.0.0",
     "resources": [
         {
@@ -215,5 +209,5 @@ Parameter | Required | Description
 
 In this article, you learned about custom providers. For more information, see:
 
-- [How to: Adding custom actions to Azure REST API](./custom-providers-action-endpoint-how-to.md)
-- [How to: Adding custom resources to Azure REST API](./custom-providers-resources-endpoint-how-to.md)
+- [How to: Add custom actions to Azure REST API](./custom-providers-action-endpoint-how-to.md)
+- [How to: Add custom resources to Azure REST API](./custom-providers-resources-endpoint-how-to.md)

articles/azure-resource-manager/custom-providers/tutorial-custom-providers-function-setup.md

@@ -3,11 +3,11 @@ title: Set up Azure Functions
 description: This tutorial goes over how to create a function app in Azure Functions and set it up to work with Azure Custom Providers.
 author: jjbfour
 ms.topic: tutorial
-ms.date: 06/19/2019
+ms.date: 05/06/2022
 ms.author: jobreen
 ---
 
-# Set up Azure Functions for Azure Custom Providers
+# Set up Azure Functions for custom providers
 
 A custom provider is a contract between Azure and an endpoint. With custom providers, you can change workflows in Azure. This tutorial shows how to set up a function app in Azure Functions to work as a custom provider endpoint.
 
@@ -16,7 +16,7 @@ A custom provider is a contract between Azure and an endpoint. With custom provi
 > [!NOTE]
 > In this tutorial, you create a simple service endpoint that uses a function app in Azure Functions. However, a custom provider can use any publicly accessible endpoint. Alternatives include Azure Logic Apps, Azure API Management, and the Web Apps feature of Azure App Service.
 
-To start this tutorial, you should first follow the tutorial [Create your first function app in the Azure portal](../../azure-functions/functions-get-started.md). That tutorial creates a .NET core webhook function that can be modified in the Azure portal. It is also the foundation for the current tutorial.
+To start this tutorial, you should first follow the tutorial [Create your first function app in the Azure portal](../../azure-functions/functions-get-started.md). That tutorial creates a .NET core webhook function that can be modified in the Azure portal. It's also the foundation for the current tutorial.
 
 ## Install Azure Table storage bindings
 
@@ -26,8 +26,8 @@ To install the Azure Table storage bindings:
 1. Select **+ New Input**.
 1. Select **Azure Table Storage**.
 1. Install the Microsoft.Azure.WebJobs.Extensions.Storage extension if it isn't already installed.
-1. In the **Table parameter name** box, enter **tableStorage**.
-1. In the **Table name** box, enter **myCustomResources**.
+1. In the **Table parameter name** box, enter *tableStorage*.
+1. In the **Table name** box, enter *myCustomResources*.
 1. Select **Save** to save the updated input parameter.
 
 ![Custom provider overview showing table bindings](./media/create-custom-provider/azure-functions-table-bindings.png)
@@ -44,7 +44,7 @@ To set up the Azure function to include the custom provider RESTful request meth
 ## Add Azure Resource Manager NuGet packages
 
 > [!NOTE]
-> If your C# project file is missing from the project directory, you can add it manually. Or it will appear after the Microsoft.Azure.WebJobs.Extensions.Storage extension is installed on the function app.
+> If your C# project file is missing from the project directory, you can add it manually, or it will appear after the Microsoft.Azure.WebJobs.Extensions.Storage extension is installed on the function app.
 
 Next, update the C# project file to include helpful NuGet libraries. These libraries make it easier to parse incoming requests from custom providers. Follow the steps to [add extensions from the portal](../../azure-functions/functions-bindings-register.md) and update the C# project file to include the following package references:
 
@@ -72,6 +72,6 @@ The following XML element is an example C# project file:
 
 ## Next steps
 
-In this tutorial, you set up a function app in Azure Functions to work as an Azure custom provider endpoint.
+In this tutorial, you set up a function app in Azure Functions to work as an Azure Custom Provider endpoint.
 
 To learn how to author a RESTful custom provider endpoint, see [Tutorial: Authoring a RESTful custom provider endpoint](./tutorial-custom-providers-function-authoring.md).

articles/azure-resource-manager/templates/toc.yml

@@ -111,8 +111,6 @@
       href: ../../hdinsight/interactive-query/quickstart-resource-manager-template.md?toc=/azure/azure-resource-manager/templates/toc.json
     - name: HDInsight - Kafka
       href: ../../hdinsight/kafka/apache-kafka-quickstart-resource-manager-template.md?toc=/azure/azure-resource-manager/templates/toc.json
-    - name: HDInsight - ML Services
-      href: ../../hdinsight/r-server/quickstart-resource-manager-template.md?toc=/azure/azure-resource-manager/templates/toc.json
     - name: HDInsight - Spark
       href: ../../hdinsight/spark/apache-spark-jupyter-spark-sql.md?toc=/azure/azure-resource-manager/templates/toc.json
     - name: Stream Analytics