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

Author: Banani-Rath

articles/active-directory/cloud-sync/concept-attributes.md

@@ -10,7 +10,7 @@ ms.service: active-directory
 ms.topic: conceptual
 ms.tgt_pltfrm: na
 ms.workload: identity
-ms.date: 02/18/2019
+ms.date: 02/25/2021
 ms.subservice: hybrid
 ms.author: billmath
 
@@ -71,7 +71,7 @@ To view the schema and verify it, follow these steps.
 1.  Go to [Graph Explorer](https://developer.microsoft.com/graph/graph-explorer).
 1.  Sign in with your global administrator account.
 1.  On the left, select **modify permissions** and ensure that **Directory.ReadWrite.All** is *Consented*.
-1.  Run the query `https://graph.microsoft.com/beta/serviceprincipals/?$filter=startswith(Displayname,'Active')`. This query returns a filtered list of service principals.
+1.  Run the query `https://graph.microsoft.com/beta/serviceprincipals/?$filter=startswith(DisplayName, ‘{sync config name}’)`. This query returns a filtered list of service principals.  This can also be acquire via the App Registration node under Azure Active Directory.
 1.  Locate `"appDisplayName": "Active Directory to Azure Active Directory Provisioning"` and note the value for `"id"`.
     ```
     "value": [

articles/active-directory/develop/supported-accounts-validation.md

@@ -42,7 +42,7 @@ See the following table for the validation differences of various properties for
 | appRoles                                                     | Supported <br> No limit\*                                                                                                                                                                                                                           | Supported <br> No limit\*                                                                                                                                                                                                                      | Not supported                                                                                                                                                                                                      |
 | Front-channel logout URL                                     | https://localhost is allowed <br><br> `http` scheme isn't allowed <br><br> Maximum length of 255 characters                                                                                                                                         | https://localhost is allowed <br><br> `http` scheme isn't allowed <br><br> Maximum length of 255 characters                                                                                                                                    | https://localhost is allowed, http://localhost fails <br><br> `http` scheme isn't allowed <br><br> Maximum length of 255 characters <br><br> Wildcards aren't supported                                            |
 | Display name                       | Maximum length of 120 characters                                                                                                                                                                                                                                         | Maximum length of 120 characters                                                                                                                                                                                                                                    | Maximum length of 90 characters                                                                                                                                                               |
-| Tags                       | Individual tag size must be between 1 and 256 characters (inclusive).  No whitespaces or duplicate tags allowed.                                                                                                                                                                                                                                         | Individual tag size must be between 1 and 256 characters (inclusive).  No whitespaces or duplicate tags allowed.                                                                                                                                                                                                                                    | Individual tag size must be between 1 and 256 characters (inclusive).  No whitespaces or duplicate tags allowed.                                                                                                                                                                |
+| Tags                       | Individual tag size must be between 1 and 256 characters (inclusive) <br><br> No whitespaces or duplicate tags allowed <br><br> No limit\* on number of tags                                                                                                                                                                                                                                         | Individual tag size must be between 1 and 256 characters (inclusive) <br><br> No whitespaces or duplicate tags allowed <br><br> No limit\* on number of tags                                                                                                                                                                                                                                      | Individual tag size must be between 1 and 256 characters (inclusive) <br><br> No whitespaces or duplicate tags allowed <br><br> No limit\* on number of tags                                                                                                                                                                  |
 
 \* There's a global limit of about 1000 items across all the collection properties on the app object.
 

articles/app-service/faq-app-service-linux.yml

@@ -127,7 +127,7 @@ sections:
       - question: |
           What is the format for the private registry server URL?
         answer: |
-          Provide the full registry URL, including `http://` or `https://`.
+          Provide the full registry URL, including `http://` or `https://`. For Azure Container Registry with private endpoints and pulling images over virtual network, explicitly remove the `http://` or `https://` when using Admin credentials (for example, myacr.azurecr.io).
           
       - question: |
           What is the format for the image name in the private registry option?
@@ -171,7 +171,7 @@ sections:
           Create the following application settings:
           
           - DOCKER_REGISTRY_SERVER_USERNAME
-          - DOCKER_REGISTRY_SERVER_URL (full URL, ex: `https://<server-name>.azurecr.io`)
+          - DOCKER_REGISTRY_SERVER_URL (full URL, ex: `https://<server-name>.azurecr.io`). With private endpoints and virtual networks, remove the `http://` or `https://` when using Admin credentials.
           - DOCKER_REGISTRY_SERVER_PASSWORD (enable admin access in ACR settings)
           
           Within the configuration file, reference your ACR image like the following example:

articles/azure-arc/data/create-sql-managed-instance-azure-data-studio.md

@@ -33,6 +33,11 @@ This document walks you through the steps for installing Azure SQL Managed Insta
   - Enter and confirm a password for the SQL Server instance
   - Select the storage class as appropriate for data
   - Select the storage class as appropriate for logs
+  - Select the storage class as appropriate for backups
+ 
+ > [!NOTE]
+>Note: Starting with the February release, a ReadWriteMany (RWX) capable storage class needs to be specified for backups. Learn more about [access modes](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#access-modes)
+If no storage class is specified for backups, the default storage class in kubernetes is used and if this is not RWX capable, the Arc SQL Managed Instance installation may not succeed. 
 
 - Click the **Deploy** button
 

articles/azure-arc/data/create-sql-managed-instance.md

@@ -25,28 +25,34 @@ az sql mi-arc create --help
 
 To create a SQL Managed Instance, use `az sql mi-arc create`. See the following examples for different connectivity modes:
 
+> [!NOTE]
+>  Starting with the February release, a ReadWriteMany (RWX) capable storage class needs to be specified for backups. Learn more about [access modes](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#access-modes)
+If no storage class is specified for backups, the default storage class in kubernetes is used and if this is not RWX capable, the Arc SQL Managed Instance installation may not succeed.
+
+
+
 ### [Indirectly connected mode](#tab/indirectly)
 
 ```azurecli
-az sql mi-arc create -n <instanceName> --k8s-namespace <namespace> --use-k8s
+az sql mi-arc create -n <instanceName> --storage-class-backups <RWX capable storageclass>  --k8s-namespace <namespace> --use-k8s
 ```
 
 Example:
 
 ```azurecli
-az sql mi-arc create -n sqldemo --k8s-namespace my-namespace --use-k8s
+az sql mi-arc create -n sqldemo --storage-class-backups mybackups --k8s-namespace my-namespace --use-k8s
 ```
 
 ### [Directly connected mode](#tab/directly)
 
 ```azurecli
-az sql mi-arc create --name <name> --resource-group <group>  --location <Azure location> -–subscription <subscription>  --custom-location <custom-location>
+az sql mi-arc create --name <name> --resource-group <group>  --location <Azure location> -–subscription <subscription>  --custom-location <custom-location> --storage-class-backups <RWX capable storageclass>
 ```
 
 Example:
 
 ```azurecli
-az sql mi-arc create --name sqldemo --resource-group rg  --location uswest2 -–subscription xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx  --custom-location private-location
+az sql mi-arc create --name sqldemo --resource-group rg  --location uswest2 -–subscription xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx  --custom-location private-location --storage-class-backups mybackups
 ```
 
 ---

articles/azure-arc/kubernetes/tutorial-arc-enabled-open-service-mesh.md

@@ -37,7 +37,7 @@ OSM runs an Envoy-based control plane on Kubernetes, can be configured with [SMI
 - Ensure you have met all the common prerequisites for cluster extensions listed [here](extensions.md#prerequisites).
 - Use az k8s-extension CLI version >= v0.4.0
 
-## Basic Installation of Azure Arc-enabled OSM on an Azure Arc-enabled Kubernetes Cluster
+## Basic installation of Azure Arc-enabled OSM
 
 The following steps assume that you already have a cluster with a supported Kubernetes distribution connected to Azure Arc.
 Ensure that your KUBECONFIG environment variable points to the kubeconfig of the Arc-enabled Kubernetes cluster.
@@ -89,7 +89,7 @@ You should see output similar to the output shown below. It may take 3-5 minutes
 }
 ```
 
-## Custom Installations of Azure Arc-enabled OSM
+## Custom installations of Azure Arc-enabled OSM
 The following sections describe certain custom installations of Azure Arc-enabled OSM. Custom installations require setting 
 values of OSM by in a JSON file and passing them into `k8s-extension create` CLI command as described below.
 
@@ -113,15 +113,52 @@ It may take 3-5 minutes for the actual OSM helm chart to get deployed to the clu
 
 To ensure that the privileged init container setting is not reverted to the default, pass in the "osm.osm.enablePrivilegedInitContainer" : "true" configuration setting to all subsequent az k8s-extension create commands.
 
+### Enable High Availability features on installation
+OSM's control plane components are built with High Availability and Fault Tolerance in mind. This section describes how to
+enable Horizontal Pod Autoscaling (HPA) and Pod Disruption Budget (PDB) during installation. Read more on the design
+considerations of High Availability on OSM [here](https://openservicemesh.io/docs/guides/ha_scale/high_availability/).
+
+#### Horizontal Pod Autoscaling (HPA)
+HPA automatically scales up or down control plane pods based on the average target CPU utilization (%) and average target 
+memory utilization (%) defined by the user. To enable HPA and set applicable values on OSM control plane pods during installation, create or
+append to your existing JSON settings file as below, repeating the key/value pairs for each control plane pod 
+(`osmController`, `injector`) that you want to enable HPA on. 
+
+```json
+{
+  "osm.osm.<control_plane_pod>.autoScale.enable" : "true",
+  "osm.osm.<control_plane_pod>.autoScale.minReplicas" : "<allowed values: 1-10>",
+  "osm.osm.<control_plane_pod>.autoScale.maxReplicas" : "<allowed values: 1-10>",
+  "osm.osm.<control_plane_pod>.autoScale.cpu.targetAverageUtilization" : "<allowed values 0-100>",
+  "osm.osm.<control_plane_pod>.autoScale.memory.targetAverageUtilization" : "<allowed values 0-100>"
+}
+```
+
+Now, [install OSM with custom values](#setting-values-during-osm-installation).
+
+#### Pod Disruption Budget (PDB)
+In order to prevent disruptions during planned outages, control plane pods `osm-controller` and `osm-injector` have a PDB 
+that ensures there is always at least 1 pod corresponding to each control plane application.
+
+To enable PDB, create or append to your existing JSON settings file as follows for each desired control plane pod 
+(`osmController`, `injector`):
+```json
+{
+  "osm.osm.<control_plane_pod>.enablePodDisruptionBudget" : "true"
+}
+```
+
+Now, [install OSM with custom values](#setting-values-during-osm-installation).
+
 ### Install OSM with cert-manager for Certificate Management
 [cert-manager](https://cert-manager.io/) is a provider that can be used for issuing signed certificates to OSM without
 the need for storing private keys in Kubernetes. Refer to OSM's [cert-manager documentation](https://release-v0-11.docs.openservicemesh.io/docs/guides/certificates/)
 and [demo](https://docs.openservicemesh.io/docs/demos/cert-manager_integration/) to learn more.
 > [!NOTE]
 > Use the commands provided in the OSM GitHub documentation with caution. Ensure that you use the correct namespace name `arc-osm-system`.
 
-To install OSM with cert-manager as the certificate provider, create a JSON file with the `certificateProvider.kind` value set to
-cert-manager as shown below. If you would like to change from default cert-manager values specified in OSM documentation,
+To install OSM with cert-manager as the certificate provider, create or append to your existing JSON settings file the `certificateProvider.kind` 
+value set to cert-manager as shown below. If you would like to change from default cert-manager values specified in OSM documentation,
 also include and update the subsequent `certmanager.issuer` lines.
 
 ```json
@@ -144,7 +181,7 @@ and [demo](https://docs.openservicemesh.io/docs/demos/ingress_contour/) to learn
 > [!NOTE]
 > Use the commands provided in the OSM GitHub documentation with caution. Ensure that you use the correct namespace name `arc-osm-system`.
 
-To set required values for configuring Contour during OSM installation, create the following JSON file:
+To set required values for configuring Contour during OSM installation, append the following to your JSON settings file:
 ```json
 {
   "osm.osm.osmNamespace" : "arc-osm-system",
@@ -157,7 +194,7 @@ To set required values for configuring Contour during OSM installation, create t
 Now, [install OSM with custom values](#setting-values-during-osm-installation).
 
 ### Setting values during OSM installation
-Values that need to be set during OSM installation need to be saved to a JSON file and passed in through the Azure CLI
+Any values that need to be set during OSM installation need to be saved to a single JSON file and passed in through the Azure CLI
 install command.
 
 Once you have created a JSON file with applicable values as described in above custom installation sections, set the 
@@ -174,7 +211,7 @@ Run the `az k8s-extension create` command to create the OSM extension, passing i
 
 ## Install Azure Arc-enabled OSM using ARM template
 
-After connecting your cluster to Azure Arc, create a json file with the following format, making sure to update the \<cluster-name\> and \<osm-arc-version\> values:
+After connecting your cluster to Azure Arc, create a JSON file with the following format, making sure to update the \<cluster-name\> and \<osm-arc-version\> values:
 
 ```json
 {

articles/azure-functions/functions-how-to-azure-devops.md

@@ -3,27 +3,26 @@ title: Continuously update function app code using Azure Pipelines
 description: Learn how to set up an Azure DevOps pipeline that targets Azure Functions.
 author: juliakm
 ms.topic: conceptual
-ms.date: 12/08/2021
+ms.date: 02/25/2022
 ms.author: jukullam
 ms.custom: "devx-track-csharp, devx-track-python, devx-track-azurecli" 
 ms.devlang: azurecli
 ---
 
 # Continuous delivery with Azure Pipelines
 
-Automatically deploy to Azure Functions with [Azure Pipelines](/azure/devops/pipelines/). Azure Pipelines lets you automate your software development and continuously test, build, and deploy your code. 
+Use [Azure Pipelines](/azure/devops/pipelines/) to automatically deploy to Azure Functions. Azure Pipelines lets you build, test, and deploy with continuous integration (CI) and continuous delivery (CD) using [Azure DevOps](/azure/devops/). 
 
-YAML pipelines aren't available for Azure DevOps 2019 and earlier.
+YAML pipelines are defined using a YAML file in your repository. A step is the smallest building block of a pipeline and can be a script or task (pre-packaged script). [Learn about the key concepts and components that make up a pipeline](/azure/devops/pipelines/get-started/key-pipelines-concepts).
 
+YAML pipelines aren't available for Azure DevOps 2019 and earlier.
 ## Prerequisites
 
 * A GitHub account, where you can create a repository. If you don't have one, you can [create one for free](https://github.com).
 
-* An Azure DevOps organization. If you don't have one, you can [create one for free](/azure/devops/pipelines/get-started/pipelines-sign-up). (An Azure DevOps organization is different from your GitHub organization. You can give your DevOps organization and your GitHub organization the same name if you want alignment between them.)
-
-  If your team already has one, then make sure you're an administrator of the Azure DevOps project that you want to use.
+* An Azure DevOps organization. If you don't have one, you can [create one for free](/azure/devops/pipelines/get-started/pipelines-sign-up). If your team already has one, then make sure you're an administrator of the Azure DevOps project that you want to use.
 
-* An ability to run pipelines on Microsoft-hosted agents. You can either purchase a [parallel job](/azure/devops/pipelines/licensing/concurrent-jobs) or you can request a free tier. To request a free tier, follow the instructions in [this article](/azure/devops/pipelines/licensing/concurrent-jobs). Note that it may take us 2-3 business days to grant access to the free tier.
+* An ability to run pipelines on Microsoft-hosted agents. You can either purchase a [parallel job](/azure/devops/pipelines/licensing/concurrent-jobs) or you can request a free tier. 
 
 ## Create your function app
 

articles/azure-monitor/app/media/profiler-aspnetcore-linux/create-linux-appservice.png

@@ -21,7 +21,7 @@ After you complete this walkthrough, your app can collect Profiler traces like t
 ## Prerequisites
 The following instructions apply to all Windows, Linux, and Mac development environments:
 
-* Install the [.NET Core SDK 2.1.2 or later](https://dotnet.microsoft.com/download/archives).
+* Install the [.NET Core SDK 3.1 or later](https://dotnet.microsoft.com/download/dotnet).
 * Install Git by following the instructions at [Getting Started - Installing Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git).
 
 ## Set up the project locally
@@ -49,7 +49,7 @@ The following instructions apply to all Windows, Linux, and Mac development envi
     {
         services.AddApplicationInsightsTelemetry(); // Add this line of code to enable Application Insights.
         services.AddServiceProfiler(); // Add this line of code to Enable Profiler
-        services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
+        services.AddControllersWithViews();
     }
     ```
 
@@ -80,7 +80,7 @@ The following instructions apply to all Windows, Linux, and Mac development envi
 
 1. Create the web app environment by using App Service on Linux:
 
-    ![Create the Linux web app](./media/profiler-aspnetcore-linux/create-linux-appservice.png)
+    :::image type="content" source="./media/profiler-aspnetcore-linux/create-linux-appservice.png" alt-text="Create the Linux web app":::
 
 2. Create the deployment credentials: