Merge pull request #50629 from MicrosoftDocs/repo_sync_working_branch

Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)

Author: huypub

articles/active-directory/connect/active-directory-aadconnect-azure-adfs.md

@@ -182,18 +182,21 @@ Select the newly created ILB in the Load Balancers panel. It will open the setti
 
 **6.3. Configuring probe**
 
-In the ILB settings panel, select Probes.
+In the ILB settings panel, select Health probes.
 
 1. Click on add
 2. Provide details for probe
    a. **Name**: Probe name
-   b. **Protocol**: TCP
-   c. **Port**: 443 (HTTPS)
-   d. **Interval**: 5 (default value) – this is the interval at which ILB will probe the machines in the backend pool
-   e. **Unhealthy threshold limit**: 2 (default value) – this is the threshold of consecutive probe failures after which ILB will declare a machine in the backend pool non-responsive and stop sending traffic to it.
+   b. **Protocol**: HTTP
+   c. **Port**: 80 (HTTP)
+   d. **Path**: /adfs/probe 
+   e. **Interval**: 5 (default value) – this is the interval at which ILB will probe the machines in the backend pool
+   f. **Unhealthy threshold limit**: 2 (default value) – this is the threshold of consecutive probe failures after which ILB will declare a machine in the backend pool non-responsive and stop sending traffic to it.
 
 ![Configure ILB probe](./media/active-directory-aadconnect-azure-adfs/ilbdeployment4.png)
 
+We are using the /adfs/probe endpoint that was created explictly for health checks in an AD FS environment where a full HTTPS path check cannot happen.  This is substantially better than a basic port 443 check, which does not accurately reflect the status of a modern AD FS deployment.  More information on this can be found at https://blogs.technet.microsoft.com/applicationproxyblog/2014/10/17/hardware-load-balancer-health-checks-and-web-application-proxy-ad-fs-2012-r2/.
+
 **6.4. Create load balancing rules**
 
 In order to effectively balance the traffic, the ILB should be configured with load balancing rules. In order to create a load balancing rule, 

articles/ansible/ansible-manage-azure-dynamic-inventories.md

@@ -131,20 +131,21 @@ The purpose of tags is to enable the ability to quickly and easily work with sub
 
 1. Insert the following code into the newly created `nginx.yml` file:
 
-    ```yml
-    - name: Install and start Nginx on an Azure virtual machine
-    hosts: azure
-    become: yes
-    tasks:
-    - name: install nginx
-        apt: pkg=nginx state=installed
-        notify:
-        - start nginx
-
-    handlers:
-    - name: start nginx
-        service: name=nginx state=started
-    ```
+```yml
+---
+- name: Install and start Nginx on an Azure virtual machine
+  hosts: azure
+  become: yes
+  tasks:
+  - name: install nginx
+    apt: pkg=nginx state=installed
+    notify:
+    - start nginx
+
+  handlers:
+  - name: start nginx
+    service: name=nginx state=started
+```
 
 1. Run the `nginx.yml` playbook:
 

articles/azure-stack/user/azure-stack-solution-pipeline.md

@@ -104,7 +104,10 @@ The following steps describe what's required to configure authentication:
 
 ### Create a Service Principal
 
-Refer to the [Service Principal Creation](https://docs.microsoft.com/azure/active-directory/develop/active-directory-integrating-applications) instructions to create a service principal, and then choose **Web App/API** for the Application Type.
+Refer to the [Service Principal Creation](https://docs.microsoft.com/azure/active-directory/develop/active-directory-integrating-applications) instructions to create a service principal, and then choose **Web App/API** for the Application Type or [use this PowerShell script](https://github.com/Microsoft/vsts-rm-extensions/blob/master/TaskModules/powershell/Azure/SPNCreation.ps1#L5) as explained [here](https://docs.microsoft.com/en-us/vsts/pipelines/library/connect-to-azure?view=vsts#create-an-azure-resource-manager-service-connection-with-an-existing-service-principal).
+
+ > [!Note]
+ > If you will use the script to create an Azure Stack Azure Resource Manager endpoint, you need to pass in the `-azureStackManagementURL` and `-environmentName` parameters, that is https://management.local.azurestack.external/ and *AzureStack*.
 
 ### Create an access key
 
@@ -257,7 +260,19 @@ By creating endpoints, a Visual Studio Online (VSTO) build can deploy Azure Serv
 9. In **Add users and groups**, enter a user name and select that user from the list of users.
 10. Select **Save changes**.
 
-Now that the endpoint information exists, the VSTS to Azure Stack connection is ready to use. The build agent in Azure Stack gets instructions from VSTS, and then the agent conveys endpoint information for communication with Azure Stack.
+## Create Azure Stack endpoint
+
+Check [this](https://docs.microsoft.com/en-us/vsts/pipelines/library/connect-to-azure?view=vsts#create-an-azure-resource-manager-service-connection-with-an-existing-service-principal) documentation to create a service connection with an existing service principal and use the following mapping:
+
+- Environment: AzureStack
+- Environment URL: Something like `https://management.local.azurestack.external`
+- Subscription ID: User subscription ID from Azure Stack
+- Subscription name: User subscription name from Azure Stack
+- Service Principal client ID: The principal ID from [this](https://docs.microsoft.com/en-us/azure/azure-stack/user/azure-stack-solution-pipeline#create-a-service-principal) section in this article.
+- Service Principal key: The key from the same article (or the password if you used the script).
+- Tenant ID: The tenant ID you got [here](https://docs.microsoft.com/en-us/azure/azure-stack/user/azure-stack-solution-pipeline#get-the-tenant-id).
+
+Now that the endpoint is created, the VSTS to Azure Stack connection is ready to use. The build agent in Azure Stack gets instructions from VSTS, and then the agent conveys endpoint information for communication with Azure Stack.
 
 ![Build agent](media\azure-stack-solution-hybrid-pipeline\016_save_changes.png)
 

articles/monitoring/monitoring-container-health.md

@@ -222,7 +222,7 @@ If you choose to use the Azure CLI, you first need to install and use the CLI lo
        "contentVersion": "1.0.0.0",
        "parameters": {
          "aksResourceId": {
-           "value": "/subscriptions/<SubscroptiopnId>/resourcegroups/<ResourceGroup>/providers/Microsoft.ContainerService/managedClusters/<ResourceName>"
+           "value": "/subscriptions/<SubscriptionId>/resourcegroups/<ResourceGroup>/providers/Microsoft.ContainerService/managedClusters/<ResourceName>"
        },
        "aksResourceLocation": {
          "value": "East US"

articles/virtual-machines/windows/sql/virtual-machines-windows-portal-sql-availability-group-overview.md

@@ -31,7 +31,7 @@ The diagram illustrates the parts of a complete SQL Server Availability Group in
 
 The key difference for an Availability Group in Azure Virtual Machines is that the Azure virtual machines, require a [load balancer](../../../load-balancer/load-balancer-overview.md). The load balancer holds the IP addresses for the availability group listener. If you have more than one availability group each group requires a listener. One load balancer can support multiple listeners.
 
-When you are ready to build a SQL Server availability aroup on Azure Virtual Machines, refer to these tutorials.
+When you are ready to build a SQL Server availability group on Azure Virtual Machines, refer to these tutorials.
 
 ## Automatically create an availability group from a template