Skip to content

Commit 44627a6

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into vnet-encrypt
2 parents 6ad9ddf + 4d97c6e commit 44627a6

File tree

183 files changed

+275
-246
lines changed

Some content is hidden

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

183 files changed

+275
-246
lines changed

articles/active-directory-b2c/tokens-overview.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,16 @@ The following table lists the claims that you can expect in ID tokens and access
5555

5656
| Name | Claim | Example value | Description |
5757
| ---- | ----- | ------------- | ----------- |
58-
| Audience | `aud` | `90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6` | Identifies the intended recipient of the token. For Azure AD B2C, the audience is the application ID. Your application should validate this value and reject the token if it doesn't match. Audience is synonymous with resource. |
59-
| Issuer | `iss` |`https://<tenant-name>.b2clogin.com/775527ff-9a37-4307-8b3d-cc311f58d925/v2.0/` | Identifies the security token service (STS) that constructs and returns the token. It also identifies the directory in which the user was authenticated. Your application should validate the issuer claim to make sure that the token came from the appropriate endpoint. |
58+
| Audience | `aud` | `00001111-aaaa-2222-bbbb-3333cccc4444` | Identifies the intended recipient of the token. For Azure AD B2C, the audience is the application ID. Your application should validate this value and reject the token if it doesn't match. Audience is synonymous with resource. |
59+
| Issuer | `iss` |`https://<tenant-name>.b2clogin.com/aaaabbbb-0000-cccc-1111-dddd2222eeee/v2.0/` | Identifies the security token service (STS) that constructs and returns the token. It also identifies the directory in which the user was authenticated. Your application should validate the issuer claim to make sure that the token came from the appropriate endpoint. |
6060
| Issued at | `iat` | `1438535543` | The time at which the token was issued, represented in epoch time. |
6161
| Expiration time | `exp` | `1438539443` | The time at which the token becomes invalid, represented in epoch time. Your application should use this claim to verify the validity of the token lifetime. |
6262
| Not before | `nbf` | `1438535543` | The time at which the token becomes valid, represented in epoch time. This time is usually the same as the time the token was issued. Your application should use this claim to verify the validity of the token lifetime. |
6363
| Version | `ver` | `1.0` | The version of the ID token, as defined by Azure AD B2C. |
6464
| Code hash | `c_hash` | `SGCPtt01wxwfgnYZy2VJtQ` | A code hash included in an ID token only when the token is issued together with an OAuth 2.0 authorization code. A code hash can be used to validate the authenticity of an authorization code. For more information about how to perform this validation, see the [OpenID Connect specification](https://openid.net/specs/openid-connect-core-1_0.html). |
6565
| Access token hash | `at_hash` | `SGCPtt01wxwfgnYZy2VJtQ` | An access token hash included in an ID token only when the token is issued together with an OAuth 2.0 access token. An access token hash can be used to validate the authenticity of an access token. For more information about how to perform this validation, see the [OpenID Connect specification](https://openid.net/specs/openid-connect-core-1_0.html) |
6666
| Nonce | `nonce` | `12345` | A nonce is a strategy used to mitigate token replay attacks. Your application can specify a nonce in an authorization request by using the `nonce` query parameter. The value you provide in the request is emitted unmodified in the `nonce` claim of an ID token only. This claim allows your application to verify the value against the value specified on the request. Your application should perform this validation during the ID token validation process. |
67-
| Subject | `sub` | `884408e1-2918-4cz0-b12d-3aa027d7563b` | The principal about which the token asserts information, such as the user of an application. This value is immutable and can't be reassigned or reused. It can be used to perform authorization checks safely, such as when the token is used to access a resource. By default, the subject claim is populated with the object ID of the user in the directory. |
67+
| Subject | `sub` | `aaaaaaaa-0000-1111-2222-bbbbbbbbbbbb` | The principal about which the token asserts information, such as the user of an application. This value is immutable and can't be reassigned or reused. It can be used to perform authorization checks safely, such as when the token is used to access a resource. By default, the subject claim is populated with the object ID of the user in the directory. |
6868
| Authentication context class reference | `acr` | Not applicable | Used only with older policies. |
6969
| Trust framework policy | `tfp` | `b2c_1_signupsignin1` | The name of the policy that was used to acquire the ID token. |
7070
| Authentication time | `auth_time` | `1438535543` | The time at which a user last entered credentials, represented in epoch time. There's no discrimination between that authentication being a fresh sign-in, a single sign-on (SSO) session, or another sign-in type. The `auth_time` is the last time the application (or user) initiated an authentication attempt against Azure AD B2C. The method used to authenticate isn't differentiated. |
@@ -157,4 +157,3 @@ For a full list of validations your application should perform, refer to the [Op
157157
## Next steps
158158

159159
Learn more about how to [use access tokens](access-tokens.md).
160-

articles/active-directory-b2c/troubleshoot-with-application-insights.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ Here's a list of queries you can use to see the logs:
126126
| `traces | where timestamp > ago(1d)` | Get all of the logs generated by Azure AD B2C for the last day.|
127127
| `traces | where message contains "exception" | where timestamp > ago(2h)`| Get all of the logs with errors from the last two hours.|
128128
| `traces | where customDimensions.Tenant == "contoso.onmicrosoft.com" and customDimensions.UserJourney == "b2c_1a_signinandup"` | Get all of the logs generated by Azure AD B2C *contoso.onmicrosoft.com* tenant, and user journey is *b2c_1a_signinandup*. |
129-
| `traces | where customDimensions.CorrelationId == "00000000-0000-0000-0000-000000000000"`| Get all of the logs generated by Azure AD B2C for a correlation ID. Replace the correlation ID with your correlation ID. |
129+
| `traces | where customDimensions.CorrelationId == "aaaa0000-bb11-2222-33cc-444444dddddd"`| Get all of the logs generated by Azure AD B2C for a correlation ID. Replace the correlation ID with your correlation ID. |
130130

131131
The entries may be long. Export to CSV for a closer look.
132132

articles/active-directory-b2c/user-flow-custom-attributes.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Extension attributes can only be registered on an application object, even thoug
7878
1. In the left menu, select **Azure AD B2C**. Or, select **All services** and search for and select **Azure AD B2C**.
7979
1. Select **App registrations**, and then select **All applications**.
8080
1. Select the `b2c-extensions-app. Do not modify. Used by AADB2C for storing user data.` application.
81-
1. Copy the **Application ID**. Example: `11111111-1111-1111-1111-111111111111`.
81+
1. Copy the **Application ID**. Example: `00001111-aaaa-2222-bbbb-3333cccc4444`.
8282

8383
::: zone-end
8484

@@ -92,8 +92,8 @@ Extension attributes can only be registered on an application object, even thoug
9292
1. Select **App registrations**, and then select **All applications**.
9393
1. Select the **b2c-extensions-app. Do not modify. Used by AADB2C for storing user data.** application.
9494
1. Copy the following identifiers to your clipboard and save them:
95-
* **Application ID**. Example: `11111111-1111-1111-1111-111111111111`.
96-
* **Object ID**. Example: `22222222-2222-2222-2222-222222222222`.
95+
* **Application ID**. Example: `00001111-aaaa-2222-bbbb-3333cccc4444`.
96+
* **Object ID**. Example: `aaaaaaaa-0000-1111-2222-bbbbbbbbbbbb`.
9797

9898
## Modify your custom policy
9999

@@ -112,9 +112,9 @@ To enable custom attributes in your policy, provide **Application ID** and Appli
112112
<TechnicalProfiles>
113113
<TechnicalProfile Id="AAD-Common">
114114
<Metadata>
115-
<!--Insert b2c-extensions-app application ID here, for example: 11111111-1111-1111-1111-111111111111-->
115+
<!--Insert b2c-extensions-app application ID here, for example: 00001111-aaaa-2222-bbbb-3333cccc4444-->
116116
<Item Key="ClientId"></Item>
117-
<!--Insert b2c-extensions-app application ObjectId here, for example: 22222222-2222-2222-2222-222222222222-->
117+
<!--Insert b2c-extensions-app application ObjectId here, for example: aaaaaaaa-0000-1111-2222-bbbbbbbbbbbb-->
118118
<Item Key="ApplicationObjectId"></Item>
119119
</Metadata>
120120
</TechnicalProfile>
@@ -184,7 +184,7 @@ The following example demonstrates the use of a custom attribute in Azure AD B2C
184184

185185
You can use Microsoft Graph to create and manage the custom attributes then set the values for a user. Extension attributes are also called directory or Microsoft Entra extensions.
186186

187-
Custom attributes (directory extensions) in the Microsoft Graph API are named by using the convention `extension_{appId-without-hyphens}_{extensionProperty-name}` where `{appId-without-hyphens}` is the stripped version of the **appId** (called Client ID on the Azure AD B2C portal) for the `b2c-extensions-app` with only characters 0-9 and A-Z. For example, if the **appId** of the `b2c-extensions-app` application is `25883231-668a-43a7-80b2-5685c3f874bc` and the attribute name is `loyaltyId`, then the custom attribute is named `extension_25883231668a43a780b25685c3f874bc_loyaltyId`.
187+
Custom attributes (directory extensions) in the Microsoft Graph API are named by using the convention `extension_{appId-without-hyphens}_{extensionProperty-name}` where `{appId-without-hyphens}` is the stripped version of the **appId** (called Client ID on the Azure AD B2C portal) for the `b2c-extensions-app` with only characters 0-9 and A-Z. For example, if the **appId** of the `b2c-extensions-app` application is `11112222-bbbb-3333-cccc-4444dddd5555` and the attribute name is `loyaltyId`, then the custom attribute is named `extension_25883231668a43a780b25685c3f874bc_loyaltyId`.
188188

189189
Learn how to [manage extension attributes in your Azure AD B2C tenant](microsoft-graph-operations.md#application-extension-directory-extension-properties) using the Microsoft Graph API.
190190

articles/active-directory-b2c/userinfo-endpoint.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ The user info UserJourney specifies:
8484
<Metadata>
8585
<!-- Update the Issuer and Audience below -->
8686
<!-- Audience is optional, Issuer is required-->
87-
<Item Key="issuer">https://yourtenant.b2clogin.com/11111111-1111-1111-1111-111111111111/v2.0/</Item>
88-
<Item Key="audience">[ "22222222-2222-2222-2222-222222222222", "33333333-3333-3333-3333-333333333333" ]</Item>
87+
<Item Key="issuer">https://yourtenant.b2clogin.com/aaaabbbb-0000-cccc-1111-dddd2222eeee/v2.0/</Item>
88+
<Item Key="audience">[ "00001111-aaaa-2222-bbbb-3333cccc4444", "11112222-bbbb-3333-cccc-4444dddd5555" ]</Item>
8989
<Item Key="client_assertion_type">urn:ietf:params:oauth:client-assertion-type:jwt-bearer</Item>
9090
</Metadata>
9191
<CryptographicKeys>
@@ -111,24 +111,24 @@ The user info UserJourney specifies:
111111
1. **issuer** - This value must be identical to the `iss` claim within the access token claim. Tokens issued by Azure AD B2C use an issuer in the format `https://yourtenant.b2clogin.com/your-tenant-id/v2.0/`. Learn more about [token customization](configure-tokens.md).
112112
1. **IdTokenAudience** - Must be identical to the `aud` claim within the access token claim. In Azure AD B2C the `aud` claim is the ID of your relying party application. This value is a collection and supports multiple values using a comma delimiter.
113113

114-
In the following access token, the `iss` claim value is `https://contoso.b2clogin.com/11111111-1111-1111-1111-111111111111/v2.0/`. The `aud` claim value is `22222222-2222-2222-2222-222222222222`.
114+
In the following access token, the `iss` claim value is `https://contoso.b2clogin.com/aaaabbbb-0000-cccc-1111-dddd2222eeee/v2.0/`. The `aud` claim value is `00001111-aaaa-2222-bbbb-3333cccc4444`.
115115

116116
```json
117117
{
118118
"exp": 1605549468,
119119
"nbf": 1605545868,
120120
"ver": "1.0",
121121
"iss": "https://contoso.b2clogin.com/11111111-1111-1111-1111-111111111111/v2.0/",
122-
"sub": "44444444-4444-4444-4444-444444444444",
123-
"aud": "22222222-2222-2222-2222-222222222222",
122+
"sub": "aaaaaaaa-0000-1111-2222-bbbbbbbbbbbb",
123+
"aud": "00001111-aaaa-2222-bbbb-3333cccc4444",
124124
"acr": "b2c_1a_signup_signin",
125125
"nonce": "defaultNonce",
126126
"iat": 1605545868,
127127
"auth_time": 1605545868,
128128
"name": "John Smith",
129129
"given_name": "John",
130130
"family_name": "Smith",
131-
"tid": "11111111-1111-1111-1111-111111111111"
131+
"tid": "aaaabbbb-0000-cccc-1111-dddd2222eeee"
132132
}
133133
```
134134

@@ -259,7 +259,7 @@ A successful response would look like:
259259

260260
```json
261261
{
262-
"objectId": "44444444-4444-4444-4444-444444444444",
262+
"objectId": "aaaaaaaa-0000-1111-2222-bbbbbbbbbbbb",
263263
"givenName": "John",
264264
"surname": "Smith",
265265
"displayName": "John Smith",

articles/active-directory-b2c/view-audit-logs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ Here's the JSON representation of the example activity event shown earlier in th
166166
{
167167
"id": "B2C_DQO3J_4984536",
168168
"category": "Authentication",
169-
"correlationId": "00000000-0000-0000-0000-000000000000",
169+
"correlationId": "ffffffff-eeee-dddd-cccc-bbbbbbbbbbb0",
170170
"result": "success",
171171
"resultReason": "N/A",
172172
"activityDisplayName": "Issue an id_token to the application",
@@ -176,7 +176,7 @@ Here's the JSON representation of the example activity event shown earlier in th
176176
"initiatedBy": {
177177
"user": null,
178178
"app": {
179-
"appId": "00000000-0000-0000-0000-000000000000",
179+
"appId": "00001111-aaaa-2222-bbbb-3333cccc4444",
180180
"displayName": null,
181181
"servicePrincipalId": null,
182182
"servicePrincipalName": "00000000-0000-0000-0000-000000000000"

articles/api-center/check-minimal-api-permissions-dev-proxy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ In the `devproxyrc.json` file, add the following configuration:
6464
"https://api.northwind.com/*"
6565
],
6666
"apiCenterMinimalPermissionsPlugin": {
67-
"subscriptionId": "00000000-0000-0000-0000-000000000000",
67+
"subscriptionId": "aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e",
6868
"resourceGroupName": "demo",
6969
"serviceName": "contoso-api-center",
7070
"workspaceName": "default"
@@ -105,7 +105,7 @@ Update your `devproxyrc.json` file with a reference to the plain-text reporter:
105105
"https://api.northwind.com/*"
106106
],
107107
"apiCenterMinimalPermissionsPlugin": {
108-
"subscriptionId": "00000000-0000-0000-0000-000000000000",
108+
"subscriptionId": "aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e",
109109
"resourceGroupName": "demo",
110110
"serviceName": "contoso-api-center",
111111
"workspaceName": "default"

articles/api-center/discover-shadow-apis-dev-proxy.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ In the `devproxyrc.json` file, add the following configuration:
5151
"https://jsonplaceholder.typicode.com/*"
5252
],
5353
"apiCenterOnboardingPlugin": {
54-
"subscriptionId": "00000000-0000-0000-0000-000000000000",
54+
"subscriptionId": "aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e",
5555
"resourceGroupName": "demo",
5656
"serviceName": "contoso-api-center",
5757
"workspaceName": "default",
@@ -93,7 +93,7 @@ Update your `devproxyrc.json` file with a reference to the plain-text reporter:
9393
"https://jsonplaceholder.typicode.com/*"
9494
],
9595
"apiCenterOnboardingPlugin": {
96-
"subscriptionId": "00000000-0000-0000-0000-000000000000",
96+
"subscriptionId": "aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e",
9797
"resourceGroupName": "demo",
9898
"serviceName": "contoso-api-center",
9999
"workspaceName": "default",
@@ -207,7 +207,7 @@ The `ApiCenterOnboardingPlugin` can not only detect shadow APIs, but also automa
207207
"https://jsonplaceholder.typicode.com/*"
208208
],
209209
"apiCenterOnboardingPlugin": {
210-
"subscriptionId": "00000000-0000-0000-0000-000000000000",
210+
"subscriptionId": "aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e",
211211
"resourceGroupName": "demo",
212212
"serviceName": "contoso-api-center",
213213
"workspaceName": "default",
@@ -251,7 +251,7 @@ To automatically generate OpenAPI specs for onboarded APIs, update Dev Proxy con
251251
"https://jsonplaceholder.typicode.com/*"
252252
],
253253
"apiCenterOnboardingPlugin": {
254-
"subscriptionId": "00000000-0000-0000-0000-000000000000",
254+
"subscriptionId": "aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e",
255255
"resourceGroupName": "demo",
256256
"serviceName": "contoso-api-center",
257257
"workspaceName": "default",

articles/api-center/find-nonproduction-api-requests-dev-proxy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ In the `devproxyrc.json` file, add the following configuration:
5757
"https://jsonplaceholder.typicode.com/*"
5858
],
5959
"apiCenterProductionVersionPlugin": {
60-
"subscriptionId": "00000000-0000-0000-0000-000000000000",
60+
"subscriptionId": "aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e",
6161
"resourceGroupName": "demo",
6262
"serviceName": "contoso-api-center",
6363
"workspaceName": "default"
@@ -98,7 +98,7 @@ Update your `devproxyrc.json` file with a reference to the plain-text reporter:
9898
"https://jsonplaceholder.typicode.com/*"
9999
],
100100
"apiCenterProductionVersionPlugin": {
101-
"subscriptionId": "00000000-0000-0000-0000-000000000000",
101+
"subscriptionId": "aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e",
102102
"resourceGroupName": "demo",
103103
"serviceName": "contoso-api-center",
104104
"workspaceName": "default"

articles/automation/change-tracking/enable-vms-monitoring-agent.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Enable Azure Automation Change Tracking for single machine and multiple m
33
description: This article tells how to enable the Change Tracking feature for single machine and multiple machines at scale from the Azure portal.
44
services: automation
55
ms.subservice: change-inventory-management
6-
ms.date: 10/10/2024
6+
ms.date: 10/29/2024
77
ms.topic: how-to
88
ms.service: azure-automation
99
---
@@ -40,9 +40,10 @@ This section provides detailed procedure on how you can enable change tracking o
4040
It will initiate the deployment and the notification appears on the top right corner of the screen.
4141

4242
:::image type="content" source="media/enable-vms-monitoring-agent/deployment-success-inline.png" alt-text="Screenshot showing the notification of deployment." lightbox="media/enable-vms-monitoring-agent/deployment-success-expanded.png":::
43-
43+
4444
> [!NOTE]
45-
> It usually takes up to two to three minutes to successfully onboard and enable the virtual machine(s). After you enable a virtual machine for change tracking, you can make changes to the files, registries, or software for the specific VM.
45+
> - When you enable Change Tracking in the Azure portal using the Azure Monitoring Agent, the process automatically creates a Data Collection Rule (DCR). This rule will appear in the resource group with a name in the format ct-dcr-aaaaaaaaa. After the rule is created, add the required resources.
46+
> - It usually takes up to two to three minutes to successfully onboard and enable the virtual machine(s). After you enable a virtual machine for change tracking, you can make changes to the files, registries, or software for the specific VM.
4647
4748
#### [Multiple Azure VMs - portal](#tab/multiplevms)
4849

@@ -55,7 +56,7 @@ This section provides detailed procedure on how you can enable change tracking o
5556
:::image type="content" source="media/enable-vms-monitoring-agent/select-change-tracking-multiple-vms-inline.png" alt-text="Screenshot showing how to select multiple virtual machines from the portal." lightbox="media/enable-vms-monitoring-agent/select-change-tracking-multiple-vms-expanded.png":::
5657

5758
> [!NOTE]
58-
> You can select upto 250 virtual machines at a time to enable this feature.
59+
> You can select up to 250 virtual machines at a time to enable this feature.
5960
6061
1. In **Enable Change Tracking** page, select the banner at the top of the page, **Click here to try new change tracking and inventory with Azure Monitoring Agent (AMA) experience**.
6162

@@ -193,6 +194,9 @@ Using the Deploy if not exist (DINE) policy, you can enable Change tracking with
193194

194195
:::image type="content" source="media/enable-vms-monitoring-agent/deployment-confirmation.png" alt-text="Screenshot of deployment notification.":::
195196

197+
> [!NOTE]
198+
> After creating the Data Collection Rule (DCR) using the Azure Monitoring Agent's change tracking schema, ensure that you don't add any Data Sources to this rule. This can cause Change Tracking and Inventory to fail. You must only add new Resources in this section.
199+
196200
## Next steps
197201

198202
- For details of working with the feature, see [Manage Change Tracking](../change-tracking/manage-change-tracking-monitoring-agent.md).

0 commit comments

Comments
 (0)