Skip to content

Commit d176a18

Browse files
committed
Merge branch 'main' into release-ga-load-testing
2 parents 47ed063 + 401a74c commit d176a18

File tree

311 files changed

+6353
-3073
lines changed

Some content is hidden

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

311 files changed

+6353
-3073
lines changed

.openpublishing.redirection.azure-monitor.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4174,7 +4174,7 @@
41744174
},
41754175
{
41764176
"source_path_from_root": "/articles/azure-monitor/platform/autoscale-resource-log-schema.md",
4177-
"redirect_url": "/azure/azure-monitor/autoscale/autoscale-resource-log-schema",
4177+
"redirect_url": "/azure/azure-monitor/autoscale/autoscale-diagnostics",
41784178
"redirect_document_id": false
41794179
},
41804180
{
@@ -5681,6 +5681,11 @@
56815681
"source_path_from_root": "/articles/azure-monitor/app/windows-desktop.md",
56825682
"redirect_url": "https://github.com/Microsoft/appcenter",
56835683
"redirect_document_id": false
5684+
},
5685+
{
5686+
"source_path_from_root": "/articles/azure-monitor/autoscale/autoscale-resource-log-schema.md",
5687+
"redirect_url": "/azure/azure-monitor/autoscale/autoscale-diagnostics",
5688+
"redirect_document_id": false
56845689
}
56855690
]
56865691
}

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.workload: identity
1111
ms.topic: how-to
1212
ms.author: kengaderdus
1313
ms.subservice: B2C
14-
ms.date: 07/12/2022
14+
ms.date: 01/31/2023
1515
---
1616

1717
# Monitor Azure AD B2C with Azure Monitor
@@ -66,7 +66,7 @@ In summary, you'll use Azure Lighthouse to allow a user or group in your Azure A
6666
First, create, or choose a resource group that contains the destination Log Analytics workspace that will receive data from Azure AD B2C. You'll specify the resource group name when you deploy the Azure Resource Manager template.
6767

