Skip to content

Commit 4e0d69c

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into release-arm-markup
2 parents 34ae08f + 3869fda commit 4e0d69c

File tree

168 files changed

+3023
-1575
lines changed

Some content is hidden

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

168 files changed

+3023
-1575
lines changed

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18559,6 +18559,11 @@
1855918559
"redirect_url": "/azure/virtual-machines/workloads/redhat/redhat-rhui",
1856018560
"redirect_document_id": false
1856118561
},
18562+
{
18563+
"source_path": "articles/virtual-machines/linux/rhel-images.md",
18564+
"redirect_url": "/azure/virtual-machines/workloads/redhat/redhat-images",
18565+
"redirect_document_id": false
18566+
},
1856218567
{
1856318568
"source_path": "articles/virtual-machine-scale-sets/virtual-machine-scale-sets-advanced-autoscale.md",
1856418569
"redirect_url": "/azure/monitoring-and-diagnostics/insights-advanced-autoscale-virtual-machine-scale-sets",
@@ -49604,6 +49609,11 @@
4960449609
"source_path": "articles/postgresql/howto-tls-configurations.md",
4960549610
"redirect_url": "/azure/postgresql/concepts-ssl-connection-security",
4960649611
"redirect_document_id": false
49612+
},
49613+
{
49614+
"source_path": "articles/lab-services/classroom-labs/class-type-deep-learning-natural-processing.md",
49615+
"redirect_url": "/azure/lab-services/classroom-labs/class-type-deep-learning-natural-language-processing",
49616+
"redirect_document_id": false
4960749617
}
4960849618
]
4960949619
}

articles/active-directory-b2c/customize-ui-overview.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: celestedg
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: conceptual
12-
ms.date: 01/30/2020
12+
ms.date: 03/19/2020
1313
ms.author: mimart
1414
ms.subservice: B2C
1515
---
@@ -80,6 +80,7 @@ Review the following guidance before using your own HTML and CSS files to custom
8080
- Limited support for Internet Explorer 9 and 8
8181
- Google Chrome 42.0 and above
8282
- Mozilla Firefox 38.0 and above
83+
- Safari for iOS and macOS, version 12 and above
8384
- Don't include **form tags** in your HTML. Form tags interfere with the POST operations generated by the HTML injected by Azure AD B2C.
8485

8586
### Where do I store UI content?

articles/active-directory/app-provisioning/export-import-provisioning-configuration.md

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: 'Export or import your provisioning configuration by using the Microsoft Graph API | Microsoft Docs'
3-
description: Learn how to export and import provisioning configuration using the Microsoft Graph API.
2+
title: 'Export your provisioning configuration and roll back to a known good state for disaster recovery.| Microsoft Docs'
3+
description: Learn how to export your provisioning configuration and roll back to a known good state for disaster recovery.
44
services: active-directory
55
author: cmmdesai
66
documentationcenter: na
@@ -13,14 +13,15 @@ ms.devlang: na
1313
ms.topic: article
1414
ms.tgt_pltfrm: na
1515
ms.workload: identity
16-
ms.date: 09/09/2019
16+
ms.date: 03/19/2020
1717
ms.author: chmutali
1818

1919
ms.collection: M365-identity-device-management
2020
---
2121
# Export your provisioning configuration and roll back to a known good state
2222

