Skip to content

Commit 42a9af0

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into nat-diagram-arm
2 parents 013b069 + 6094638 commit 42a9af0

33 files changed

+817
-747
lines changed

articles/active-directory/develop/reference-claims-mapping-policy-type.md

Lines changed: 109 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ The following claims are in the restricted claim set for a JWT.
4444
- `acr`
4545
- `acrs`
4646
- `actor`
47+
- `actortoken`
4748
- `ageGroup`
4849
- `aio`
4950
- `altsecid`
@@ -55,41 +56,68 @@ The following claims are in the restricted claim set for a JWT.
5556
- `appctxsender`
5657
- `appid`
5758
- `appidacr`
59+
- `assertion`
5860
- `at_hash`
61+
- `aud`
62+
- `auth_data`
5963
- `auth_time`
64+
- `authorization_code`
6065
- `azp`
6166
- `azpacr`
67+
- `bk_claim`
68+
- `bk_enclave`
69+
- `bk_pub`
70+
- `brk_client_id`
71+
- `brk_redirect_uri`
6272
- `c_hash`
6373
- `ca_enf`
6474
- `ca_policy_result`
65-
- `capolids_latebind`
6675
- `capolids`
76+
- `capolids_latebind`
6777
- `cc`
78+
- `cert_token_use`
79+
- `child_client_id`
80+
- `child_redirect_uri`
81+
- `client_id`
82+
- `client_ip`
83+
- `cloud_graph_host_name`
84+
- `cloud_instance_host_name`
85+
- `cloud_instance_name`
86+
- `CloudAssignedMdmId`
6887
- `cnf`
6988
- `code`
70-
- `controls_auds`
7189
- `controls`
90+
- `controls_auds`
7291
- `credential_keys`
92+
- `csr`
93+
- `csr_type`
7394
- `ctry`
7495
- `deviceid`
96+
- `dns_names`
7597
- `domain_dns_name`
7698
- `domain_netbios_name`
7799
- `e_exp`
78100
- `email`
79101
- `endpoint`
80102
- `enfpolids`
103+
- `exp`
81104
- `expires_on`
105+
- `extn. as prefix`
82106
- `fido_auth_data`
83-
- `fwd_appidacr`
107+
- `fido_ver`
84108
- `fwd`
109+
- `fwd_appidacr`
110+
- `grant_type`
85111
- `graph`
86112
- `group_sids`
87113
- `groups`
88114
- `hasgroups`
115+
- `hash_alg`
89116
- `haswids`
90117
- `home_oid`
91118
- `home_puid`
92119
- `home_tid`
120+
- `iat`
93121
- `identityprovider`
94122
- `idp`
95123
- `idtyp`
@@ -98,16 +126,23 @@ The following claims are in the restricted claim set for a JWT.
98126
- `inviteTicket`
99127
- `ipaddr`
100128
- `isbrowserhostedapp`
129+
- `iss`
101130
- `isViral`
131+
- `jwk`
132+
- `key_id`
133+
- `key_type`
102134
- `login_hint`
103135
- `mam_compliance_url`
104136
- `mam_enrollment_url`
105137
- `mam_terms_of_use_url`
106138
- `mdm_compliance_url`
107139
- `mdm_enrollment_url`
108140
- `mdm_terms_of_use_url`
141+
- `msgraph_host`
109142
- `msproxy`
110143
- `nameid`
144+
- `nbf`
145+
- `netbios_name`
111146
- `nickname`
112147
- `nonce`
113148
- `oid`
@@ -116,25 +151,35 @@ The following claims are in the restricted claim set for a JWT.
116151
- `onprem_sid`
117152
- `openid2_id`
118153
- `origin_header`
154+
- `password`
119155
- `platf`
120156
- `polids`
121157
- `pop_jwk`
122158
- `preferred_username`
159+
- `previous_refresh_token`
123160
- `primary_sid`
124161
- `prov_data`
125162
- `puid`
126163
- `pwd_exp`
127164
- `pwd_url`
128165
- `rdp_bt`
166+
- `redirect_uri`
167+
- `refresh_token`
129168
- `refresh_token_issued_on`
130169
- `refreshtoken`
170+
- `request_nonce`
171+
- `resource`
131172
- `rh`
173+
- `role`
132174
- `roles`
175+
- `rp_id`
133176
- `rt_type`
177+
- `scope`
134178
- `scp`
135179
- `secaud`
136180
- `sid`
137181
- `sid`
182+
- `signature`
138183
- `signin_state`
139184
- `source_anchor`
140185
- `src1`
@@ -145,6 +190,7 @@ The following claims are in the restricted claim set for a JWT.
145190
- `tbidv2`
146191
- `tenant_ctry`
147192
- `tenant_display_name`
193+
- `tenant_id`
148194
- `tenant_region_scope`
149195
- `tenant_region_sub_scope`
150196
- `thumbnail_photo`
@@ -154,60 +200,88 @@ The following claims are in the restricted claim set for a JWT.
154200
- `ttr`
155201
- `unique_name`
156202
- `upn`
203+
- `user_agent`
157204
- `user_setting_sync_url`
205+
- `username`
158206
- `uti`
159207
- `ver`
160208
- `verified_primary_email`
161209
- `verified_secondary_email`
162210
- `vnet`
211+
- `vsm_binding_key`
163212
- `wamcompat_client_info`
164213
- `wamcompat_id_token`
165214
- `wamcompat_scopes`
166215
- `wids`
216+
- `win_ver`
217+
- `x5c_ca`
167218
- `xcb2b_rclient`
168219
- `xcb2b_rcloud`
169220
- `xcb2b_rtenant`
170221
- `ztdid`
171222

