Skip to content

Commit cd98798

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into how-to-manage-kubernetes-instance-types
2 parents 47b1a08 + bda722f commit cd98798

File tree

223 files changed

+1732
-4398
lines changed

Some content is hidden

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

223 files changed

+1732
-4398
lines changed

.openpublishing.redirection.azure-monitor.json

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6194,6 +6194,91 @@
61946194
"source_path_from_root": "/articles/azure-monitor/essentials/resource-logs-categories.md",
61956195
"redirect_url": "/azure/azure-monitor/reference/supported-logs/logs-index",
61966196
"redirect_document_id": false
6197+
},
6198+
{
6199+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-prometheus.md",
6200+
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-enable",
6201+
"redirect_document_id": false
6202+
},
6203+
{
6204+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-enable.md",
6205+
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-enable",
6206+
"redirect_document_id": false
6207+
},
6208+
{
6209+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-disable.md",
6210+
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-disable",
6211+
"redirect_document_id": false
6212+
},
6213+
{
6214+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-from-arc-enabled-cluster.md",
6215+
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-from-arc-enabled-cluster",
6216+
"redirect_document_id": false
6217+
},
6218+
{
6219+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-scrape-default.md",
6220+
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-scrape-default",
6221+
"redirect_document_id": false
6222+
},
6223+
{
6224+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-scrape-configuration.md",
6225+
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-scrape-configuration",
6226+
"redirect_document_id": false
6227+
},
6228+
{
6229+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-scrape-configuration-minimal.md",
6230+
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-scrape-configuration-minimal",
6231+
"redirect_document_id": false
6232+
},
6233+
{
6234+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-scrape-scale.md",
6235+
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-scrape-scale",
6236+
"redirect_document_id": false
6237+
},
6238+
{
6239+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-scrape-validate.md",
6240+
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-scrape-validate",
6241+
"redirect_document_id": false
6242+
},
6243+
{
6244+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-multiple-workspaces.md",
6245+
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-multiple-workspaces",
6246+
"redirect_document_id": false
6247+
},
6248+
{
6249+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-troubleshoot.md",
6250+
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-troubleshoot",
6251+
"redirect_document_id": false
6252+
},
6253+
{
6254+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-remote-write.md",
6255+
"redirect_url": "/azure/azure-monitor/containers/prometheus-remote-write",
6256+
"redirect_document_id": false
6257+
},
6258+
{
6259+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-remote-write-azure-ad-pod-identity.md",
6260+
"redirect_url": "/azure/azure-monitor/containers/prometheus-remote-write-azure-ad-pod-identity",
6261+
"redirect_document_id": false
6262+
},
6263+
{
6264+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-remote-write-managed-identity.md",
6265+
"redirect_url": "/azure/azure-monitor/containers/prometheus-remote-write-managed-identity",
6266+
"redirect_document_id": false
6267+
},
6268+
{
6269+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-remote-write-active-directory.md",
6270+
"redirect_url": "/azure/azure-monitor/containers/prometheus-remote-write-active-directory",
6271+
"redirect_document_id": false
6272+
},
6273+
{
6274+
"source_path_from_root": "/articles/azure-monitor/essentials/integrate-keda.md",
6275+
"redirect_url": "/azure/azure-monitor/containers/integrate-keda",
6276+
"redirect_document_id": false
6277+
},
6278+
{
6279+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-authorization-proxy.md",
6280+
"redirect_url": "/azure/azure-monitor/containers/prometheus-authorization-proxy",
6281+
"redirect_document_id": false
61976282
}
61986283
]
61996284
}

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1240,6 +1240,11 @@
12401240
"redirect_url": "/previous-versions/azure/azure-video-analyzer/video-analyzer-docs/edge/use-visual-studio-code-extension",
12411241
"redirect_document_id": false
12421242
},
1243+
{
1244+
"source_path": "articles/azure-video-indexer/observed-people-tracing.md",
1245+
"redirect_url": "/azure/azure-video-indexer/observed-people-tracking",
1246+
"redirect_document_id": false
1247+
},
12431248
{
12441249
"source_path": "articles/cloudfoundry/index.yml",
12451250
"redirect_url": "https://docs.pivotal.io/pivotalcf/1-11/customizing/pcf_azure.html",

articles/active-directory/develop/access-token-claims-reference.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Access tokens are [JSON web tokens (JWT)](https://wikipedia.org/wiki/JSON_Web_To
2121
- **Payload** - Contains all of the important data about the user or application that's attempting to call the service.
2222
- **Signature** - Is the raw material used to validate the token.
2323

24-
Each piece is separated by a period (`.`) and separately Base64 encoded.
24+
Each piece is separated by a period (`.`) and separately Base 64 encoded.
2525

2626
Claims are present only if a value exists to fill it. An application shouldn't take a dependency on a claim being present. Examples include `pwd_exp` (not every tenant requires passwords to expire) and `family_name` ([client credential](v2-oauth2-client-creds-grant-flow.md) flows are on behalf of applications that don't have names). Claims used for access token validation are always present.
2727

@@ -40,6 +40,7 @@ The Microsoft identity platform uses some claims to help secure tokens for reuse
4040

4141
| Claim | Format | Description | Authorization considerations |
4242
|-------|--------|-------------|------------------------------|
43+
| `acrs` | JSON array of strings | Indicates the Auth Context IDs of the operations that the bearer is eligible to perform. Auth Context IDs can be used to trigger a demand for step-up authentication from within your application and services. Often used along with the `xms_cc` claim. |
4344
| `aud` | String, an Application ID URI or GUID | Identifies the intended audience of the token. In v2.0 tokens, this value is always the client ID of the API. In v1.0 tokens, it can be the client ID or the resource URI used in the request. The value can depend on how the client requested the token. | This value must be validated, reject the token if the value doesn't match the intended audience. |
4445
| `iss` | String, a security token service (STS) URI | Identifies the STS that constructs and returns the token, and the Azure AD tenant of the authenticated user. If the token issued is a v2.0 token (see the `ver` claim), the URI ends in `/v2.0`. The GUID that indicates that the user is a consumer user from a Microsoft account is `9188040d-6c67-4c5b-b112-36a304b66dad`. | The application can use the GUID portion of the claim to restrict the set of tenants that can sign in to the application, if applicable. |
4546
|`idp`| String, usually an STS URI | Records the identity provider that authenticated the subject of the token. This value is identical to the value of the Issuer claim unless the user account isn't in the same tenant as the issuer, such as guests. Use the value of `iss` if the claim isn't present. For personal accounts being used in an organizational context (for instance, a personal account invited to an Azure AD tenant), the `idp` claim may be 'live.com' or an STS URI containing the Microsoft account tenant `9188040d-6c67-4c5b-b112-36a304b66dad`. | |
@@ -68,7 +69,7 @@ The Microsoft identity platform uses some claims to help secure tokens for reuse
6869
| `uti` | String | Token identifier claim, equivalent to `jti` in the JWT specification. Unique, per-token identifier that is case-sensitive. | |
6970
| `rh` | Opaque String | An internal claim used by Azure to revalidate tokens. Resources shouldn't use this claim. | |
7071
| `ver` | String, either `1.0` or `2.0` | Indicates the version of the access token. | |
71-
| `xms_cc` | JSON array of strings | Indicates whether the client application that acquired the token is capable of handling claims challenges. This claim is commonly used in Conditional Access and Continuous Access Evaluation scenarios. The resource server that the token is issued for controls the presence of the claim in it. For example, a service application. For more information, see [Claims challenges, claims requests and client capabilities](claims-challenge.md?tabs=dotnet). Resource servers should check this claim in access tokens received from client applications. If this claim is present, resource servers can respond back with a claims challenge. The claims challenge requests more claims in a new access token to authorize access to a protected resource. |
72+
| `xms_cc` | JSON array of strings | Indicates whether the client application that acquired the token is capable of handling claims challenges. It's often used along with claim `acrs`. This claim is commonly used in Conditional Access and Continuous Access Evaluation scenarios. The resource server or service application that the token is issued for controls the presence of this claim in a token. A value of `cp1` in the access token is the authoritative way to identify that a client application is capable of handling a claims challenge. For more information, see [Claims challenges, claims requests and client capabilities](claims-challenge.md?tabs=dotnet). |
7273

7374
### Groups overage claim
7475

0 commit comments

Comments
 (0)