6868
1. Sign in to the [Azure portal](https://portal.azure.com).
69-
1. Make sure you're using the directory that contains your Azure AD tenant. Select the **Directories + subscriptions** icon in the portal toolbar.
69+
1. Make sure you're using the directory that contains your *Azure AD* tenant. Select the **Directories + subscriptions** icon in the portal toolbar.
7070
1. On the **Portal settings | Directories + subscriptions** page, find your Azure AD directory in the **Directory name** list, and then select **Switch**.
7171
1. [Create a resource group](../azure-resource-manager/management/manage-resource-groups-portal.md#create-resource-groups) or choose an existing one. This example uses a resource group named _azure-ad-b2c-monitor_.
7272

@@ -75,7 +75,7 @@ First, create, or choose a resource group that contains the destination Log Anal
7575
A **Log Analytics workspace** is a unique environment for Azure Monitor log data. You'll use this Log Analytics workspace to collect data from Azure AD B2C [audit logs](view-audit-logs.md), and then visualize it with queries and workbooks, or create alerts.
7676

7777
1. Sign in to the [Azure portal](https://portal.azure.com).
78-
1. Make sure you're using the directory that contains your Azure AD tenant. Select the **Directories + subscriptions** icon in the portal toolbar.
78+
1. Make sure you're using the directory that contains your *Azure AD* tenant. Select the **Directories + subscriptions** icon in the portal toolbar.
7979
1. On the **Portal settings | Directories + subscriptions** page, find your Azure AD directory in the **Directory name** list, and then select **Switch**.
8080
1. [Create a Log Analytics workspace](../azure-monitor/logs/quick-create-workspace.md). This example uses a Log Analytics workspace named _AzureAdB2C_, in a resource group named _azure-ad-b2c-monitor_.
8181

@@ -88,7 +88,7 @@ In this step, you choose your Azure AD B2C tenant as a **service provider**. You
8888
First, get the **Tenant ID** of your Azure AD B2C directory (also known as the directory ID).
8989

9090
1. Sign in to the [Azure portal](https://portal.azure.com/).
91-
1. Make sure you're using the directory that contains your Azure AD B2C tenant. Select the **Directories + subscriptions** icon in the portal toolbar.
91+
1. Make sure you're using the directory that contains your *Azure AD B2C* tenant. Select the **Directories + subscriptions** icon in the portal toolbar.
9292
1. On the **Portal settings | Directories + subscriptions** page, find your Azure AD B2C directory in the **Directory name** list, and then select **Switch**.
9393
1. Select **Azure Active Directory**, select **Overview**.
9494
1. Record the **Tenant ID**.
@@ -110,7 +110,7 @@ To make management easier, we recommend using Azure AD user _groups_ for each ro
110110
To create the custom authorization and delegation in Azure Lighthouse, we use an Azure Resource Manager template. This template grants Azure AD B2C access to the Azure AD resource group, which you created earlier, for example, _azure-ad-b2c-monitor_. Deploy the template from the GitHub sample by using the **Deploy to Azure** button, which opens the Azure portal and lets you configure and deploy the template directly in the portal. For these steps, make sure you're signed in to your Azure AD tenant (not the Azure AD B2C tenant).
111111

112112
1. Sign in to the [Azure portal](https://portal.azure.com).
113-
1. Make sure you're using the directory that contains your Azure AD tenant. Select the **Directories + subscriptions** icon in the portal toolbar.
113+
1. Make sure you're using the directory that contains your *Azure AD tenant*. Select the **Directories + subscriptions** icon in the portal toolbar.
114114
1. On the **Portal settings | Directories + subscriptions** page, find your Azure AD directory in the **Directory name** list, and then select **Switch**.
115115
1. Use the **Deploy to Azure** button to open the Azure portal and deploy the template directly in the portal. For more information, see [create an Azure Resource Manager template](../lighthouse/how-to/onboard-customer.md#create-an-azure-resource-manager-template).
116116

@@ -172,7 +172,7 @@ You're ready to [create diagnostic settings](../active-directory/reports-monitor
172172

173173
To configure monitoring settings for Azure AD B2C activity logs:
174174

175-
1. Sign in to the [Azure portal](https://portal.azure.com/) with your Azure AD B2C administrative account. This account must be a member of the security group you specified in the [Select a security group](#32-select-a-security-group) step.
175+
1. Sign in to the [Azure portal](https://portal.azure.com/) with your *Azure AD B2C* administrative account. This account must be a member of the security group you specified in the [Select a security group](#32-select-a-security-group) step.
176176
1. Make sure you're using the directory that contains your Azure AD B2C tenant:
177177
1. Select the **Directories + subscriptions** icon in the portal toolbar.
178178
2. On the **Portal settings | Directories + subscriptions** page, find your Azure AD B2C directory in the **Directory name** list, and then select **Switch**.
@@ -207,6 +207,8 @@ Now you can configure your Log Analytics workspace to visualize your data and co
207207

208208
Log queries help you to fully use the value of the data collected in Azure Monitor Logs. A powerful query language allows you to join data from multiple tables, aggregate large sets of data, and perform complex operations with minimal code. Virtually any question can be answered and analysis performed as long as the supporting data has been collected, and you understand how to construct the right query. For more information, see [Get started with log queries in Azure Monitor](../azure-monitor/logs/get-started-queries.md).
209209

210+
1. Sign in to the [Azure portal](https://portal.azure.com).
211+
1. Make sure you're using the directory that contains your *Azure AD* tenant. Select the **Directories + subscriptions** icon in the portal toolbar.
210212
1. From **Log Analytics workspace** window, select **Logs**
211213
1. In the query editor, paste the following [Kusto Query Language](/azure/data-explorer/kusto/query/) query. This query shows policy usage by operation over the past x days. The default duration is set to 90 days (90d). Notice that the query is focused only on the operation where a token/code is issued by policy.
212214

@@ -256,6 +258,8 @@ Workbooks provide a flexible canvas for data analysis and the creation of rich v
256258

257259
Follow the instructions below to create a new workbook using a JSON Gallery Template. This workbook provides a **User Insights** and **Authentication** dashboard for Azure AD B2C tenant.
258260

261+
1. Sign in to the [Azure portal](https://portal.azure.com).
262+
1. Make sure you're using the directory that contains your *Azure AD* tenant. Select the **Directories + subscriptions** icon in the portal toolbar.
259263
1. From the **Log Analytics workspace** window, select **Workbooks**.
260264
1. From the toolbar, select **+ New** option to create a new workbook.
261265
1. On the **New workbook** page, select the **Advanced Editor** using the **</>** option on the toolbar.
@@ -286,6 +290,8 @@ Alerts are created by alert rules in Azure Monitor and can automatically run sav
286290

287291
Use the following instructions to create a new Azure Alert, which will send an [email notification](../azure-monitor/alerts/action-groups.md#configure-notifications) whenever there's a 25% drop in the **Total Requests** compared to previous period. Alert will run every 5 minutes and look for the drop in the last hour compared to the hour before it. The alerts are created using Kusto query language.
288292

293+
1. Sign in to the [Azure portal](https://portal.azure.com).
294+
1. Make sure you're using the directory that contains your *Azure AD* tenant. Select the **Directories + subscriptions** icon in the portal toolbar.
289295
1. From **Log Analytics workspace**, select **Logs**.
290296
1. Create a new **Kusto query** by using the query below.
291297

articles/active-directory/conditional-access/howto-conditional-access-policy-authentication-strength-external.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,19 @@ In external user scenarios, the MFA authentication methods that a resource tenan
3030

3131
> [!NOTE]
3232
> Currently, you can only apply authentication strength policies to external users who authenticate with Azure AD. For email one-time passcode, SAML/WS-Fed, and Google federation users, use the [MFA grant control](concept-conditional-access-grant.md#require-multi-factor-authentication) to require MFA.
33+
3334
## Configure cross-tenant access settings to trust MFA
3435

3536
Authentication strength policies work together with [MFA trust settings](../external-identities/cross-tenant-access-settings-b2b-collaboration.md#to-change-inbound-trust-settings-for-mfa-and-device-claims) in your cross-tenant access settings to determine where and how the external user must perform MFA. An Azure AD user first authenticates with their own account in their home tenant. Then when this user tries to access your resource, Azure AD applies the authentication strength Conditional Access policy and checks to see if you've enabled MFA trust.
3637

37-
- **If MFA trust is enabled**, Azure AD checks the user's authentication session for a claim indicating that MFA has been fulfilled in the user's home tenant. The table below indicates which authentication methods are acceptable for MFA fulfillment when completed in an external user's home tenant.
38-
- **If MFA trust is disabled**, the resource tenant presents the user with a challenge to complete MFA in the resource tenant using an acceptable authentication method. The table below shows which authentication methods are acceptable for MFA fulfillment by an external user.
38+
- **If MFA trust is enabled**, Azure AD checks the user's authentication session for a claim indicating that MFA has been fulfilled in the user's home tenant.
39+
- **If MFA trust is disabled**, the resource tenant presents the user with a challenge to complete MFA in the resource tenant using an acceptable authentication method.
40+
41+
The authentication methods that external users can use to satisfy MFA requirements are different depending on whether the user is completing MFA in their home tenant or the resource tenant. See the table in [Conditional Access authentication strength](https://aka.ms/b2b-auth-strengths).
3942

4043
> [!IMPORTANT]
4144
> Before you create the Conditional Access policy, check your cross-tenant access settings to make sure your inbound MFA trust settings are configured as intended.
45+
4246
## Choose an authentication strength
4347

4448
Determine if one of the built-in authentication strengths will work for your scenario or if you'll need to create a custom authentication strength.
@@ -48,9 +52,6 @@ Determine if one of the built-in authentication strengths will work for your sce
4852
1. Review the built-in authentication strengths to see if one of them meets your requirements.
4953
1. If you want to enforce a different set of authentication methods, [create a custom authentication strength](https://aka.ms/b2b-auth-strengths).
5054

51-
> [!NOTE]
52-
> The authentication methods that external users can use to satisfy MFA requirements are different depending on whether the user is completing MFA in their home tenant or the resource tenant. See the table in [Conditional Access authentication strength](https://aka.ms/b2b-auth-strengths).
53-
5455
## Create a Conditional Access policy
5556

5657
Use the following steps to create a Conditional Access policy that applies an authentication strength to external users.

articles/active-directory/develop/v2-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Choose your preferred [application scenario](authentication-flows-app-scenarios.
5151

5252
As you work with the Microsoft identity platform to integrate authentication and authorization in your apps, you can refer to this image that outlines the most common app scenarios and their identity components. Select the image to view it full-size.
5353

54-
[![Metro map showing several application scenarios in Microsoft identity platform](./media/v2-overview/application-scenarios-identity-platform.png)](./media/v2-overview/application-scenarios-identity-platform.svg#lightbox)
54+
[![Metro map showing several application scenarios in Microsoft identity platform](./media/v2-overview/application-scenarios-identity-platform.png)](./media/v2-overview/application-scenarios-identity-platform.png#lightbox)
5555

5656
## Learn authentication concepts
5757

articles/active-directory/fundamentals/how-to-customize-branding.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.workload: identity
1010
ms.subservice: fundamentals
1111
ms.topic: how-to
12-
ms.date: 11/21/2022
12+
ms.date: 01/31/2023
1313
ms.author: sarahlipsey
1414
ms.reviewer: almars
1515
ms.custom: "it-pro, seodec18, fasttrack-edit"
@@ -83,7 +83,7 @@ The sign-in experience process is grouped into sections. At the end of each sect
8383
- Choose one of two **Templates**: Full-screen or partial-screen background. The full-screen background could obscure your background image, so choose the partial-screen background if your background image is important.
8484
- The details of the **Header** and **Footer** options are set on the next two sections of the process.
8585

86-
- **Custom CSS**: Upload custom CSS to replace the Microsoft default style of the page. [Download the CSS template](https://download.microsoft.com/download/7/2/7/727f287a-125d-4368-a673-a785907ac5ab/custom-styles-template.css).
86+
- **Custom CSS**: Upload custom CSS to replace the Microsoft default style of the page. [Download the CSS template](https://download.microsoft.com/download/7/2/7/727f287a-125d-4368-a673-a785907ac5ab/custom-styles-template-013023.css).
8787

8888
## Header
8989

0 commit comments

Comments
 (0)