Skip to content

Commit cfad1e4

Browse files
authored
Merge pull request #222684 from MicrosoftDocs/main
12/30 PM Publish
2 parents 02480bf + eff2c84 commit cfad1e4

28 files changed

+200
-164
lines changed

articles/active-directory-b2c/TOC.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@
7070
items:
7171
- name: Global identity solutions
7272
href: azure-ad-b2c-global-identity-solutions.md
73-
- name: Funnel-based design considerations
73+
- name: Funnel-based design
7474
href: azure-ad-b2c-global-identity-funnel-based-design.md
75-
- name: Region-based design considerations
75+
- name: Region-based design
7676
href: azure-ad-b2c-global-identity-region-based-design.md
7777
- name: Funnel-based proof of concept
7878
href: azure-ad-b2c-global-identity-proof-of-concept-funnel.md
79-
- name: Regional-based proof of concept
79+
- name: Region-based proof of concept
8080
href: azure-ad-b2c-global-identity-proof-of-concept-regional.md
8181
- name: Azure AD B2C best practices
8282
href: best-practices.md

articles/active-directory-b2c/azure-ad-b2c-global-identity-funnel-based-design.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ The designs account for:
2222

2323
* Local Account sign up and sign in
2424
* Federated account sign up and sign in
25-
* Authenticating local accounts for users signing in from outside their registered region, supported by cross tenant API based authentication.
25+
* Authenticating local accounts for users signing in from outside their registered region, supported by cross tenant API based authentication
2626
* Authenticating federated accounts for users signing in from outside their registered region, supported by cross tenant API based look up
2727
* Prevents sign up from multiple different regions
2828
* Applications in each region have a single endpoint to connect with
2929

3030
## Local account sign-in use cases
3131

32-
The following use cases are typical in a global Azure AD B2C environment. The local account use cases also cover accounts where the user travels. Each provides a diagram and workflow steps for each use case.
32+
The following use cases are typical in a global Azure AD B2C environment. The local account use cases also cover accounts where the user travels. We provide a diagram and workflow steps for each use case.
3333

3434
### Local user sign-up
3535

@@ -99,8 +99,7 @@ This use case demonstrates how a user can travel across regions and maintain the
9999

100100
1. The EMEA Azure AD B2C tenant performs an Azure AD ROPC flow against the NOAM Azure AD B2C tenant to verify credentials.
101101
>[!NOTE]
102-
>This call will also fetch a token for the user to perform a Graph API call.
103-
The EMEA Azure AD B2C tenant performs a Graph API call to the NOAM Azure AD B2C tenant to fetch the user's profile. This call is authenticated by the access token for Graph API acquired in the last step.
102+
>This call will also fetch a token for the user to perform a Graph API call. The EMEA Azure AD B2C tenant performs a Graph API call to the NOAM Azure AD B2C tenant to fetch the user's profile. This call is authenticated by the access token for Graph API acquired in the last step.
104103
105104
1. The regional tenant issues a token back to the funnel tenant.
106105

@@ -312,6 +311,6 @@ This use case demonstrates how non-local users are able to perform account linki
312311

313312
- [Build a global identity solution with region-based approach](azure-ad-b2c-global-identity-region-based-design.md)
314313

315-
- [Azure AD B2C global identity proof of concept regional-based configuration](azure-ad-b2c-global-identity-proof-of-concept-regional.md)
314+
- [Azure AD B2C global identity proof of concept region-based configuration](azure-ad-b2c-global-identity-proof-of-concept-regional.md)
316315

317316
- [Azure AD B2C global identity proof of concept funnel-based configuration](azure-ad-b2c-global-identity-proof-of-concept-funnel.md)

articles/active-directory-b2c/azure-ad-b2c-global-identity-proof-of-concept-regional.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Azure Active Directory B2C global identity framework proof of concept for regional based configuration
2+
title: Azure Active Directory B2C global identity framework proof of concept for region-based configuration
33
description: Learn how to create a proof of concept regional based approach for Azure AD B2C to provide customer identity and access management for global customers.
44
services: active-directory-b2c
55
author: gargi-sinha
@@ -13,11 +13,11 @@ ms.author: gasinh
1313
ms.subservice: B2C
1414
---
1515

