Skip to content

Commit df9070b

Browse files
authored
Merge pull request #238098 from MicrosoftDocs/main
Publish to live, Sunday 4:00PM PDT, 5/14
2 parents 6474f62 + c5308d7 commit df9070b

25 files changed

+287
-240
lines changed

articles/active-directory/external-identities/cross-tenant-access-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,15 @@ You can configure organization-specific settings by adding an organization and m
6767

6868
[!INCLUDE [automatic-redemption-include](../includes/automatic-redemption-include.md)]
6969

70-
To configure this setting using Microsoft Graph, see the [Update crossTenantAccessPolicyConfigurationPartner](/graph/api/crosstenantaccesspolicyconfigurationpartner-update?view=graph-rest-beta&preserve-view=true) API. For information about building your own onboarding experience, see [B2B collaboration invitation manager](external-identities-overview.md#azure-ad-microsoft-graph-api-for-b2b-collaboration).
70+
To configure this setting using Microsoft Graph, see the [Update crossTenantAccessPolicyConfigurationPartner](/graph/api/crosstenantaccesspolicyconfigurationpartner-update) API. For information about building your own onboarding experience, see [B2B collaboration invitation manager](external-identities-overview.md#azure-ad-microsoft-graph-api-for-b2b-collaboration).
7171

7272
For more information, see [Configure cross-tenant synchronization](../multi-tenant-organizations/cross-tenant-synchronization-configure.md), [Configure cross-tenant access settings for B2B collaboration](cross-tenant-access-settings-b2b-collaboration.md), and [Configure cross-tenant access settings for B2B direct connect](cross-tenant-access-settings-b2b-direct-connect.md).
7373

7474
### Cross-tenant synchronization setting
7575

7676
[!INCLUDE [cross-tenant-synchronization-include](../includes/cross-tenant-synchronization-include.md)]
7777

78-
To configure this setting using Microsoft Graph, see the [Update crossTenantIdentitySyncPolicyPartner](/graph/api/crosstenantidentitysyncpolicypartner-update?view=graph-rest-beta&preserve-view=true) API. For more information, see [Configure cross-tenant synchronization](../multi-tenant-organizations/cross-tenant-synchronization-configure.md).
78+
To configure this setting using Microsoft Graph, see the [Update crossTenantIdentitySyncPolicyPartner](/graph/api/crosstenantidentitysyncpolicypartner-update) API. For more information, see [Configure cross-tenant synchronization](../multi-tenant-organizations/cross-tenant-synchronization-configure.md).
7979

8080
## Microsoft cloud settings
8181

articles/active-directory/multi-tenant-organizations/cross-tenant-synchronization-configure-graph.md

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: active-directory
88
ms.workload: identity
99
ms.subservice: multi-tenant-organizations
1010
ms.topic: how-to
11-
ms.date: 05/05/2023
11+
ms.date: 05/14/2023
1212
ms.author: rolyon
1313
ms.custom: it-pro
1414

@@ -78,14 +78,14 @@ These steps describe how to use Microsoft Graph Explorer (recommended), but you
7878

7979
![Icon for the target tenant.](./media/common/icon-tenant-target.png)<br/>**Target tenant**
8080

81-
1. In the target tenant, use the [Create crossTenantAccessPolicyConfigurationPartner](/graph/api/crosstenantaccesspolicy-post-partners?view=graph-rest-beta&preserve-view=true) API to create a new partner configuration in a cross-tenant access policy between the target tenant and the source tenant. Use the source tenant ID in the request.
81+
1. In the target tenant, use the [Create crossTenantAccessPolicyConfigurationPartner](/graph/api/crosstenantaccesspolicy-post-partners?branch=main) API to create a new partner configuration in a cross-tenant access policy between the target tenant and the source tenant. Use the source tenant ID in the request.
8282

8383
If you get an `Request_MultipleObjectsWithSameKeyValue` error, you might already have an existing configuration. For more information, see [Symptom - Request_MultipleObjectsWithSameKeyValue error](#symptom---request_multipleobjectswithsamekeyvalue-error).
8484

8585
**Request**
8686

8787
```http
88-
POST https://graph.microsoft.com/beta/policies/crossTenantAccessPolicy/partners
88+
POST https://graph.microsoft.com/v1.0/policies/crossTenantAccessPolicy/partners
8989
Content-Type: application/json
9090
9191
{
@@ -100,7 +100,7 @@ These steps describe how to use Microsoft Graph Explorer (recommended), but you
100100
Content-Type: application/json
101101
102102
{
103-
"@odata.context": "https://graph.microsoft.com/beta/$metadata#policies/crossTenantAccessPolicy/partners/$entity",
103+
"@odata.context": "https://graph.microsoft.com/v1.0/$metadata#policies/crossTenantAccessPolicy/partners/$entity",
104104
"tenantId": "{sourceTenantId}",
105105
"isServiceProvider": null,
106106
"inboundTrust": null,
@@ -122,14 +122,14 @@ These steps describe how to use Microsoft Graph Explorer (recommended), but you
122122
}
123123
```
124124
125-
1. Use the [Create identitySynchronization](/graph/api/crosstenantaccesspolicyconfigurationpartner-put-identitysynchronization?view=graph-rest-beta&preserve-view=true) API to enable user synchronization in the target tenant.
125+
1. Use the [Create identitySynchronization](/graph/api/crosstenantaccesspolicyconfigurationpartner-put-identitysynchronization?branch=main) API to enable user synchronization in the target tenant.
126126
127127
If you get an `Request_MultipleObjectsWithSameKeyValue` error, you might already have an existing policy. For more information, see [Symptom - Request_MultipleObjectsWithSameKeyValue error](#symptom---request_multipleobjectswithsamekeyvalue-error).
128128
129129
**Request**
130130
131131
```http
132-
PUT https://graph.microsoft.com/beta/policies/crossTenantAccessPolicy/partners/{sourceTenantId}/identitySynchronization
132+
PUT https://graph.microsoft.com/v1.0/policies/crossTenantAccessPolicy/partners/{sourceTenantId}/identitySynchronization
133133
Content-type: application/json
134134
135135
{
@@ -151,12 +151,12 @@ These steps describe how to use Microsoft Graph Explorer (recommended), but you
151151
152152
![Icon for the target tenant.](./media/common/icon-tenant-target.png)<br/>**Target tenant**
153153
154-
1. In the target tenant, use the [Update crossTenantAccessPolicyConfigurationPartner](/graph/api/crosstenantaccesspolicyconfigurationpartner-update?view=graph-rest-beta&preserve-view=true) API to automatically redeem invitations and suppress consent prompts for inbound access.
154+
1. In the target tenant, use the [Update crossTenantAccessPolicyConfigurationPartner](/graph/api/crosstenantaccesspolicyconfigurationpartner-update?branch=main) API to automatically redeem invitations and suppress consent prompts for inbound access.
155155
156156
**Request**
157157
158158
```http
159-
PATCH https://graph.microsoft.com/beta/policies/crossTenantAccessPolicy/partners/{sourceTenantId}
159+
PATCH https://graph.microsoft.com/v1.0/policies/crossTenantAccessPolicy/partners/{sourceTenantId}
160160
Content-Type: application/json
161161
162162
{
@@ -178,14 +178,14 @@ These steps describe how to use Microsoft Graph Explorer (recommended), but you
178178
179179
![Icon for the source tenant.](./media/common/icon-tenant-source.png)<br/>**Source tenant**
180180
181-
1. In the source tenant, use the [Create crossTenantAccessPolicyConfigurationPartner](/graph/api/crosstenantaccesspolicy-post-partners?view=graph-rest-beta&preserve-view=true) API to create a new partner configuration in a cross-tenant access policy between the source tenant and the target tenant. Use the target tenant ID in the request.
181+
1. In the source tenant, use the [Create crossTenantAccessPolicyConfigurationPartner](/graph/api/crosstenantaccesspolicy-post-partners?branch=main) API to create a new partner configuration in a cross-tenant access policy between the source tenant and the target tenant. Use the target tenant ID in the request.
182182
183183
If you get an `Request_MultipleObjectsWithSameKeyValue` error, you might already have an existing configuration. For more information, see [Symptom - Request_MultipleObjectsWithSameKeyValue error](#symptom---request_multipleobjectswithsamekeyvalue-error).
184184
185185
**Request**
186186
187187
```http
188-
POST https://graph.microsoft.com/beta/policies/crossTenantAccessPolicy/partners
188+
POST https://graph.microsoft.com/v1.0/policies/crossTenantAccessPolicy/partners
189189
Content-Type: application/json
190190
191191
{
@@ -200,7 +200,7 @@ These steps describe how to use Microsoft Graph Explorer (recommended), but you
200200
Content-Type: application/json
201201
202202
{
203-
"@odata.context": "https://graph.microsoft.com/beta/$metadata#policies/crossTenantAccessPolicy/partners/$entity",
203+
"@odata.context": "https://graph.microsoft.com/v1.0/$metadata#policies/crossTenantAccessPolicy/partners/$entity",
204204
"tenantId": "{targetTenantId}",
205205
"isServiceProvider": null,
206206
"inboundTrust": null,
@@ -222,12 +222,12 @@ These steps describe how to use Microsoft Graph Explorer (recommended), but you
222222
}
223223
```
224224
225-
1. Use the [Update crossTenantAccessPolicyConfigurationPartner](/graph/api/crosstenantaccesspolicyconfigurationpartner-update?view=graph-rest-beta&preserve-view=true) API to automatically redeem invitations and suppress consent prompts for outbound access.
225+
1. Use the [Update crossTenantAccessPolicyConfigurationPartner](/graph/api/crosstenantaccesspolicyconfigurationpartner-update?branch=main) API to automatically redeem invitations and suppress consent prompts for outbound access.
226226
227227
**Request**
228228
229229
```http
230-
PATCH https://graph.microsoft.com/beta/policies/crossTenantAccessPolicy/partners/{targetTenantId}
230+
PATCH https://graph.microsoft.com/v1.0/policies/crossTenantAccessPolicy/partners/{targetTenantId}
231231
Content-Type: application/json
232232
233233
{
@@ -248,12 +248,12 @@ These steps describe how to use Microsoft Graph Explorer (recommended), but you
248248
249249
![Icon for the source tenant.](./media/common/icon-tenant-source.png)<br/>**Source tenant**
250250
251-
1. In the source tenant, use the [applicationTemplate: instantiate](/graph/api/applicationtemplate-instantiate?view=graph-rest-beta&preserve-view=true) API to add an instance of a configuration application from the Azure AD application gallery into your tenant.
251+
1. In the source tenant, use the [applicationTemplate: instantiate](/graph/api/applicationtemplate-instantiate?branch=main) API to add an instance of a configuration application from the Azure AD application gallery into your tenant.
252252
253253
**Request**
254254
255255
```http
256-
POST https://graph.microsoft.com/beta/applicationTemplates/518e5f48-1fc8-4c48-9387-9fdf28b0dfe7/instantiate
256+
POST https://graph.microsoft.com/v1.0/applicationTemplates/518e5f48-1fc8-4c48-9387-9fdf28b0dfe7/instantiate
257257
Content-type: application/json
258258
259259
{
@@ -268,7 +268,7 @@ These steps describe how to use Microsoft Graph Explorer (recommended), but you
268268
Content-type: application/json
269269
270270
{
271-
"@odata.context": "https://graph.microsoft.com/beta/$metadata#microsoft.graph.applicationServicePrincipal",
271+
"@odata.context": "https://graph.microsoft.com/v1.0/$metadata#microsoft.graph.applicationServicePrincipal",
272272
"application": {
273273
"objectId": "{objectId}",
274274
"appId": "{appId}",
@@ -330,7 +330,7 @@ These steps describe how to use Microsoft Graph Explorer (recommended), but you
330330
331331
Be sure to use the service principal object ID instead of the application ID.
332332
333-
2. In the source tenant, use the [synchronizationJob: validateCredentials](/graph/api/synchronization-synchronizationjob-validatecredentials?view=graph-rest-beta&preserve-view=true) API to test the connection to the target tenant and validate the credentials.
333+
2. In the source tenant, use the [synchronizationJob: validateCredentials](/graph/api/synchronization-synchronizationjob-validatecredentials?branch=main) API to test the connection to the target tenant and validate the credentials.
334334
335335
**Request**
336336
@@ -366,11 +366,11 @@ These steps describe how to use Microsoft Graph Explorer (recommended), but you
366366
367367
In the source tenant, to enable provisioning, create a provisioning job.
368368
369-
1. Determine the [synchronization template](/graph/api/resources/synchronization-synchronizationtemplate?view=graph-rest-beta&preserve-view=true) to use, such as `Azure2Azure`.
369+
1. Determine the [synchronization template](/graph/api/resources/synchronization-synchronizationtemplate?branch=main) to use, such as `Azure2Azure`.
370370
371371
A template has pre-configured synchronization settings.
372372
373-
1. In the source tenant, use the [Create synchronizationJob](/graph/api/synchronization-synchronizationjob-post?view=graph-rest-beta&preserve-view=true) API to create a provisioning job based on a template.
373+
1. In the source tenant, use the [Create synchronizationJob](/graph/api/synchronization-synchronizationjob-post?branch=main) API to create a provisioning job based on a template.
374374
375375
**Request**
376376
@@ -429,7 +429,7 @@ In the source tenant, to enable provisioning, create a provisioning job.
429429
430430
![Icon for the source tenant.](./media/common/icon-tenant-source.png)<br/>**Source tenant**
431431
432-
1. In the source tenant, use the [synchronization: secrets](/graph/api/synchronization-synchronization-secrets?view=graph-rest-beta&preserve-view=true) API to save your credentials.
432+
1. In the source tenant, use the [Add synchronization secrets](/graph/api/synchronization-synchronization-secrets?branch=main) API to save your credentials.
433433
434434
**Request**
435435
@@ -511,7 +511,7 @@ For cross-tenant synchronization to work, at least one internal user must be ass
511511
512512
Now that you have a configuration, you can test on-demand provisioning with one of your users.
513513
514-
1. In the source tenant, use the [synchronizationJob: provisionOnDemand](/graph/api/synchronization-synchronizationjob-provision-on-demand?view=graph-rest-beta&preserve-view=true) API to provision a test user on demand.
514+
1. In the source tenant, use the [synchronizationJob: provisionOnDemand](/graph/api/synchronization-synchronizationjob-provision-on-demand?branch=main) API to provision a test user on demand.
515515
516516
**Request**
517517
@@ -538,7 +538,7 @@ Now that you have a configuration, you can test on-demand provisioning with one
538538
539539
![Icon for the source tenant.](./media/common/icon-tenant-source.png)<br/>**Source tenant**
540540
541-
1. Now that the provisioning job is configured, in the source tenant, use the [Start synchronizationJob](/graph/api/synchronization-synchronizationjob-start?view=graph-rest-beta&preserve-view=true) API to start the provisioning job.
541+
1. Now that the provisioning job is configured, in the source tenant, use the [Start synchronizationJob](/graph/api/synchronization-synchronizationjob-start?branch=main) API to start the provisioning job.
542542
543543
**Request**
544544
@@ -557,7 +557,7 @@ Now that you have a configuration, you can test on-demand provisioning with one
557557
558558
![Icon for the source tenant.](./media/common/icon-tenant-source.png)<br/>**Source tenant**
559559
560-
1. Now that the provisioning job is running, in the source tenant, use the [Get synchronizationJob](/graph/api/synchronization-synchronizationjob-get?view=graph-rest-beta&preserve-view=true) API to monitor the progress of the current provisioning cycle as well as statistics to date such as the number of users and groups that have been created in the target system.
560+
1. Now that the provisioning job is running, in the source tenant, use the [Get synchronizationJob](/graph/api/synchronization-synchronizationjob-get?branch=main) API to monitor the progress of the current provisioning cycle as well as statistics to date such as the number of users and groups that have been created in the target system.
561561
562562
**Request**
563563
@@ -781,8 +781,8 @@ You are likely trying to create a configuration or object that already exists, p
781781
782782
1. If you have an existing object, instead of making a create request using `POST` or `PUT`, you might need to make an update request using `PATCH`, such as:
783783
784-
- [Update crossTenantAccessPolicyConfigurationPartner](/graph/api/crosstenantaccesspolicyconfigurationpartner-update?view=graph-rest-beta&preserve-view=true)
785-
- [Update crossTenantIdentitySyncPolicyPartner](/graph/api/crosstenantidentitysyncpolicypartner-update?view=graph-rest-beta&preserve-view=true)
784+
- [Update crossTenantAccessPolicyConfigurationPartner](/graph/api/crosstenantaccesspolicyconfigurationpartner-update?branch=main)
785+
- [Update crossTenantIdentitySyncPolicyPartner](/graph/api/crosstenantidentitysyncpolicypartner-update?branch=main)
786786
787787
#### Symptom - Directory_ObjectNotFound error
788788
@@ -805,9 +805,9 @@ You are likely trying to update an object that doesn't exist using `PATCH`.
805805
806806
1. If object doesn't exist, instead of making an update request using `PATCH`, you might need to make a create request using `POST` or `PUT`, such as:
807807
808-
- [Create identitySynchronization](/graph/api/crosstenantaccesspolicyconfigurationpartner-put-identitysynchronization?view=graph-rest-beta&preserve-view=true)
808+
- [Create identitySynchronization](/graph/api/crosstenantaccesspolicyconfigurationpartner-put-identitysynchronization?branch=main)
809809
810810
## Next steps
811811
812-
- [Azure AD synchronization API overview](/graph/api/resources/synchronization-overview?view=graph-rest-beta&preserve-view=true)
812+
- [Azure AD synchronization API overview](/graph/api/resources/synchronization-overview?branch=main)
813813
- [Tutorial: Develop and plan provisioning for a SCIM endpoint in Azure Active Directory](../app-provisioning/use-scim-to-provision-users-and-groups.md)

articles/active-directory/multi-tenant-organizations/cross-tenant-synchronization-overview.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: active-directory
88
ms.workload: identity
99
ms.subservice: multi-tenant-organizations
1010
ms.topic: overview
11-
ms.date: 05/05/2023
11+
ms.date: 05/14/2023
1212
ms.author: rolyon
1313
ms.custom: it-pro
1414

@@ -75,13 +75,13 @@ The following table shows the parts of cross-tenant synchronization and which te
7575

7676
[!INCLUDE [cross-tenant-synchronization-include](../includes/cross-tenant-synchronization-include.md)]
7777

78-
To configure this setting using Microsoft Graph, see the [Update crossTenantIdentitySyncPolicyPartner](/graph/api/crosstenantidentitysyncpolicypartner-update?view=graph-rest-beta&preserve-view=true) API. For more information, see [Configure cross-tenant synchronization](cross-tenant-synchronization-configure.md).
78+
To configure this setting using Microsoft Graph, see the [Update crossTenantIdentitySyncPolicyPartner](/graph/api/crosstenantidentitysyncpolicypartner-update?branch=main) API. For more information, see [Configure cross-tenant synchronization](cross-tenant-synchronization-configure.md).
7979

8080
## Automatic redemption setting
8181

8282
[!INCLUDE [automatic-redemption-include](../includes/automatic-redemption-include.md)]
8383

84-
To configure this setting using Microsoft Graph, see the [Update crossTenantAccessPolicyConfigurationPartner](/graph/api/crosstenantaccesspolicyconfigurationpartner-update?view=graph-rest-beta&preserve-view=true) API. For more information, see [Configure cross-tenant synchronization](cross-tenant-synchronization-configure.md).
84+
To configure this setting using Microsoft Graph, see the [Update crossTenantAccessPolicyConfigurationPartner](/graph/api/crosstenantaccesspolicyconfigurationpartner-update?branch=main) API. For more information, see [Configure cross-tenant synchronization](cross-tenant-synchronization-configure.md).
8585

8686
#### How do users know what tenants they belong to?
8787

articles/aks/TOC.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,11 @@
633633
- name: Troubleshoot Kubernetes Event-driven Autoscaler (KEDA)
634634
href: /troubleshoot/azure/azure-kubernetes/troubleshoot-kubernetes-event-driven-autoscaling-add-on?toc=/azure/aks/toc.json&bc=/azure/aks/breadcrumb/toc.json
635635
- name: Use cluster extensions
636-
href: cluster-extensions.md
636+
items:
637+
- name: About cluster extensions
638+
href: cluster-extensions.md
639+
- name: Use the Azure CLI
640+
href: deploy-extensions-az-cli.md
637641
- name: DevOps
638642
items:
639643
- name: Use Ansible to create AKS clusters

0 commit comments

Comments
 (0)