Skip to content

Commit d241d27

Browse files
authored
Merge pull request #197884 from MicrosoftDocs/main
5/11 AM Publish
2 parents 98276a7 + 4980375 commit d241d27

File tree

350 files changed

+2584
-1387
lines changed

Some content is hidden

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

350 files changed

+2584
-1387
lines changed

articles/active-directory/fundamentals/toc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,3 +307,5 @@
307307
href: active-directory-data-storage-eu.md
308308
- name: Identity data storage for Australia and New Zealand
309309
href: active-directory-data-storage-australia-newzealand.md
310+
- name: Identity data storage for Japan
311+
href: active-directory-data-storage-japan.md

articles/active-directory/roles/custom-assign-powershell.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: active-directory
88
ms.workload: identity
99
ms.subservice: roles
1010
ms.topic: how-to
11-
ms.date: 09/07/2021
11+
ms.date: 05/10/2022
1212
ms.author: rolyon
1313
ms.reviewer: vincesm
1414
ms.custom: it-pro
@@ -52,7 +52,7 @@ To assign the role to a service principal instead of a user, use the [Get-AzureA
5252

5353
## Role definitions
5454

55-
Role definition objects contain the definition of the built-in or custom role, along with the permissions that are granted by that role assignment. This resource displays both custom role definitions and built-in directory roles (which are displayed in roleDefinition equivalent form). Today, an Azure AD organization can have a maximum of 30 unique custom role definitions defined.
55+
Role definition objects contain the definition of the built-in or custom role, along with the permissions that are granted by that role assignment. This resource displays both custom role definitions and built-in directory roles (which are displayed in roleDefinition equivalent form). For information about the maximum number of custom roles that can be created in an Azure AD organization, see [Azure AD service limits and restrictions](../enterprise-users/directory-service-limits-restrictions.md).
5656

5757
### Create a role definition
5858

articles/active-directory/saas-apps/adobe-identity-management-provisioning-tutorial.md

Lines changed: 41 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ This tutorial describes the steps you need to perform in both Adobe Identity Man
2525
## Capabilities supported
2626
> [!div class="checklist"]
2727
> * Create users in Adobe Identity Management
28-
> * Disable users in Adobe Identity Management when they do not require access anymore
28+
> * Remove users in Adobe Identity Management when they do not require access anymore
2929
> * Keep user attributes synchronized between Azure AD and Adobe Identity Management
3030
> * Provision groups and group memberships in Adobe Identity Management
31-
> * [Single sign-on](adobe-identity-management-tutorial.md) to Adobe Identity Management (recommended)
31+
> * Single sign-on to Adobe Identity Management (recommended)
3232
3333
## Prerequisites
3434

@@ -44,22 +44,22 @@ The scenario outlined in this tutorial assumes that you already have the followi
4444
4545
## Step 1. Plan your provisioning deployment
4646
1. Learn about [how the provisioning service works](../app-provisioning/user-provisioning.md).
47-
1. Determine who will be in [scope for provisioning](../app-provisioning/define-conditional-rules-for-provisioning-user-accounts.md).
48-
1. Determine what data to [map between Azure AD and Adobe Identity Management](../app-provisioning/customize-application-attributes.md).
47+
2. Determine who will be in [scope for provisioning](../app-provisioning/define-conditional-rules-for-provisioning-user-accounts.md).
48+
3. Determine what data to [map between Azure AD and Adobe Identity Management](../app-provisioning/customize-application-attributes.md).
4949

5050
## Step 2. Configure Adobe Identity Management to support provisioning with Azure AD
5151

5252
1. Login to [Adobe Admin Console](https://adminconsole.adobe.com/). Navigate to **Settings > Directory Details > Sync**.
5353

54-
1. Click **Add Sync**.
54+
2. Click **Add Sync**.
5555

5656
![Add](media/adobe-identity-management-provisioning-tutorial/add-sync.png)
5757

58-
1. Select **Sync users from Microsoft Azure** and click **Next**.
58+
3. Select **Sync users from Microsoft Azure** and click **Next**.
5959

6060
![Screenshot that shows 'Sync users from Microsoft Azure Active Directory' selected.](media/adobe-identity-management-provisioning-tutorial/sync-users.png)
6161

62-
1. Copy and save the **Tenant URL** and the **Secret token**. These values will be entered in the **Tenant URL** and **Secret Token** fields in the Provisioning tab of your Adobe Identity Management application in the Azure portal.
62+
4. Copy and save the **Tenant URL** and the **Secret token**. These values will be entered in the **Tenant URL** and **Secret Token** fields in the Provisioning tab of your Adobe Identity Management application in the Azure portal.
6363

6464
![Sync](media/adobe-identity-management-provisioning-tutorial/token.png)
6565

@@ -80,68 +80,71 @@ The Azure AD provisioning service allows you to scope who will be provisioned ba
8080

8181
This section guides you through the steps to configure the Azure AD provisioning service to create, update, and disable users and/or groups in TestApp based on user and/or group assignments in Azure AD.
8282

83+
> [!VIDEO https://www.youtube.com/embed/k2_fk7BY8Ow]
84+
85+
8386
### To configure automatic user provisioning for Adobe Identity Management in Azure AD:
8487

8588
1. Sign in to the [Azure portal](https://portal.azure.com). Select **Enterprise Applications**, then select **All applications**.
8689

8790
![Enterprise applications blade](common/enterprise-applications.png)
8891

89-
1. In the applications list, select **Adobe Identity Management**.
92+
2. In the applications list, select **Adobe Identity Management**.
9093

9194
![The Adobe Identity Management link in the Applications list](common/all-applications.png)
9295

93-
1. Select the **Provisioning** tab.
96+
3. Select the **Provisioning** tab.
9497

9598
![Provisioning tab](common/provisioning.png)
9699

97-
1. Set the **Provisioning Mode** to **Automatic**.
100+
4. Set the **Provisioning Mode** to **Automatic**.
98101

99102
![Provisioning tab automatic](common/provisioning-automatic.png)
100103

101-
1. Under the **Admin Credentials** section, input your Adobe Identity Management Tenant URL and Secret Token retrieved earlier from Step 2. Click **Test Connection** to ensure Azure AD can connect to Adobe Identity Management. If the connection fails, ensure your Adobe Identity Management account has Admin permissions and try again.
104+
5. Under the **Admin Credentials** section, input your Adobe Identity Management Tenant URL and Secret Token retrieved earlier from Step 2. Click **Test Connection** to ensure Azure AD can connect to Adobe Identity Management. If the connection fails, ensure your Adobe Identity Management account has Admin permissions and try again.
102105

103106
![Token](common/provisioning-testconnection-tenanturltoken.png)
104107

105-
1. In the **Notification Email** field, enter the email address of a person or group who should receive the provisioning error notifications and select the **Send an email notification when a failure occurs** check box.
108+
6. In the **Notification Email** field, enter the email address of a person or group who should receive the provisioning error notifications and select the **Send an email notification when a failure occurs** check box.
106109

107110
![Notification Email](common/provisioning-notification-email.png)
108111

109-
1. Select **Save**.
112+
7. Select **Save**.
110113

111-
1. Under the **Mappings** section, select **Synchronize Azure Active Directory Users to Adobe Identity Management**.
114+
8. Under the **Mappings** section, select **Synchronize Azure Active Directory Users to Adobe Identity Management**.
112115

113-
1. Review the user attributes that are synchronized from Azure AD to Adobe Identity Management in the **Attribute-Mapping** section. The attributes selected as **Matching** properties are used to match the user accounts in Adobe Identity Management for update operations. If you choose to change the [matching target attribute](../app-provisioning/customize-application-attributes.md), you will need to ensure that the Adobe Identity Management API supports filtering users based on that attribute. Select the **Save** button to commit any changes.
116+
9. Review the user attributes that are synchronized from Azure AD to Adobe Identity Management in the **Attribute-Mapping** section. The attributes selected as **Matching** properties are used to match the user accounts in Adobe Identity Management for update operations. If you choose to change the [matching target attribute](../app-provisioning/customize-application-attributes.md), you will need to ensure that the Adobe Identity Management API supports filtering users based on that attribute. Select the **Save** button to commit any changes.
114117

115-
|Attribute|Type|Supported for filtering|Required by Adobe Identity Management
116-
|---|---|---|---|
117-
|userName|String|✓|✓
118-
|active|Boolean||
119-
|emails[type eq "work"].value|String||
120-
|addresses[type eq "work"].country|String||
121-
|name.givenName|String||
122-
|name.familyName|String||
123-
|urn:ietf:params:scim:schemas:extension:Adobe:2.0:User:emailAliases|String||
118+
|Attribute|Type|
119+
|---|---|
120+
|userName|String|
121+
|emails[type eq "work"].value|String|
122+
|active|Boolean|
123+
|addresses[type eq "work"].country|String|
124+
|name.givenName|String|
125+
|name.familyName|String|
126+
|urn:ietf:params:scim:schemas:extension:Adobe:2.0:User:emailAliases|String|
124127

125-
1. Under the **Mappings** section, select **Synchronize Azure Active Directory Groups to Adobe Identity Management**.
128+
10. Under the **Mappings** section, select **Synchronize Azure Active Directory Groups to Adobe Identity Management**.
126129

127-
1. Review the group attributes that are synchronized from Azure AD to Adobe Identity Management in the **Attribute-Mapping** section. The attributes selected as **Matching** properties are used to match the groups in Adobe Identity Management for update operations. Select the **Save** button to commit any changes.
130+
11. Review the group attributes that are synchronized from Azure AD to Adobe Identity Management in the **Attribute-Mapping** section. The attributes selected as **Matching** properties are used to match the groups in Adobe Identity Management for update operations. Select the **Save** button to commit any changes.
128131

129-
|Attribute|Type|Supported for filtering|Required by Adobe Identity Management
130-
|---|---|---|---|
131-
|displayName|String|✓|✓
132-
|members|Reference||
132+
|Attribute|Type|
133+
|---|---|
134+
|displayName|String|
135+
|members|Reference|
133136

134-
1. To configure scoping filters, refer to the following instructions provided in the [Scoping filter tutorial](../app-provisioning/define-conditional-rules-for-provisioning-user-accounts.md).
137+
12. To configure scoping filters, refer to the following instructions provided in the [Scoping filter tutorial](../app-provisioning/define-conditional-rules-for-provisioning-user-accounts.md).
135138

136-
1. To enable the Azure AD provisioning service for Adobe Identity Management, change the **Provisioning Status** to **On** in the **Settings** section.
139+
13. To enable the Azure AD provisioning service for Adobe Identity Management, change the **Provisioning Status** to **On** in the **Settings** section.
137140

138141
![Provisioning Status Toggled On](common/provisioning-toggle-on.png)
139142

140-
1. Define the users and/or groups that you would like to provision to Adobe Identity Management by choosing the desired values in **Scope** in the **Settings** section.
143+
14. Define the users and/or groups that you would like to provision to Adobe Identity Management by choosing the desired values in **Scope** in the **Settings** section.
141144

142145
![Provisioning Scope](common/provisioning-scope.png)
143146

144-
1. When you are ready to provision, click **Save**.
147+
15. When you are ready to provision, click **Save**.
145148

146149
![Saving Provisioning Configuration](common/provisioning-configuration-save.png)
147150

@@ -150,11 +153,11 @@ This operation starts the initial synchronization cycle of all users and groups
150153
## Step 6. Monitor your deployment
151154
Once you've configured provisioning, use the following resources to monitor your deployment:
152155

153-
* Use the [provisioning logs](../reports-monitoring/concept-provisioning-logs.md) to determine which users have been provisioned successfully or unsuccessfully
154-
* Check the [progress bar](../app-provisioning/application-provisioning-when-will-provisioning-finish-specific-user.md) to see the status of the provisioning cycle and how close it is to completion
155-
* If the provisioning configuration seems to be in an unhealthy state, the application will go into quarantine. Learn more about quarantine states [here](../app-provisioning/application-provisioning-quarantine-status.md).
156+
1. Use the [provisioning logs](../reports-monitoring/concept-provisioning-logs.md) to determine which users have been provisioned successfully or unsuccessfully
157+
2. Check the [progress bar](../app-provisioning/application-provisioning-when-will-provisioning-finish-specific-user.md) to see the status of the provisioning cycle and how close it is to completion
158+
3. If the provisioning configuration seems to be in an unhealthy state, the application will go into quarantine. Learn more about quarantine states [here](../app-provisioning/application-provisioning-quarantine-status.md).
156159

157-
## More resources
160+
## Additional resources
158161

159162
* [Managing user account provisioning for Enterprise Apps](../app-provisioning/configure-automatic-user-provisioning-portal.md)
160163
* [What is application access and single sign-on with Azure Active Directory?](../manage-apps/what-is-single-sign-on.md)

articles/active-directory/saas-apps/zscaler-two-tutorial.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
119119

120120
![Copy configuration URLs](common/copy-configuration-urls.png)
121121

122+
> [!VIDEO https://www.youtube.com/embed/7SU5S0WtNNk]
123+
122124
### Create an Azure AD test user
123125

124126
In this section, you'll create a test user in the Azure portal called B.Simon.

articles/azure-arc/servers/manage-agent.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Managing the Azure Arc-enabled servers agent
33
description: This article describes the different management tasks that you will typically perform during the lifecycle of the Azure Connected Machine agent.
4-
ms.date: 04/15/2022
4+
ms.date: 05/11/2022
55
ms.topic: conceptual
66
---
77

@@ -69,7 +69,7 @@ This parameter specifies a resource in Azure Resource Manager to delete from Azu
6969
7070
To disconnect using a service principal, run the following command:
7171

72-
`azcmagent disconnect --service-principal-id <serviceprincipalAppID> --service-principal-secret <serviceprincipalPassword> --tenant-id <tenantID>`
72+
`azcmagent disconnect --service-principal-id <serviceprincipalAppID> --service-principal-secret <serviceprincipalPassword>`
7373

7474
To disconnect using an access token, run the following command:
7575

articles/azure-functions/configure-monitoring.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -391,10 +391,10 @@ To configure these values at App settings level (and avoid redeployment on just
391391
| Host.json path | App setting |
392392
|----------------|-------------|
393393
| logging.logLevel.default | AzureFunctionsJobHost__logging__logLevel__default |
394-
| logging.logLeve.Host.Aggregator | AzureFunctionsJobHost__logging__logLevel__Host__Aggregator |
394+
| logging.logLevel.Host.Aggregator | AzureFunctionsJobHost__logging__logLevel__Host__Aggregator |
395395
| logging.logLevel.Function | AzureFunctionsJobHost__logging__logLevel__Function |
396-
| logging.logLevel.Function.Function1 | AzureFunctionsJobHost__logging__logLevel__Function1 |
397-
| logging.logLevel.Function.Function1.User | AzureFunctionsJobHost__logging__logLevel__Function1.User |
396+
| logging.logLevel.Function.Function1 | AzureFunctionsJobHost__logging__logLevel__Function.Function1 |
397+
| logging.logLevel.Function.Function1.User | AzureFunctionsJobHost__logging__logLevel__Function.Function1.User |
398398

399399

400400
You can override the settings directly at the Azure portal Function App Configuration blade or by using an Azure CLI or PowerShell script.

articles/azure-functions/functions-app-settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ A Blob Storage SAS URL for a second storage account used for key storage. By def
203203

204204
|Key|Sample value|
205205
|--|--|
206-
|AzureWebJobsSecretStorageSa| `<BLOB_SAS_URL>` |
206+
|AzureWebJobsSecretStorageSas| `<BLOB_SAS_URL>` |
207207

208208
## AzureWebJobsSecretStorageType
209209

0 commit comments

Comments
 (0)