Skip to content

Commit 504c9a8

Browse files
authored
Merge pull request #203894 from MicrosoftDocs/main
7/06 AM Publish
2 parents d0ded4a + 6f65b61 commit 504c9a8

File tree

155 files changed

+1847
-1144
lines changed

Some content is hidden

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

155 files changed

+1847
-1144
lines changed

articles/active-directory-b2c/partner-akamai.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Akamai WAF integration includes the following components:
4848

4949
- **Azure AD B2C Tenant** – The authorization server, responsible for verifying the user’s credentials using the custom policies defined in the tenant. It's also known as the identity provider.
5050

51-
- [**Azure Front Door**](../frontdoor/front-door-overview.md) – Responsible for enabling custom domains for Azure B2C tenant. All traffic from Cloudflare WAF will be routed to Azure Front Door before arriving at Azure AD B2C tenant.
51+
- [**Azure Front Door**](../frontdoor/front-door-overview.md) – Responsible for enabling custom domains for Azure B2C tenant. All traffic from Akamai WAF will be routed to Azure Front Door before arriving at Azure AD B2C tenant.
5252

5353
- [**Akamai WAF**](https://www.akamai.com/us/en/resources/waf.jsp) – The web application firewall, which manages all traffic that is sent to the authorization server.
5454

articles/active-directory/app-provisioning/application-provisioning-quarantine-status.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,11 @@ After the first failure, the first retry happens within the next 2 hours (usuall
8080
- The third retry happens 12 hours after the first failure.
8181
- The fourth retry happens 24 hours after the first failure.
8282
- The fifth retry happens 48 hours after the first failure.
83-
- The sixth retry happens 96 hours after the first failure
84-
- The seventh retry happens 168 hours after the first failure.
83+
- The sixth retry happens 72 hours after the first failure.
84+
- The seventh retry happens 96 hours after the first failure.
85+
- The eigth retry happens 120 hours after the first failure.
8586

86-
After the 7th failure, entry is flagged and no further retries are run.
87+
This cycle is repeated every 24 hours until the 30th day when retries are stopped and the job is disabled.
8788

8889

8990
## How do I get my application out of quarantine?

articles/active-directory/app-provisioning/provision-on-demand.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: active-directory
88
ms.subservice: app-provisioning
99
ms.workload: identity
1010
ms.topic: how-to
11-
ms.date: 06/30/2022
11+
ms.date: 07/06/2022
1212
ms.author: kenwith
1313
ms.reviewer: arvinh
1414
---
@@ -146,7 +146,6 @@ There are currently a few known limitations to on-demand provisioning. Post your
146146
> [!NOTE]
147147
> The following limitations are specific to the on-demand provisioning capability. For information about whether an application supports provisioning groups, deletions, or other capabilities, check the tutorial for that application.
148148
149-
* Amazon Web Services (AWS) application does not support on-demand provisioning.
150149
* On-demand provisioning of groups supports updating up to 5 members at a time
151150
* On-demand provisioning of roles isn't supported.
152151
* On-demand provisioning supports disabling users that have been unassigned from the application. However, it doesn't support disabling or deleting users that have been disabled or deleted from Azure AD. Those users won't appear when you search for a user.

articles/active-directory/cloud-infrastructure-entitlement-management/onboard-aws.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@ This article describes how to onboard an Amazon Web Services (AWS) account on Pe
1818
> [!NOTE]
1919
> A *global administrator* or *super admin* (an admin for all authorization system types) can perform the tasks in this article after the global administrator has initially completed the steps provided in [Enable Permissions Management on your Azure Active Directory tenant](onboard-enable-tenant.md).
2020
21-
22-
## View a training video on configuring and onboarding an AWS account
23-
24-
To view a video on how to configure and onboard AWS accounts in Permissions Management, select [Configure and onboard AWS accounts](https://www.youtube.com/watch?v=R6K21wiWYmE).
25-
2621
## Onboard an AWS account
2722

2823
1. If the **Data Collectors** dashboard isn't displayed when Permissions Management launches:

articles/active-directory/cloud-infrastructure-entitlement-management/onboard-azure.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@ To add Permissions Management to your Azure AD tenant:
2424
- You must have an Azure AD user account and an Azure command-line interface (Azure CLI) on your system, or an Azure subscription. If you don't already have one, [create a free account](https://azure.microsoft.com/free/).
2525
- You must have **Microsoft.Authorization/roleAssignments/write** permission at the subscription or management group scope to perform these tasks. If you don't have this permission, you can ask someone who has this permission to perform these tasks for you.
2626

27-
28-
## View a training video on enabling Permissions Management in your Azure AD tenant
29-
30-
To view a video on how to enable Permissions Management in your Azure AD tenant, select [Enable Permissions Management in your Azure AD tenant](https://www.youtube.com/watch?v=-fkfeZyevoo).
31-
3227
## How to onboard an Azure subscription
3328

3429
1. If the **Data Collectors** dashboard isn't displayed when Permissions Management launches:

articles/active-directory/cloud-infrastructure-entitlement-management/onboard-enable-tenant.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,6 @@ To enable Permissions Management in your organization:
2828
> [!NOTE]
2929
> During public preview, Permissions Management doesn't perform a license check.
3030
31-
## View a training video on enabling Permissions Management
32-
33-
- To view a video on how to enable Permissions Management in your Azure AD tenant, select [Enable Permissions Management in your Azure AD tenant](https://www.youtube.com/watch?v=-fkfeZyevoo).
34-
- To view a video on how to configure and onboard AWS accounts in Permissions Management, select [Configure and onboard AWS accounts](https://www.youtube.com/watch?v=R6K21wiWYmE).
35-
- To view a video on how to configure and onboard GCP accounts in Permissions Management, select [Configure and onboard GCP accounts](https://www.youtube.com/watch?app=desktop&v=W3epcOaec28).
36-
37-
3831
## How to enable Permissions Management on your Azure AD tenant
3932

4033
1. In your browser:

articles/active-directory/cloud-infrastructure-entitlement-management/onboard-gcp.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@ This article describes how to onboard a Google Cloud Platform (GCP) project on P
1818
> [!NOTE]
1919
> A *global administrator* or *super admin* (an admin for all authorization system types) can perform the tasks in this article after the global administrator has initially completed the steps provided in [Enable Permissions Management on your Azure Active Directory tenant](onboard-enable-tenant.md).
2020
21-
## View a training video on configuring and onboarding a GCP account
22-
23-
To view a video on how to configure and onboard GCP accounts in Permissions Management, select [Configure and onboard GCP accounts](https://www.youtube.com/watch?app=desktop&v=W3epcOaec28).
24-
25-
2621
## Onboard a GCP project
2722

2823
1. If the **Data Collectors** dashboard isn't displayed when Permissions Management launches:

articles/active-directory/develop/scenario-web-api-call-api-app-configuration.md

Lines changed: 48 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,16 @@ In the following example, the `GraphBeta` section specifies these settings.
4141
"AzureAd": {
4242
"Instance": "https://login.microsoftonline.com/",
4343
"ClientId": "[Client_id-of-web-api-eg-2ec40e65-ba09-4853-bcde-bcb60029e596]",
44-
"TenantId": "common"
45-
46-
// To call an API
47-
"ClientSecret": "[Copy the client secret added to the app from the Azure portal]",
48-
"ClientCertificates": [
49-
]
50-
},
51-
"GraphBeta": {
44+
"TenantId": "common",
45+
46+
// To call an API
47+
"ClientSecret": "[Copy the client secret added to the app from the Azure portal]",
48+
"ClientCertificates": []
49+
},
50+
"GraphBeta": {
5251
"BaseUrl": "https://graph.microsoft.com/beta",
5352
"Scopes": "user.read"
54-
}
53+
}
5554
}
5655
```
5756

@@ -62,16 +61,16 @@ Instead of a client secret, you can provide a client certificate. The following
6261
"AzureAd": {
6362
"Instance": "https://login.microsoftonline.com/",
6463
"ClientId": "[Client_id-of-web-api-eg-2ec40e65-ba09-4853-bcde-bcb60029e596]",
65-
"TenantId": "common"
66-
67-
// To call an API
68-
"ClientCertificates": [
64+
"TenantId": "common",
65+
66+
// To call an API
67+
"ClientCertificates": [
6968
{
7069
"SourceType": "KeyVault",
7170
"KeyVaultUrl": "https://msidentitywebsamples.vault.azure.net",
7271
"KeyVaultCertificateName": "MicrosoftIdentitySamplesCert"
7372
}
74-
]
73+
]
7574
},
7675
"GraphBeta": {
7776
"BaseUrl": "https://graph.microsoft.com/beta",
@@ -91,17 +90,17 @@ using Microsoft.Identity.Web;
9190

9291
public class Startup
9392
{
94-
// ...
95-
public void ConfigureServices(IServiceCollection services)
96-
{
97-
// ...
98-
services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
99-
.AddMicrosoftIdentityWebApi(Configuration, Configuration.GetSection("AzureAd"))
100-
.EnableTokenAcquisitionToCallDownstreamApi()
101-
.AddInMemoryTokenCaches();
102-
// ...
103-
}
104-
// ...
93+
// ...
94+
public void ConfigureServices(IServiceCollection services)
95+
{
96+
// ...
97+
services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
98+
.AddMicrosoftIdentityWebApi(Configuration, Configuration.GetSection("AzureAd"))
99+
.EnableTokenAcquisitionToCallDownstreamApi()
100+
.AddInMemoryTokenCaches();
101+
// ...
102+
}
103+
// ...
105104
}
106105
```
107106

@@ -119,18 +118,18 @@ using Microsoft.Identity.Web;
119118

120119
public class Startup
121120
{
122-
// ...
123-
public void ConfigureServices(IServiceCollection services)
124-
{
125-
// ...
126-
services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
127-
.AddMicrosoftIdentityWebApi(Configuration, Configuration.GetSection("AzureAd"))
128-
.EnableTokenAcquisitionToCallDownstreamApi()
129-
.AddMicrosoftGraph(Configuration.GetSection("GraphBeta"))
130-
.AddInMemoryTokenCaches();
131-
// ...
132-
}
133-
// ...
121+
// ...
122+
public void ConfigureServices(IServiceCollection services)
123+
{
124+
// ...
125+
services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
126+
.AddMicrosoftIdentityWebApi(Configuration, Configuration.GetSection("AzureAd"))
127+
.EnableTokenAcquisitionToCallDownstreamApi()
128+
.AddMicrosoftGraph(Configuration.GetSection("GraphBeta"))
129+
.AddInMemoryTokenCaches();
130+
// ...
131+
}
132+
// ...
134133
}
135134
```
136135

@@ -143,18 +142,18 @@ using Microsoft.Identity.Web;
143142

144143
public class Startup
145144
{
146-
// ...
147-
public void ConfigureServices(IServiceCollection services)
148-
{
149-
// ...
150-
services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
151-
.AddMicrosoftIdentityWebApi(Configuration, "AzureAd")
152-
.EnableTokenAcquisitionToCallDownstreamApi()
153-
.AddDownstreamWebApi("MyApi", Configuration.GetSection("GraphBeta"))
154-
.AddInMemoryTokenCaches();
155-
// ...
156-
}
157-
// ...
145+
// ...
146+
public void ConfigureServices(IServiceCollection services)
147+
{
148+
// ...
149+
services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
150+
.AddMicrosoftIdentityWebApi(Configuration, "AzureAd")
151+
.EnableTokenAcquisitionToCallDownstreamApi()
152+
.AddDownstreamWebApi("MyApi", Configuration.GetSection("GraphBeta"))
153+
.AddInMemoryTokenCaches();
154+
// ...
155+
}
156+
// ...
158157
}
159158
```
160159

articles/active-directory/reports-monitoring/howto-integrate-activity-logs-with-log-analytics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ If you want to know for how long the activity data is stored in a Premium tenant
8282
* To send audit logs to the Log Analytics workspace, select the **AuditLogs** check box.
8383
* To send sign-in logs to the Log Analytics workspace, select the **SignInLogs** check box.
8484
* To send non-interactive user sign-in logs to the Log Analytics workspace, select the **NonInteractiveUserSignInLogs** check box.
85-
* To send service principle sign-in logs to the Log Analytics workspace, select the **ServicePrincipleSignInLogs** check box.
85+
* To send service principal sign-in logs to the Log Analytics workspace, select the **ServicePrincipalSignInLogs** check box.
8686
* To send managed identity sign-in logs to the Log Analytics workspace, select the **ManagedIdentitySignInLogs** check box.
8787
* To send provisioning logs to the Log Analytics workspace, select the **ProvisioningLogs** check box.
8888
* To send Active Directory Federation Services (ADFS) sign-in logs to the Log Analytics workspace, select **ADFSSignInLogs**.

articles/active-directory/saas-apps/sap-analytics-cloud-provisioning-tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ The scenario outlined in this tutorial assumes that you already have the followi
5151

5252
## Step 2. Configure SAP Analytics Cloud to support provisioning with Azure AD
5353

54-
1. Sign into [SAP Identity Provisioning admin console](https://ips-xlnk9v890j.dispatcher.us1.hana.ondemand.com/) with your administrator account and then select **Proxy Systems**.
54+
1. Sign into the SAP Identity Provisioning admin console with your administrator account and then select **Proxy Systems**.
5555

5656
![SAP Proxy Systems](./media/sap-analytics-cloud-provisioning-tutorial/sap-proxy-systems.png)
5757

@@ -159,4 +159,4 @@ Once you've configured provisioning, use the following resources to monitor your
159159

160160
## Next steps
161161

162-
* [Learn how to review logs and get reports on provisioning activity](../app-provisioning/check-status-user-account-provisioning.md)
162+
* [Learn how to review logs and get reports on provisioning activity](../app-provisioning/check-status-user-account-provisioning.md)

0 commit comments

Comments
 (0)