Merge branch 'master' of https://github.com/microsoftdocs/azure-docs-pr into ade-cli-win-qs

Author: msmbaldwin

articles/active-directory/conditional-access/overview.md

@@ -87,6 +87,8 @@ After the user has signed in to the federated authentication service, Azure AD h
 
 [!INCLUDE [Active Directory P1 license](../../../includes/active-directory-p1-license.md)]
 
+Customers with [Microsoft 365 Business licenses](https://docs.microsoft.com/office365/servicedescriptions/microsoft-365-business-service-description) also have access to Conditional Access features. 
+
 ## Next steps
 
 To learn how to implement Conditional Access in your environment, see [Plan your Conditional Access deployment in Azure Active Directory](plan-conditional-access.md).

articles/azure-monitor/app/create-new-resource.md

@@ -11,55 +11,49 @@ ms.service: application-insights
 ms.workload: tbd
 ms.tgt_pltfrm: ibiza
 ms.topic: conceptual
-ms.date: 12/02/2016
+ms.date: 06/10/2019
 ms.author: mbullwin
 
 ---
 # Create an Application Insights resource
-Azure Application Insights displays data about your application in a Microsoft Azure *resource*. Creating a new resource is therefore part of [setting up Application Insights to monitor a new application][start]. In many cases, creating a resource can be done automatically by the IDE. But in some cases, you create a resource manually - for example, to have separate resources for development and production builds of your application.
 
-After you have created the resource, you get its instrumentation key and use that to configure the SDK in the application. The resource key links the telemetry to the resource.
+Azure Application Insights displays data about your application in a Microsoft Azure *resource*. Creating a new resource is therefore part of [setting up Application Insights to monitor a new application][start]. After you have created your new resource, you can get its instrumentation key and use that to configure the Application Insights SDK. The instrumentation key links your telemetry to the resource.
 
-## Sign up to Microsoft Azure
-If you haven't got a [Microsoft account, get one now](https://live.com). (If you use services like Outlook.com, OneDrive, Windows Phone, or XBox Live, you already have a Microsoft account.)
+## Sign in to Microsoft Azure
 
-You also need a subscription to [Microsoft Azure](https://azure.com). If your team or organization has an Azure subscription, the owner can add you to it, using your Windows Live ID. You're only charged for what you use. The default basic plan allows for a certain amount of experimental use free of charge.
-
-When you've got access to a subscription, log in to Application Insights at [https://portal.azure.com](https://portal.azure.com), and use your Live ID to login.
+If you don't have an Azure subscription, create a [free](https://azure.microsoft.com/free/) account before you begin.
 
 ## Create an Application Insights resource
-In the [portal.azure.com](https://portal.azure.com), add an Application Insights resource:
 
-![Click New, Application Insights](./media/create-new-resource/01-new.png)
+Sign in to the [Azure portal](https://portal.azure.com), and create an Application Insights resource:
 
-* **Application type** affects what you see on the overview blade and the properties available in [metric explorer][metrics]. If you don't see your type of app, choose General.
-* **Subscription** is your payment account in Azure.
-* **Resource group** is a convenience for managing properties like access control. If you have already created other Azure resources, you can choose to put this new resource in the same group.
-* **Location** is where we keep your data.
-* **Pin to dashboard** puts a quick-access tile for your resource on your Azure Home page. Recommended.
+![Click the `+` sign in the upper left corner. Select Developer Tools followed by Application Insights](./media/create-new-resource/new-app-insights.png)
 
-When your app has been created, a new blade opens. This blade is where you see performance and usage data about your app. 
+   | Settings        |  Value           | Description  |
+   | ------------- |:-------------|:-----|
+   | **Name**      | Globally Unique Value | Name that identifies the app you are monitoring. |
+   | **Resource Group**     | myResourceGroup      | Name for the new or existing resource group to host App Insights data. |
+   | **Location** | East US | Choose a location near you, or near where your app is hosted. |
 
-To get back to it next time you log in to Azure, look for your app's quick-start tile on the start board (home screen). Or click Browse to find it.
+Enter the appropriate values into the required fields, and then select **Review + create**.
 
-## Copy the instrumentation key
-The instrumentation key identifies the resource that you created. You need it to give to the SDK.
+![Enter values into required fields, and then select "review + create".](./media/create-new-resource/review-create.png)
 
-![Click Essentials, click the Instrumentation Key, CTRL+C](./media/create-new-resource/02-props.png)
+When your app has been created, a new pane opens. This pane is where you see performance and usage data about your monitored application. 
 
-## Install the SDK in your app
-Install the Application Insights SDK in your app. This step depends heavily on the type of your application. 
+## Copy the instrumentation key
 
-Use the instrumentation key to configure [the SDK that you install in your application][start].
+The instrumentation key identifies the resource that you want to associate your telemetry data with. You will need copy to add the instrumentation key to your application's code.
 
-The SDK includes standard modules that send telemetry without you having to write any code. To track user actions or diagnose issues in more detail, [use the API][api] to send your own telemetry.
+![Click and copy the instrumentation key](./media/create-new-resource/instrumentation-key.png)
 
-## <a name="monitor"></a>See telemetry data
-Close the quick start blade to return to your application blade in the Azure portal.
+## Install the SDK in your app
+
+Install the Application Insights SDK in your app. This step depends heavily on the type of your application.
 
-Click the Search tile to see [Diagnostic Search][diagnostic], where the first events appear. 
+Use the instrumentation key to configure [the SDK that you install in your application][start].
 
-If you're expecting more data, click **Refresh** after a few seconds  .
+The SDK includes standard modules that send telemetry without you having to write any additional code. To track user actions or diagnose issues in more detail, [use the API][api] to send your own telemetry.
 
 ## Creating a resource automatically
 You can write a [PowerShell script](../../azure-monitor/app/powershell.md) to create a resource automatically.
@@ -74,5 +68,4 @@ You can write a [PowerShell script](../../azure-monitor/app/powershell.md) to cr
 [api]: ../../azure-monitor/app/api-custom-events-metrics.md
 [diagnostic]: ../../azure-monitor/app/diagnostic-search.md
 [metrics]: ../../azure-monitor/app/metrics-explorer.md
-[start]: ../../azure-monitor/app/app-insights-overview.md
-
+[start]: ../../azure-monitor/app/app-insights-overview.md

articles/azure-monitor/app/media/create-new-resource/01-new.png

@@ -11,7 +11,7 @@ ms.service: azure-monitor
 ms.topic: article
 ms.tgt_pltfrm: na
 ms.workload: infrastructure-services
-ms.date: 06/04/2019
+ms.date: 06/10/2019
 ms.author: magoedte
 ---
 
@@ -64,13 +64,13 @@ If you have enabled Kubernetes RBAC authorization, you will need to apply cluste
 2. If you are configuring it for the first time, you create the cluster rule binding by running the following command: `kubectl create -f LogReaderRBAC.yaml`. If you previously enabled support for live logs preview before we introduced live event logs, to update your configuration, run the following command: `kubectl apply -f LogReaderRBAC.yml`. 
 
 ## Configure AKS with Azure Active Directory
-AKS can be configured to use Azure Active Directory (AD) for user authentication. If you are configuring it for the first time, see [Integrate Azure Active Directory with Azure Kubernetes Service](../../aks/azure-ad-integration.md). During the steps to create the [client application](../../aks/azure-ad-integration.md#create-client-application), you need to specify two **redirect URI** entries. The two URIs are:
+AKS can be configured to use Azure Active Directory (AD) for user authentication. If you are configuring it for the first time, see [Integrate Azure Active Directory with Azure Kubernetes Service](../../aks/azure-ad-integration.md). During the steps to create the [client application](../../aks/azure-ad-integration.md#create-client-application), specify the following:
 
-- https://ininprodeusuxbase.microsoft.com/*
-- https://afd.hosting.portal.azure.net/monitoring/Content/iframe/infrainsights.app/web/base-libs/auth/auth.html  
+- **Redirect URI (optional)**: This is a **Web** application type and the base URL value should be `https://afd.hosting.portal.azure.net/monitoring/Content/iframe/infrainsights.app/web/base-libs/auth/auth.html`. 
+- After registering the application, from the **Overview** page select **Authentication** from the left-hand pane. On the **Authentication** page, under **Advanced settings** implicitly grant **Access tokens** and **ID tokens** and then save your changes.        
 
 >[!NOTE]
->Configuring authentication with Azure Active Directory for single-sign on can only be accomplished during intial deployment of a new AKS cluster. You cannot configure single-sign on for an AKS cluster already deployed. You must configure authentication from **App registration (legacy)** option in Azure AD in order to support the use of a wildcard in the URI, and while adding it to the list, register it as a **native** app.
+>Configuring authentication with Azure Active Directory for single-sign on can only be accomplished during initial deployment of a new AKS cluster. You cannot configure single-sign on for an AKS cluster already deployed. 
 > 
 
 ## View live logs and events

articles/azure-monitor/app/media/create-new-resource/02-props.png

@@ -9,7 +9,7 @@ ms.devlang: na
 ms.topic: article
 ms.tgt_pltfrm: na
 ms.workload: infrastructure-services
-ms.date: 04/02/2019
+ms.date: 06/10/2019
 ms.author: kumud;tyao
 ---
 
@@ -27,9 +27,6 @@ An Azure WAF policy can be applied to web applications hosted on Application Gat
 
 Azure Front Door is a highly scalable, globally distributed application and content delivery network. Azure WAF, when integrated with Front Door, stops denial-of-service and targeted application attacks at the Azure network edge, close to attack sources before they enter your virtual network, offers protection without sacrificing performance.
 
-## How will I be charged for Azure WAF for Front Door?
-During public preview, WAF usage at Front Door are free of charge. Note that Front Door charge is extra. See Front Door Service pricing [here](https://azure.microsoft.com/pricing/details/frontdoor/).
-
 ## Does Azure WAF support HTTPS?
 
 Front Door Service offers SSL offloading. WAF is natively integrated with Front Door and can inspect a request after it is decrypted.