2323
## Export and import your provisioning configuration from the Azure portal
24+
2425
### How can I export my provisioning configuration?
2526
To export your configuration:
2627
1. In the [Azure portal](https://portal.azure.com/), on the left navigation panel, select **Azure Active Directory**.
@@ -29,15 +30,22 @@ To export your configuration:
2930
5. Click on download in the command bar at the top of the page to download your schema.
3031

3132
### Disaster recovery - roll back to a known good state
32-
Exporting and saving your configuration allows you to roll back to a previous version of your configuration. We recommend exporting your provisioning configuration and saving it for later use anytime you make a change to your attribute mappings or scoping filters. All you need to do is open up the JSON file that you downloaded in the steps above, copy the entire contents of the JSON file, replace the entire contents of the JSON payload in the schema editor, and then save. If there is an active provisioning cycle, it will complete and the next cycle will use the updated schema. The next cycle will also be an initial cycle, which reevaluates every user and group based on the new configuration.
33-
## Step 1: Retrieve your Provisioning App Service Principal ID (Object ID)
33+
Exporting and saving your configuration allows you to roll back to a previous version of your configuration. We recommend exporting your provisioning configuration and saving it for later use anytime you make a change to your attribute mappings or scoping filters. All you need to do is open up the JSON file that you downloaded in the steps above, copy the entire contents of the JSON file, replace the entire contents of the JSON payload in the schema editor, and then save. If there is an active provisioning cycle, it will complete and the next cycle will use the updated schema. The next cycle will also be an initial cycle, which reevaluates every user and group based on the new configuration. Consider the following when rolling back to a previous configuration:
34+
* Users will be evaluated again to determine if they should be in scope. If the scoping filters have changed a user is not in scope any more they will be disabled. While this is the desired behavior in most cases, there are times where you may want to prevent this and can use the [skip out of scope deletions](https://docs.microsoft.com/azure/active-directory/app-provisioning/skip-out-of-scope-deletions) functionality.
35+
* Changing your provisioning configuration restarts the service and triggers an [initial cycle](https://docs.microsoft.com/azure/active-directory/app-provisioning/how-provisioning-works#provisioning-cycles-initial-and-incremental).
36+
37+
38+
## Export and import your provisioning configuration by using the Microsoft Graph API
39+
You can use the Microsoft Graph API and the Microsoft Graph Explorer to export your User Provisioning attribute mappings and schema to a JSON file and import it back into Azure AD. You can also use the steps captured here to create a backup of your provisioning configuration.
40+
41+
### Step 1: Retrieve your Provisioning App Service Principal ID (Object ID)
3442

35-
1. Launch the [Azure portal](https://portal.azure.com), and navigate to the Properties section of your provisioning application. For e.g. if you want to export your *Workday to AD User Provisioning application* mapping navigate to the Properties section of that app.
43+
1. Launch the [Azure portal](https://portal.azure.com), and navigate to the Properties section of your provisioning application. For example, if you want to export your *Workday to AD User Provisioning application* mapping navigate to the Properties section of that app.
3644
1. In the Properties section of your provisioning app, copy the GUID value associated with the *Object ID* field. This value is also called the **ServicePrincipalId** of your App and it will be used in Microsoft Graph Explorer operations.
3745

3846
![Workday App Service Principal ID](./media/export-import-provisioning-configuration/wd_export_01.png)
3947

40-
## Step 2: Sign into Microsoft Graph Explorer
48+
### Step 2: Sign into Microsoft Graph Explorer
4149

4250
1. Launch [Microsoft Graph Explorer](https://developer.microsoft.com/graph/graph-explorer)
4351
1. Click on the "Sign-In with Microsoft" button and sign-in using Azure AD Global Admin or App Admin credentials.
@@ -46,7 +54,7 @@ Exporting and saving your configuration allows you to roll back to a previous ve
4654

4755
1. Upon successful sign-in, you will see the user account details in the left-hand pane.
4856

49-
## Step 3: Retrieve the Provisioning Job ID of the Provisioning App
57+
### Step 3: Retrieve the Provisioning Job ID of the Provisioning App
5058

5159
In the Microsoft Graph Explorer, run the following GET query replacing [servicePrincipalId] with the **ServicePrincipalId** extracted from the [Step 1](#step-1-retrieve-your-provisioning-app-service-principal-id-object-id).
5260

@@ -58,7 +66,7 @@ You will get a response as shown below. Copy the "id attribute" present in the r
5866

5967
[![Provisioning Job ID](./media/export-import-provisioning-configuration/wd_export_03.png)](./media/export-import-provisioning-configuration/wd_export_03.png#lightbox)
6068

61-
## Step 4: Download the Provisioning Schema
69+
### Step 4: Download the Provisioning Schema
6270

6371
In the Microsoft Graph Explorer, run the following GET query, replacing [servicePrincipalId] and [ProvisioningJobId] with the ServicePrincipalId and the ProvisioningJobId retrieved in the previous steps.
6472

@@ -68,7 +76,7 @@ In the Microsoft Graph Explorer, run the following GET query, replacing [service
6876

6977
Copy the JSON object from the response and save it to a file to create a backup of the schema.
7078

71-
## Step 5: Import the Provisioning Schema
79+
### Step 5: Import the Provisioning Schema
7280

7381
> [!CAUTION]
7482
> Perform this step only if you need to modify the schema for configuration that cannot be changed using the Azure portal or if you need to restore the configuration from a previously backed up file with valid and working schema.

articles/active-directory/saas-apps/clickup-productivity-platform-tutorial.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,9 @@ To configure Azure AD single sign-on with ClickUp Productivity Platform, perform
118118

119119
1. In a different web browser window, sign-on to your ClickUp Productivity Platform tenant as an administrator.
120120

121-
2. Click on the **User profile** and select **Settings**.
121+
2. Click on the **User profile**, and then select **Settings**.
122+
123+
![ClickUp Productivity Configuration](./media/clickup-productivity-platform-tutorial/configure0.png)
122124

123125
![ClickUp Productivity Configuration](./media/clickup-productivity-platform-tutorial/configure1.png)
124126

@@ -193,7 +195,9 @@ In this section, you enable Britta Simon to use Azure single sign-on by granting
193195

194196
1. In a different web browser window, sign-on to your ClickUp Productivity Platform tenant as an administrator.
195197

196-
2. Click on the **User profile** and select **Users**.
198+
2. Click on the **User profile**, and then select **People**.
199+
200+
![ClickUp Productivity Configuration](./media/clickup-productivity-platform-tutorial/configure0.png)
197201

198202
![ClickUp Productivity Configuration](./media/clickup-productivity-platform-tutorial/user1.png)
199203

@@ -202,7 +206,7 @@ In this section, you enable Britta Simon to use Azure single sign-on by granting
202206
![ClickUp Productivity Configuration](./media/clickup-productivity-platform-tutorial/user2.png)
203207

204208
> [!NOTE]
205-
> The user will get the notification and they must accept the invitation to activate the account.
209+
> The user will receive the notification and must accept the invitation to activate the account.
206210
207211
### Test single sign-on
208212

0 commit comments

Comments
 (0)