Skip to content

Commit 2f8f4df

Browse files
authored
Merge pull request #103795 from MicrosoftDocs/master
2/10 AM Publish
2 parents d128802 + e0628cc commit 2f8f4df

File tree

65 files changed

+761
-360
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+761
-360
lines changed

articles/active-directory-b2c/azure-monitor.md

Lines changed: 36 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.workload: identity
1111
ms.topic: conceptual
1212
ms.author: marsma
1313
ms.subservice: B2C
14-
ms.date: 02/05/2020
14+
ms.date: 02/10/2020
1515
---
1616

1717
# Monitor Azure AD B2C with Azure Monitor
@@ -20,9 +20,9 @@ Use Azure Monitor to route Azure Active Directory B2C (Azure AD B2C) sign-in and
2020

2121
You can route log events to:
2222

23-
* An Azure storage account.
24-
* An Azure event hub (and integrate with your Splunk and Sumo Logic instances).
25-
* An Azure Log Analytics workspace (to analyze data, create dashboards, and alert on specific events).
23+
* An Azure [storage account](../storage/blobs/storage-blobs-introduction.md).
24+
* An Azure [event hub](../event-hubs/event-hubs-about.md) (and integrate with your Splunk and Sumo Logic instances).
25+
* An [Log Analytics workspace](../azure-monitor/platform/resource-logs-collect-workspace.md) (to analyze data, create dashboards, and alert on specific events).
2626

2727
![Azure Monitor](./media/azure-monitor/azure-monitor-flow.png)
2828