223+
172224
> [!NOTE]
173225
> Any claim starting with `xms_` is restricted.
174226
175227
### SAML restricted claim set
176228

177229
The following table lists the SAML claims that are in the restricted claim set.
178230

179-
| Claim type (URI) |
180-
| ----- |
181-
|`http://schemas.microsoft.com/2012/01/devicecontext/claims/ismanaged`|
182-
|`http://schemas.microsoft.com/2014/02/devicecontext/claims/isknown`|
183-
|`http://schemas.microsoft.com/2014/03/psso`|
184-
|`http://schemas.microsoft.com/2014/09/devicecontext/claims/iscompliant`|
185-
|`http://schemas.microsoft.com/claims/authnmethodsreferences`|
186-
|`http://schemas.microsoft.com/claims/groups.link`|
187-
|`http://schemas.microsoft.com/identity/claims/accesstoken`|
188-
|`http://schemas.microsoft.com/identity/claims/acct`|
189-
|`http://schemas.microsoft.com/identity/claims/agegroup`|
190-
|`http://schemas.microsoft.com/identity/claims/aio`|
191-
|`http://schemas.microsoft.com/identity/claims/identityprovider`|
192-
|`http://schemas.microsoft.com/identity/claims/objectidentifier`|
193-
|`http://schemas.microsoft.com/identity/claims/openid2_id`|
194-
|`http://schemas.microsoft.com/identity/claims/puid`|
195-
|`http://schemas.microsoft.com/identity/claims/tenantid`|
196-
|`http://schemas.microsoft.com/identity/claims/xms_et`|
197-
|`http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant`|
198-
|`http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod`|
199-
|`http://schemas.microsoft.com/ws/2008/06/identity/claims/expiration`|
200-
|`http://schemas.microsoft.com/ws/2008/06/identity/claims/groups`|
201-
|`http://schemas.microsoft.com/ws/2008/06/identity/claims/role`|
202-
|`http://schemas.microsoft.com/ws/2008/06/identity/claims/wids`|
203-
|`http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier`|
204-
| `http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname` |
205-
| `http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid` |
206-
| `http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid` |
207-
| `http://schemas.xmlsoap.org/ws/2005/05/identity/claims/sid` |
208-
| `http://schemas.xmlsoap.org/ws/2005/05/identity/claims/x500distinguishedname` |
209-
| `http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn` |
210-
| `http://schemas.microsoft.com/ws/2008/06/identity/claims/role` |
231+
Restricted Claim type (URI):
232+
- `http://schemas.microsoft.com/2012/01/devicecontext/claims/ismanaged`
233+
- `http://schemas.microsoft.com/2014/02/devicecontext/claims/isknown`
234+
- `http://schemas.microsoft.com/2014/03/psso`
235+
- `http://schemas.microsoft.com/2014/09/devicecontext/claims/iscompliant`
236+
- `http://schemas.microsoft.com/claims/authnmethodsreferences`
237+
- `http://schemas.microsoft.com/claims/groups.link`
238+
- `http://schemas.microsoft.com/identity/claims/accesstoken`
239+
- `http://schemas.microsoft.com/identity/claims/acct`
240+
- `http://schemas.microsoft.com/identity/claims/agegroup`
241+
- `http://schemas.microsoft.com/identity/claims/aio`
242+
- `http://schemas.microsoft.com/identity/claims/identityprovider`
243+
- `http://schemas.microsoft.com/identity/claims/objectidentifier`
244+
- `http://schemas.microsoft.com/identity/claims/openid2_id`
245+
- `http://schemas.microsoft.com/identity/claims/puid`
246+
- `http://schemas.microsoft.com/identity/claims/scope`
247+
- `http://schemas.microsoft.com/identity/claims/tenantid`
248+
- `http://schemas.microsoft.com/identity/claims/xms_et`
249+
- `http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant`
250+
- `http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod`
251+
- `http://schemas.microsoft.com/ws/2008/06/identity/claims/confirmationkey`
252+
- `http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid`
253+
- `http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid`
254+
- `http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlywindowsdevicegroup`
255+
- `http://schemas.microsoft.com/ws/2008/06/identity/claims/expiration`
256+
- `http://schemas.microsoft.com/ws/2008/06/identity/claims/expired`
257+
- `http://schemas.microsoft.com/ws/2008/06/identity/claims/groups`
258+
- `http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid`
259+
- `http://schemas.microsoft.com/ws/2008/06/identity/claims/ispersistent`
260+
- `http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid`
261+
- `http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid`
262+
- `http://schemas.microsoft.com/ws/2008/06/identity/claims/role`
263+
- `http://schemas.microsoft.com/ws/2008/06/identity/claims/role`
264+
- `http://schemas.microsoft.com/ws/2008/06/identity/claims/samlissuername`
265+
- `http://schemas.microsoft.com/ws/2008/06/identity/claims/wids`
266+
- `http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname`
267+
- `http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsdeviceclaim`
268+
- `http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsdevicegroup`
269+
- `http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsfqbnversion`
270+
- `http://schemas.microsoft.com/ws/2008/06/identity/claims/windowssubauthority`
271+
- `http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsuserclaim`
272+
- `http://schemas.xmlsoap.org/ws/2005/05/identity/claims/authentication`
273+
- `http://schemas.xmlsoap.org/ws/2005/05/identity/claims/authorizationdecision`
274+
- `http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid`
275+
- `http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress`
276+
- `http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name`
277+
- `http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier`
278+
- `http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier`
279+
- `http://schemas.xmlsoap.org/ws/2005/05/identity/claims/sid`
280+
- `http://schemas.xmlsoap.org/ws/2005/05/identity/claims/spn`
281+
- `http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn`
282+
- `http://schemas.xmlsoap.org/ws/2005/05/identity/claims/x500distinguishedname`
283+
- `http://schemas.xmlsoap.org/ws/2009/09/identity/claims/actor`
284+
211285