16-
# Azure Active Directory B2C global identity framework proof of concept regional based configuration
16+
# Azure Active Directory B2C global identity framework proof of concept for region-based configuration
1717

18-
The following section describes how to create proof of concept implementations for regional-based orchestration. The completed Azure Active Directory B2C (Azure AD B2C) custom policies can be found [here](https://github.com/azure-ad-b2c/samples/tree/master/policies/global-architecture-model/region-based-approach).
18+
The following section describes how to create proof of concept implementations for region-based orchestration. The completed Azure Active Directory B2C (Azure AD B2C) custom policies can be found [here](https://github.com/azure-ad-b2c/samples/tree/master/policies/global-architecture-model/region-based-approach).
1919

20-
## Regional-based approach
20+
## Region-based approach
2121

2222
Each regional Azure AD B2C tenant will require an Azure AD B2C Custom policy, which contains the following capabilities:
2323

articles/active-directory-b2c/azure-ad-b2c-global-identity-region-based-design.md

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,7 @@ This use case demonstrates how a user can reset their password when they are wit
108108

109109
![Screenshot shows the local user forgot password flow.](media/azure-ad-b2c-global-identity-regional-design/local-user-forgot-password.png)
110110

111-
1. User from EMEA attempts to sign in at **myapp.fr**.
112-
113-
If the user isn't being sent to their local hostname, the traffic manager will enforce a redirect.
111+
1. User from EMEA attempts to sign in at **myapp.fr**. If the user isn't being sent to their local hostname, the traffic manager will enforce a redirect.
114112

115113
1. The user arrives at the EMEA Azure AD B2C tenant and selects **forgot password**. The user enters and verifies their email.
116114

@@ -128,9 +126,7 @@ This use case demonstrates how a user can reset their password when they're trav
128126

129127
![Screenshot shows the traveling user forgot password flow.](media/azure-ad-b2c-global-identity-regional-design/traveling-user-forgot-password.png)
130128

131-
1. User from NOAM attempts to sign in at **myapp.fr**, since they are on holiday in France.
132-
133-
If the user isn't being sent to their local hostname, the traffic manager will enforce a redirect.
129+
1. User from NOAM attempts to sign in at **myapp.fr**, since they are on holiday in France. If the user isn't being sent to their local hostname, the traffic manager will enforce a redirect.
134130

135131
1. The user arrives at the EMEA Azure AD B2C tenant and selects **forgot password**. The user enters and verifies their email.
136132

@@ -204,9 +200,7 @@ This use case demonstrates how a user from their local region signs into the ser
204200

205201
![Screenshot shows the sign in flow.](media/azure-ad-b2c-global-identity-regional-design/social-account-sign-in.png)
206202

207-
1. User from EMEA attempts to sign in at **myapp.fr**.
208-
209-
If the user isn't being sent to their local hostname, the traffic manager will enforce a redirect.
203+
1. User from EMEA attempts to sign in at **myapp.fr**. If the user isn't being sent to their local hostname, the traffic manager will enforce a redirect.
210204

211205
1. User lands at the EMEA tenant.
212206

@@ -222,15 +216,13 @@ This scenario demonstrates how a user located away from the region in which they
222216

223217
![Screenshot shows the sign in for traveling user flow.](media/azure-ad-b2c-global-identity-regional-design/traveling-user-social-account-sign-in.png)
224218

225-
1. User from NOAM attempts to sign in at **myapp.fr**.
226-
227-
If the user isn't being sent to their local hostname, the traffic manager will enforce a redirect.
219+
1. User from NOAM attempts to sign in at **myapp.fr**. If the user isn't being sent to their local hostname, the traffic manager will enforce a redirect.
228220

229221
1. User lands at the EMEA tenant.
230222

231223
1. User selects to sign in with a federated identity provider.
232224

233-
>[!NOTE]
225+
>[!NOTE]
234226
>Use the same App Id from the App Registration at the Social IdP across all Azure AD B2C regional tenants. This ensures that the ID coming back from the Social IdP is always the same.
235227
236228
1. Perform a lookup into the global lookup table and determine the user's federated ID is registered in NOAM.
@@ -245,9 +237,7 @@ This scenario demonstrates how users will be able to perform account linking whe
245237

246238
![Screenshot shows the merge/link accounts flow.](media/azure-ad-b2c-global-identity-regional-design/merge-link-account.png)
247239

248-
1. User from EMEA attempts to sign in at **myapp.fr**.
249-
250-
If the user isn't being sent to their local hostname, the traffic manager will enforce a redirect.
240+
1. User from EMEA attempts to sign in at **myapp.fr**. If the user isn't being sent to their local hostname, the traffic manager will enforce a redirect.
251241

252242
1. User lands at the EMEA tenant.
253243

@@ -269,15 +259,13 @@ This scenario demonstrates how users will be able to perform account linking wh
269259

270260
![Screenshot shows the traveling user merge/link accounts flow.](media/azure-ad-b2c-global-identity-regional-design/traveling-user-merge-link-account.png)
271261

272-
1. User from NOAM attempts to sign in at **myapp.fr**.
273-
274-
If the user isn't being sent to their local hostname, the traffic manager will enforce a redirect.
262+
1. User from NOAM attempts to sign in at **myapp.fr**. If the user isn't being sent to their local hostname, the traffic manager will enforce a redirect.
275263

276264
1. User lands at the EMEA tenant.
277265

278266
1. User selects to sign in with a federated identity provider/social IdP.
279267

280-
1. A lookup is performed into the global lookup table for the ID returned from the federated IdP.
268+
1. A lookup is performed into the global lookup table for the ID returned from the federated IdP.
281269

282270
1. Where the ID doesn't exist, and the email from the federated IdP exists in another region, it's a traveling user account linking scenario.
283271

articles/azure-monitor/app/asp-net-core.md

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ The [Application Insights SDK for ASP.NET Core](https://nuget.org/packages/Micro
4444
* **IDE**: Visual Studio, Visual Studio Code, or command line
4545

4646
> [!NOTE]
47-
> - ASP.NET Core 6.0 requires [Application Insights 2.19.0](https://www.nuget.org/packages/Microsoft.ApplicationInsights.AspNetCore/2.18.0) or later
48-
> - ASP.NET Core 3.1 requires [Application Insights 2.8.0](https://www.nuget.org/packages/Microsoft.ApplicationInsights.AspNetCore/2.8.0) or later
47+
> - ASP.NET Core 6.0 requires [Application Insights 2.19.0](https://www.nuget.org/packages/Microsoft.ApplicationInsights.AspNetCore/2.19.0) or later
4948
5049
## Prerequisites
5150

@@ -86,7 +85,7 @@ For Visual Studio for Mac, use the [manual guidance](#enable-application-insight
8685

8786
2. Add `AddApplicationInsightsTelemetry()` to your `startup.cs` or `program.cs` class (depending on your .NET Core version)
8887

89-
### [ASP.NET Core 6.0](#tab/netcore6)
88+
### [ASP.NET Core 6 and later](#tab/netcorenew)
9089

9190
Add `builder.Services.AddApplicationInsightsTelemetry();` after the `WebApplication.CreateBuilder()` method in your `Program` class, as in this example:
9291

@@ -103,7 +102,7 @@ For Visual Studio for Mac, use the [manual guidance](#enable-application-insight
103102
var app = builder.Build();
104103
```
105104

106-
### [ASP.NET Core 3.1](#tab/netcore3)
105+
### [ASP.NET Core 5 and earlier](#tab/netcoreold)
107106

108107
Add `services.AddApplicationInsightsTelemetry();` to the `ConfigureServices()` method in your `Startup` class, as in this example:
109108

@@ -238,7 +237,7 @@ You can customize the Application Insights SDK for ASP.NET Core to change the de
238237

239238
You can modify a few common settings by passing `ApplicationInsightsServiceOptions` to `AddApplicationInsightsTelemetry`, as in this example:
240239

241-
### [ASP.NET Core 6.0](#tab/netcore6)
240+
### [ASP.NET Core 6 and later](#tab/netcorenew)
242241

243242
```csharp
244243
var builder = WebApplication.CreateBuilder(args);
@@ -255,7 +254,7 @@ builder.Services.AddApplicationInsightsTelemetry(aiOptions);
255254
var app = builder.Build();
256255
```
257256

258-
### [ASP.NET Core 3.1](#tab/netcore3)
257+
### [ASP.NET Core 5 and earlier](#tab/netcoreold)
259258

260259
```csharp
261260
public void ConfigureServices(IServiceCollection services)
@@ -320,7 +319,7 @@ When you want to enrich telemetry with additional information, use [telemetry in
320319

321320
Add any new `TelemetryInitializer` to the `DependencyInjection` container as shown in the following code. The SDK automatically picks up any `TelemetryInitializer` that's added to the `DependencyInjection` container.
322321

323-
### [ASP.NET Core 6.0](#tab/netcore6)
322+
### [ASP.NET Core 6 and later](#tab/netcorenew)
324323

325324
```csharp
326325
var builder = WebApplication.CreateBuilder(args);
@@ -333,7 +332,7 @@ var app = builder.Build();
333332
> [!NOTE]
334333
> `builder.Services.AddSingleton<ITelemetryInitializer, MyCustomTelemetryInitializer>();` works for simple initializers. For others, the following is required: `builder.Services.AddSingleton(new MyCustomTelemetryInitializer() { fieldName = "myfieldName" });`
335334
336-
### [ASP.NET Core 3.1](#tab/netcore3)
335+
### [ASP.NET Core 5 and earlier](#tab/netcoreold)
337336

338337
```csharp
339338
public void ConfigureServices(IServiceCollection services)
@@ -351,7 +350,7 @@ public void ConfigureServices(IServiceCollection services)
351350

352351
By default, telemetry initializers are present. To remove all or specific telemetry initializers, use the following sample code *after* calling `AddApplicationInsightsTelemetry()`.
353352

354-
### [ASP.NET Core 6.0](#tab/netcore6)
353+
### [ASP.NET Core 6 and later](#tab/netcorenew)
355354

356355
```csharp
357356
var builder = WebApplication.CreateBuilder(args);
@@ -373,7 +372,7 @@ builder.Services.RemoveAll(typeof(ITelemetryInitializer));
373372
var app = builder.Build();
374373
```
375374

376-
### [ASP.NET Core 3.1](#tab/netcore3)
375+
### [ASP.NET Core 5 and earlier](#tab/netcoreold)
377376

378377
```csharp
379378
public void ConfigureServices(IServiceCollection services)
@@ -400,7 +399,7 @@ public void ConfigureServices(IServiceCollection services)
400399

401400
You can add custom telemetry processors to `TelemetryConfiguration` by using the extension method `AddApplicationInsightsTelemetryProcessor` on `IServiceCollection`. You use telemetry processors in [advanced filtering scenarios](./api-filtering-sampling.md#itelemetryprocessor-and-itelemetryinitializer). Use the following example.
402401

403-
### [ASP.NET Core 6.0](#tab/netcore6)
402+
### [ASP.NET Core 6 and later](#tab/netcorenew)
404403

405404
```csharp
406405
var builder = WebApplication.CreateBuilder(args);
@@ -415,7 +414,7 @@ builder.Services.AddApplicationInsightsTelemetryProcessor<MySecondCustomTelemetr
415414
var app = builder.Build();
416415
```
417416

418-
### [ASP.NET Core 3.1](#tab/netcore3)
417+
### [ASP.NET Core 5 and earlier](#tab/netcoreold)
419418

420419
```csharp
421420
public void ConfigureServices(IServiceCollection services)
@@ -447,7 +446,7 @@ By default, the following automatic-collection modules are enabled. These module
447446

448447
To configure any default `TelemetryModule`, use the extension method `ConfigureTelemetryModule<T>` on `IServiceCollection`, as shown in the following example.
449448

450-
### [ASP.NET Core 6.0](#tab/netcore6)
449+
### [ASP.NET Core 6 and later](#tab/netcorenew)
451450

452451
```csharp
453452
using Microsoft.ApplicationInsights.DependencyCollector;
@@ -481,7 +480,7 @@ if (performanceCounterService != null)
481480
var app = builder.Build();
482481
```
483482

484-
### [ASP.NET Core 3.1](#tab/netcore3)
483+
### [ASP.NET Core 5 and earlier](#tab/netcoreold)
485484

486485
```csharp
487486
using Microsoft.ApplicationInsights.DependencyCollector;
@@ -524,7 +523,7 @@ In versions 2.12.2 and later, [`ApplicationInsightsServiceOptions`](#using-appli
524523

525524
The default [telemetry channel](./telemetry-channels.md) is `ServerTelemetryChannel`. The following example shows how to override it.
526525

527-
### [ASP.NET Core 6.0](#tab/netcore6)
526+
### [ASP.NET Core 6 and later](#tab/netcorenew)
528527

529528
```csharp
530529
using Microsoft.ApplicationInsights.Channel;
@@ -540,7 +539,7 @@ builder.Services.AddApplicationInsightsTelemetry();
540539
var app = builder.Build();
541540
```
542541

543-
### [ASP.NET Core 3.1](#tab/netcore3)
542+
### [ASP.NET Core 5 and earlier](#tab/netcoreold)
544543

545544
```csharp
546545
using Microsoft.ApplicationInsights.Channel;
@@ -564,7 +563,7 @@ public void ConfigureServices(IServiceCollection services)
564563

565564
If you want to disable telemetry conditionally and dynamically, you can resolve the `TelemetryConfiguration` instance with an ASP.NET Core dependency injection container anywhere in your code and set the `DisableTelemetry` flag on it.
566565

567-
### [ASP.NET Core 6.0](#tab/netcore6)
566+
### [ASP.NET Core 6 and later](#tab/netcorenew)
568567

569568
```csharp
570569
var builder = WebApplication.CreateBuilder(args);
@@ -577,7 +576,7 @@ builder.Services.Configure<TelemetryConfiguration>(x => x.DisableTelemetry = tru
577576
var app = builder.Build();
578577
```
579578

580-
### [ASP.NET Core 3.1](#tab/netcore3)
579+
### [ASP.NET Core 5 and earlier](#tab/netcoreold)
581580

582581
```csharp
583582
public void ConfigureServices(IServiceCollection services)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Create a new Azure Application Insights resource | Microsoft Docs
33
description: Manually set up Application Insights monitoring for a new live application.
44
ms.topic: conceptual
5-
ms.date: 11/15/2022
5+
ms.date: 01/28/2023
66
ms.custom: devx-track-azurepowershell, devx-track-azurecli
77
ms.reviewer: dalek
88
---

articles/azure-monitor/toc.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -728,8 +728,6 @@ items:
728728
href: app/opentelemetry-enable.md?tabs=python
729729
- name: FAQ
730730
href: /azure/azure-monitor/faq#opentelemetry
731-
- name: Create a resource (classic)
732-
href: app/create-new-resource.md
733731
- name: Create a resource (workspace-based)
734732
href: app/create-workspace-resource.md
735733
- name: Migrate to a workspace-based resource
@@ -1664,7 +1662,9 @@ items:
16641662
- name: Key Vault Analytics (deprecated)
16651663
href: insights/azure-key-vault-deprecated.md
16661664
- name: Application Insights Java 2.x
1667-
href: ./app/deprecated-java-2x.md
1665+
href: ./app/deprecated-java-2x.md
1666+
- name: Create a new App Insights resource (classic)
1667+
href: app/create-new-resource.md
16681668
- name: Classic autoscale & metrics API
16691669
href: ./essentials/classic-api-retirement-metrics-autoscale.md
16701670
- name: NULL values in exported metrics

0 commit comments

Comments
 (0)