@@ -38,15 +38,15 @@ You can also use the [Azure Cloud Shell](https://shell.azure.com), which include
3838

3939
Azure AD B2C leverages [Azure Active Directory monitoring](../active-directory/reports-monitoring/overview-monitoring.md). To enable *Diagnostic settings* in Azure Active Directory within your Azure AD B2C tenant, you use [delegated resource management](../lighthouse/concepts/azure-delegated-resource-management.md).
4040

41-
You authorize a user in your Azure AD B2C directory (the **Service Provider**) to configure the Azure Monitor instance within the tenant that contains your Azure subscription (the **Customer**). To create the authorization, you deploy an [Azure Resource Manager](../azure-resource-manager/index.yml) template to your Azure AD tenant containing the subscription. The following sections walk you through the process.
41+
You authorize a user or group in your Azure AD B2C directory (the **Service Provider**) to configure the Azure Monitor instance within the tenant that contains your Azure subscription (the **Customer**). To create the authorization, you deploy an [Azure Resource Manager](../azure-resource-manager/index.yml) template to your Azure AD tenant containing the subscription. The following sections walk you through the process.
4242

43-
## Create a resource group
43+
## Create or choose resource group
4444

45-
In the Azure Active Directory (Azure AD) tenant that contains your Azure subscription (*not* the directory that contains your Azure AD B2C tenant), [create a resource group](../azure-resource-manager/management/manage-resource-groups-portal.md#create-resource-groups). Use the following values:
45+
This is the resource group containing the destination Azure storage account, event hub, or Log Analytics workspace to receive data from Azure Monitor. You specify the resource group name when you deploy the Azure Resource Manager template.
4646

47-
* **Subscription**: Select your Azure subscription.
48-
* **Resource group**: Enter name for the resource group. For example, *azure-ad-b2c-monitor*.
49-
* **Region**: Select an Azure location. For example, *Central US*.
47+
[Create a resource group](../azure-resource-manager/management/manage-resource-groups-portal.md#create-resource-groups) or choose an existing one the Azure Active Directory (Azure AD) tenant that contains your Azure subscription, *not* the directory that contains your Azure AD B2C tenant.
48+
49+
This example uses a resource group named *azure-ad-b2c-monitor* in the *Central US* region.
5050

5151
## Delegate resource management
5252

@@ -205,20 +205,42 @@ Once you've deployed the template and have waited a few minutes for the resource
205205

206206
## Configure diagnostic settings
207207

208-
After you've delegated resource management and have selected your subscription, you're ready to [Create diagnostic settings](../active-directory/reports-monitoring/overview-monitoring.md) in the Azure portal.
208+
Diagnostic settings define where logs and metrics for a resource should be sent. Possible destinations are:
209+
210+
- [Azure storage account](../azure-monitor/platform/resource-logs-collect-storage.md)
211+
- [Event hubs](../azure-monitor/platform/resource-logs-stream-event-hubs.md) solutions.
212+
- [Log Analytics workspace](../azure-monitor/platform/resource-logs-collect-workspace.md)
213+
214+
If you haven't already, create an instance of your chosen destination type in the resource group you specified in the [Azure Resource Manager template](#create-an-azure-resource-manager-template).
215+
216+
### Create diagnostic settings
217+
218+
You're ready to [Create diagnostic settings](../active-directory/reports-monitoring/overview-monitoring.md) in the Azure portal.
209219

210220
To configure monitoring settings for Azure AD B2C activity logs:
211221

212222
1. Sign in to the [Azure portal](https://portal.azure.com/).
213223
1. Select the **Directory + Subscription** icon in the portal toolbar, and then select the directory that contains your Azure AD B2C tenant.
214224
1. Select **Azure Active Directory**
215225
1. Under **Monitoring**, select **Diagnostic settings**.
216-
1. Select **+ Add diagnostic setting**.
226+
1. If there are existing settings on the resource, you will see a list of settings already configured. Either select **Add diagnostic setting** to add a new setting, or **Edit** setting to edit an existing one. Each setting can have no more than one of each of the destination types..
217227

218228
![Diagnostics settings pane in Azure portal](./media/azure-monitor/azure-monitor-portal-05-diagnostic-settings-pane-enabled.png)
219229

230+
1. Give your setting a name if it doesn't already have one.
231+
1. Check the box for each destination to send the logs. Select **Configure** to specify their settings as described in the following table.
232+
233+
| Setting | Description |
234+
|:---|:---|
235+
| Archive to a storage account | Name of storage account. |
236+
| Stream to an event hub | The namespace where the event hub is created (if this is your first time streaming logs) or streamed to (if there are already resources that are streaming that log category to this namespace).
237+
| Send to Log Analytics | Name of workspace. |
238+
239+
1. Select **AuditLogs** and **SignInLogs**.
240+
1. Select **Save**.
241+
220242
## Next steps
221243

222-
For more information about adding and configuring diagnostic settings in Azure Monitor, see this tutorial in the Azure Monitor documentation:
244+
For more information about adding and configuring diagnostic settings in Azure Monitor, see [Tutorial: Collect and analyze resource logs from an Azure resource](../azure-monitor/insights/monitor-azure-resource.md).
223245

224-
[Tutorial: Collect and analyze resource logs from an Azure resource](/azure-monitor/learn/tutorial-resource-logs.md)
246+
For information about streaming Azure AD logs to an event hub, see [Tutorial: Stream Azure Active Directory logs to an Azure event hub](../active-directory/reports-monitoring/tutorial-azure-monitor-stream-logs-to-event-hub.md).

articles/active-directory/develop/quickstart-v2-windows-desktop.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ In this quickstart, you'll learn how to write a Windows desktop .NET (WPF) appli
4646
> - In the **Supported account types** section, select **Accounts in any organizational directory and personal Microsoft accounts (for example, Skype, Xbox, Outlook.com)**.
4747
> - Select **Register** to create the application.
4848
> 1. In the list of pages for the app, select **Authentication**.
49-
> 1. In the **Redirect URIs** | **Suggested Redirect URIs for public clients (mobile, desktop)** section, check **https://login.microsoftonline.com/common/oauth2/nativeclient**.
49+
> 1. In the **Redirect URIs** | **Suggested Redirect URIs for public clients (mobile, desktop)** section, use **https://login.microsoftonline.com/common/oauth2/nativeclient**.
5050
> 1. Select **Save**.
5151
5252
> [!div class="sxs-lookup" renderon="portal"]
@@ -110,6 +110,7 @@ Then, initialize MSAL using the following code:
110110
```csharp
111111
public static IPublicClientApplication PublicClientApp;
112112
PublicClientApplicationBuilder.Create(ClientId)
113+
.WithRedirectUri("https://login.microsoftonline.com/common/oauth2/nativeclient")
113114
.WithAuthority(AzureCloudInstance.AzurePublic, Tenant)
114115
.Build();
115116
```

articles/active-directory/identity-protection/howto-identity-protection-configure-notifications.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ Azure AD Identity Protection sends two types of automated notification emails to
2424

2525
This article provides you with an overview of both notification emails.
2626

27+
>[!NOTE]
28+
>Email notifications are available only in the public cloud and are not currently available in the US Government cloud.
29+
2730
## Users at risk detected email
2831

2932
In response to a detected account at risk, Azure AD Identity Protection generates an email alert with **Users at risk detected** as subject. The email includes a link to the **[Users flagged for risk](../reports-monitoring/concept-user-at-risk.md)** report. As a best practice, you should immediately investigate the users at risk.

articles/active-directory/saas-apps/workday-inbound-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ In this section, you will configure how user data flows from Workday to Active D
573573
| **Fax** | facsimileTelephoneNumber | | Create + update |
574574
| **Mobile** | mobile | | Create + update |
575575
| **LocalReference** | preferredLanguage | | Create + update |
576-
| **Switch(\[Municipality\], "OU=Standard Users,OU=Users,OU=Default,OU=Locations,DC=contoso,DC=com", "Dallas", "OU=Standard Users,OU=Users,OU=Dallas,OU=Locations,DC=contoso,DC=com", "Austin", "OU=Standard Users,OU=Users,OU=Austin,OU=Locations,DC=contoso,DC=com", "Seattle", "OU=Standard Users,OU=Users,OU=Seattle,OU=Locations,DC=contoso,DC=com", London", "OU=Standard Users,OU=Users,OU=London,OU=Locations,DC=contoso,DC=com")** | parentDistinguishedName | | Create + update |
576+
| **Switch(\[Municipality\], "OU=Standard Users,OU=Users,OU=Default,OU=Locations,DC=contoso,DC=com", "Dallas", "OU=Standard Users,OU=Users,OU=Dallas,OU=Locations,DC=contoso,DC=com", "Austin", "OU=Standard Users,OU=Users,OU=Austin,OU=Locations,DC=contoso,DC=com", "Seattle", "OU=Standard Users,OU=Users,OU=Seattle,OU=Locations,DC=contoso,DC=com", "London", "OU=Standard Users,OU=Users,OU=London,OU=Locations,DC=contoso,DC=com")** | parentDistinguishedName | | Create + update |
577577

578578
Once your attribute mapping configuration is complete, you can now [enable and launch the user provisioning service](#enable-and-launch-user-provisioning).
579579

articles/active-directory/saas-apps/workplacebyfacebook-provisioning-tutorial.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ If your Workplace integration is in quarantine, you will need to supply a valid
4040

4141
https://portal.azure.com/?Microsoft_AAD_IAM_userProvisioningEnableCredentialsOverride=true
4242

43-
43+
#### How can I tell if my application has been migrated?
44+
When your application is migrated, the banner in the authorization section about upcomming changes will be removed and the secret token field will be replaced with a blue authorize button.
45+
4446
#### The admin credentials section is greyed out on my application and I can't save. Why?
4547
We have locked down the admin credentials section for existing Workplace customers. When your tenant has been migrated to the new Workplace application you will be able to update the admin credentials section again. If you can't wait, you can use the URL above to edit your application.
4648

articles/aks/kubernetes-walkthrough-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ If you don't have an Azure subscription, create a [free account](https://azure.m
2525

2626
## Sign in to Azure
2727

28-
Sign in to the Azure portal at https://portal.azure.com.
28+
Sign in to the Azure portal at [https://portal.azure.com](https://portal.azure.com).
2929

3030
## Create an AKS cluster
3131

articles/aks/use-managed-identity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ You must have the following resources installed:
4040
To install the aks-preview 0.4.14 extension or later, use the following Azure CLI commands:
4141

4242
```azurecli
43-
az extension update --name aks-preview
43+
az extension add --name aks-preview
4444
az extension list
4545
```
4646

articles/automation/automation-windows-hrw-install.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ ms.topic: conceptual
1010

1111
You can use the Hybrid Runbook Worker feature of Azure Automation to run runbooks directly on the computer that's hosting the role and against resources in the environment to manage those local resources. Runbooks are stored and managed in Azure Automation and then delivered to one or more designated computers. This article describes how to install the Hybrid Runbook Worker on a Windows machine.
1212

13-
> [!NOTE]
14-
This article has been updated to use the new Azure PowerShell Az module. You can still use the AzureRM module, which will continue to receive bug fixes until at least December 2020. To learn more about the new Az module and AzureRM compatibility, see [Introducing the new Azure PowerShell Az module](https://docs.microsoft.com/powershell/azure/new-azureps-module-az?view=azps-3.3.0). For Az module installation instructions, see [Install the Azure PowerShell module](https://docs.microsoft.com/powershell/azure/install-az-ps?view=azps-3.4.0).
13+
[!INCLUDE [azure-monitor-log-analytics-rebrand](../../includes/azure-monitor-log-analytics-rebrand.md)]
1514

1615
## Installing the Windows Hybrid Runbook Worker
1716

articles/azure-functions/disable-function.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ This article explains how to disable a function in Azure Functions. To *disable*
1111

1212
The recommended way to disable a function is by using an app setting in the format `AzureWebJobs.<FUNCTION_NAME>.Disabled`. You can create and modify this application setting in a number of ways, including by using the [Azure CLI](/cli/azure/) and from your function's **Manage** tab in the [Azure portal](https://portal.azure.com).
1313

14+
> [NOTE]
15+
> When you disable an HTTP triggered function by using the methods described in this article, the endpoint may still by accessible when running on your local computer.
16+
1417
## Use the Azure CLI
1518

1619
In the Azure CLI, you use the [`az functionapp config appsettings set`](/cli/azure/functionapp/config/appsettings#az-functionapp-config-appsettings-set) command to create and modify the app setting. The following command disables a function named `QueueTrigger` by creating an app setting named `AzureWebJobs.QueueTrigger.Disabled` set it to `true`.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ To provide a higher level of security, you can restrict a number of Azure servic
106106

107107
### Restricting your storage account to a virtual network
108108

109-
When you create a function app, you must create or link to a general-purpose Azure Storage account that supports Blob, Queue, and Table storage. You can't currently use any virtual network restrictions on this account. If you configure a virtual network service endpoint on the storage account you're using for your function app, that will break your app.This functionality is currently available using the Premium Plan and a virtual network integration.
109+
When you create a function app, you must create or link to a general-purpose Azure Storage account that supports Blob, Queue, and Table storage. You can't currently use any virtual network restrictions on this account. If you configure a virtual network service endpoint on the storage account you're using for your function app, that will break your app.
110110

111111
[Learn more about storage account requirements.](./functions-create-function-app-portal.md#storage-account-requirements)
112112

0 commit comments

Comments
 (0)