212286
These claims are restricted by default, but aren't restricted if you [set the AcceptMappedClaims property](saml-claims-customization.md) to `true` in your app manifest *or* have a [custom signing key](saml-claims-customization.md):
213287

-23.4 KB
Loading

articles/azure-monitor/app/opentelemetry-enable.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.reviewer: mmcc
1010

1111
# Enable Azure Monitor OpenTelemetry for .NET, Node.js, Python and Java applications
1212

13-
This article describes how to enable and configure OpenTelemetry-based data collection to power the experiences within [Azure Monitor Application Insights](app-insights-overview.md#application-insights-overview). We walk through how to install the "Azure Monitor OpenTelemetry Distro". To learn more about OpenTelemetry concepts, see the [OpenTelemetry overview](opentelemetry-overview.md) or [OpenTelemetry FAQ](/azure/azure-monitor/faq#opentelemetry).
13+
This article describes how to enable and configure OpenTelemetry-based data collection to power the experiences within [Azure Monitor Application Insights](app-insights-overview.md#application-insights-overview). We walk through how to install the "Azure Monitor OpenTelemetry Distro". The Distro will [automatically collect](opentelemetry-add-modify.md#automatic-data-collection) traces, metrics, logs, and exceptions across your application and its dependencies. The To learn more about collecting data using OpenTelemetry, see [Data Collection Basics](opentelemetry-overview.md) or [OpenTelemetry FAQ](/azure/azure-monitor/faq#opentelemetry).
1414

1515
## OpenTelemetry Release Status
1616

articles/connectors/connectors-create-api-servicebus.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,14 @@ The Service Bus connector has different versions, based on [logic app workflow t
5757

5858
For more information about managed identities, review [Authenticate access to Azure resources with managed identities in Azure Logic Apps](../logic-apps/create-managed-service-identity.md).
5959

60-
* By default, the Service Bus built-in connector operations are stateless. To run these operations in stateful mode, see [Enable stateful mode for stateless built-in connectors](../connectors/enable-stateful-affinity-built-in-connectors.md).
60+
* By default, the Service Bus built-in connector operations are *stateless*. To run these operations in stateful mode, see [Enable stateful mode for stateless built-in connectors](../connectors/enable-stateful-affinity-built-in-connectors.md).
6161

6262
## Considerations for Azure Service Bus operations
6363

6464
### Infinite loops
6565

6666
[!INCLUDE [Warning about creating infinite loops](../../includes/connectors-infinite-loops.md)]
6767

68-
### Peek-lock
69-
70-
In Standard logic app workflows, peek-lock operations are available only for *stateless* workflows, not stateful workflows.
71-
7268
### Limit on saved sessions in connector cache
7369

7470
Per [Service Bus messaging entity, such as a subscription or topic](../service-bus-messaging/service-bus-queues-topics-subscriptions.md), the Service Bus connector can save up to 1,500 unique sessions at a time to the connector cache. If the session count exceeds this limit, old sessions are removed from the cache. For more information, see [Message sessions](../service-bus-messaging/message-sessions.md).

articles/data-factory/concepts-nested-activities.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,19 @@ Your pipeline canvas will then switch to the context of the inner activity conta
4747
:::image type="content" source="media/concepts-pipelines-activities/nested-activity-breadcrumb.png" alt-text="Screenshot showing an example If Condition activity inside the true branch with a highlight on the breadcrumb to navigate back to the parent pipeline.":::
4848

4949
## Nested activity embedding limitations
50-
Activities that support nesting (ForEach, Until, Switch, and If Condition) can't be embedded inside of another nested activity. Essentially, the current support for nesting is one level deep. See the best practices section below on how to use other pipeline activities to enable this scenario. In addition, the
50+
There are constraints on the activities that support nesting (ForEach, Until, Switch, and If Condition), for nesting another nested activity. Specifically:
51+
52+
- If and Switch can be used inside ForEach or Until activities.
53+
- If and Switch can not used inside If and Switch activities.
54+
- ForEach or Until support only a single level of nesting.
55+
56+
See the best practices section below on how to use other pipeline activities to enable this scenario. In addition, the
5157
[Validation Activity](control-flow-validation-activity.md) can't be placed inside of a nested activity.
5258

59+
If and Switch can be used inside ForEach or Until activities.
60+
ForEach or Until supports only single level nesting
61+
If and Switch can not used inside If and Switch activities.
62+
5363
## Best practices for multiple levels of nested activities
5464
In order to have logic that supports nesting more than one level deep, you can use the [Execute Pipeline Activity](control-flow-execute-pipeline-activity.md) inside of your nested activity to call another pipeline that then can have another level of nested activities. A common use case for this pattern is with the ForEach loop where you need to additionally loop based off logic in the inner activities.
5565

articles/data-factory/create-self-hosted-integration-runtime.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ Installation of the self-hosted integration runtime on a domain controller isn't
7474
- You must be an administrator on the machine to successfully install and configure the self-hosted integration runtime.
7575
- Copy-activity runs happen with a specific frequency. Processor and RAM usage on the machine follows the same pattern with peak and idle times. Resource usage also depends heavily on the amount of data that is moved. When multiple copy jobs are in progress, you see resource usage go up during peak times.
7676
- Tasks might fail during extraction of data in Parquet, ORC, or Avro formats. For more on Parquet, see [Parquet format in Azure Data Factory](./format-parquet.md#using-self-hosted-integration-runtime). File creation runs on the self-hosted integration machine. To work as expected, file creation requires the following prerequisites:
77-
- [Visual C++ 2010 Redistributable](https://download.microsoft.com/download/3/2/2/3224B87F-CFA0-4E70-BDA3-3DE650EFEBA5/vcredist_x64.exe) Package (x64)
7877
- Java Runtime (JRE) version 11 from a JRE provider such as [Microsoft OpenJDK 11](https://aka.ms/download-jdk/microsoft-jdk-11.0.19-windows-x64.msi) or [Eclipse Temurin 11](https://adoptium.net/temurin/releases/?version=11). Ensure that the *JAVA_HOME* system environment variable is set to the JDK folder (not just the JRE folder) you may also need to add the bin folder to your system's PATH environment variable.
7978
>[!NOTE]
8079
>It might be necessary to adjust the Java settings if memory errors occur, as described in the [Parquet format](./format-parquet.md#using-self-hosted-integration-runtime) documentation.

articles/data-factory/transform-data-using-databricks-notebook.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.date: 04/04/2023
1212

1313
# Run a Databricks notebook with the Databricks Notebook Activity in Azure Data Factory
1414

15-
[!INCLUDE[appliesto-adf-xxx-md](includes/appliesto-adf-xxx-md.md)]
15+
[!INCLUDE[appliesto-adf-asa-md](includes/appliesto-adf-asa-md.md)]
1616

1717
In this tutorial, you use the Azure portal to create an Azure Data Factory pipeline that executes a Databricks notebook against the Databricks jobs cluster. It also passes Azure Data Factory parameters to the Databricks notebook during execution.
1818

articles/defender-for-cloud/defender-for-sql-usage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Microsoft Defender for SQL servers on machines extends the protections for your
3131
- [Connect your GCP project to Microsoft Defender for Cloud](quickstart-onboard-gcp.md)
3232

3333
> [!NOTE]
34-
> Enable database protection for your multicloud SQL servers through the [AWS connector](quickstart-onboard-aws.md#connect-your-aws-account) or the [GCP connector](quickstart-onboard-gcp.md#configure-the-databases-plan).
34+
> Enable database protection for your multicloud SQL servers through the [AWS connector](quickstart-onboard-aws.md#connect-your-aws-account) or the [GCP connector](quickstart-onboard-gcp.md#configure-the-defender-for-databases-plan).
3535
3636
This plan includes functionality for identifying and mitigating potential database vulnerabilities and detecting anomalous activities that could indicate threats to your databases.
3737

0 commit comments

Comments
 (0)