Skip to content

Commit f100e3e

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into general-articles-batch-3
2 parents ca42c08 + 6d39868 commit f100e3e

File tree

678 files changed

+10772
-11147
lines changed

Some content is hidden

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

678 files changed

+10772
-11147
lines changed

.openpublishing.publish.config.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -878,6 +878,12 @@
878878
"branch": "docs-snippets",
879879
"branch_mapping": {}
880880
},
881+
{
882+
"path_to_root": "ms-identity-python-webapp",
883+
"url": "https://github.com/Azure-Samples/ms-identity-python-webapp",
884+
"branch": "main",
885+
"branch_mapping": {}
886+
},
881887
{
882888
"path_to_root": "ms-identity-node",
883889
"url": "https://github.com/Azure-Samples/ms-identity-node",
@@ -937,6 +943,12 @@
937943
"url": "https://github.com/Azure-Samples/azure-cache-redis-samples",
938944
"branch": "main",
939945
"branch_mapping": {}
946+
},
947+
{
948+
"path_to_root": "microsoft-graph",
949+
"url": "https://github.com/MicrosoftGraph/microsoft-graph-docs",
950+
"branch": "main",
951+
"branch_mapping": {}
940952
}
941953
],
942954
"branch_target_mapping": {

.openpublishing.redirection.azure-monitor.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,16 @@
4545
"redirect_url": "/azure/azure-monitor/app/app-insights-overview",
4646
"redirect_document_id": false
4747
},
48+
{
49+
"source_path_from_root": "/articles/azure-monitor/app/correlation.md",
50+
"redirect_url": "/previous-versions/azure/azure-monitor/app/distributed-tracing-telemetry-correlation",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path_from_root": "/articles/azure-monitor/app/distributed-tracing.md",
55+
"redirect_url": "/previous-versions/azure/azure-monitor/app/distributed-tracing-telemetry-correlation",
56+
"redirect_document_id": false
57+
},
4858
{
4959
"source_path_from_root": "/articles/azure-monitor/app/console.md",
5060
"redirect_url": "/previous-versions/azure/azure-monitor/app/console",

.openpublishing.redirection.azure-resource-manager.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,6 +1395,11 @@
13951395
"redirect_url": "/azure/azure-resource-manager/managed-applications/cli-samples",
13961396
"redirect_document_id": false
13971397
},
1398+
{
1399+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/cli-samples.md",
1400+
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
1401+
"redirect_document_id": false
1402+
},
13981403
{
13991404
"source_path_from_root": "/articles/managed-applications/concepts-custom-providers-built-in-policy.md",
14001405
"redirect_url": "/azure/azure-resource-manager/custom-providers/concepts-built-in-policy",
@@ -1585,6 +1590,11 @@
15851590
"redirect_url": "/azure/azure-resource-manager/managed-applications/powershell-samples",
15861591
"redirect_document_id": false
15871592
},
1593+
{
1594+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/powershell-samples.md",
1595+
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
1596+
"redirect_document_id": false
1597+
},
15881598
{
15891599
"source_path_from_root": "/articles/managed-applications/publish-managed-app-definition-quickstart.md",
15901600
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
@@ -1889,6 +1899,26 @@
18891899
"source_path_from_root": "/articles/xplat-cli-azure-resource-manager.md",
18901900
"redirect_url": "/azure/azure-resource-manager/management/manage-resources-cli",
18911901
"redirect_document_id": false
1902+
},
1903+
{
1904+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/scripts/managed-application-define-create-cli-sample.md",
1905+
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
1906+
"redirect_document_id": false
1907+
},
1908+
{
1909+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/scripts/managed-application-powershell-sample-create-definition.md",
1910+
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
1911+
"redirect_document_id": false
1912+
},
1913+
{
1914+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/scripts/managed-application-poweshell-sample-create-application.md",
1915+
"redirect_url": "/azure/azure-resource-manager/managed-applications/deploy-service-catalog-quickstart",
1916+
"redirect_document_id": false
1917+
},
1918+
{
1919+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/scripts/managed-application-powershell-sample-get-managed-group-resize-vm.md",
1920+
"redirect_url": "/azure/azure-resource-manager/managed-applications/overview",
1921+
"redirect_document_id": false
18921922
}
18931923
]
18941924
}

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7548,6 +7548,11 @@
75487548
"redirect_url": "/azure/reliability/reliability-functions",
75497549
"redirect_document_id": false
75507550
},
7551+
{
7552+
"source_path_from_root": "/articles/azure-functions/functions-bindings-triggers-python.md",
7553+
"redirect_url": "/azure/azure-functions/functions-reference-python?pivots=python-mode-decorators#triggers-and-inputs",
7554+
"redirect_document_id": false
7555+
},
75517556
{
75527557
"source_path_from_root": "/articles/azure-government/documentation-government-k8.md",
75537558
"redirect_url": "/azure/azure-government",

articles/active-directory-domain-services/concepts-custom-attributes.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ Azure AD supports adding custom data to resources using [extensions](/graph/exte
2323
- [onPremisesExtensionAttributes](/graph/extensibility-overview?tabs=http#extension-attributes) are a set of 15 attributes that can store extended user string attributes.
2424
- [Directory extensions](/graph/extensibility-overview?tabs=http#directory-azure-ad-extensions) allow the schema extension of specific directory objects, such as users and groups, with strongly typed attributes through registration with an application in the tenant.
2525

26-
Both types of extensions can be configured By using Azure AD Connect for users who are managed on-premises, or MSGraph APIs for cloud-only users.
26+
Both types of extensions can be configured by using Azure AD Connect for users who are managed on-premises, or Microsoft Graph APIs for cloud-only users.
2727

2828
>[!Note]
2929
>The following types of extensions aren't supported for synchronization:
30-
>- Custom Security Attributes in Azure AD (Preview)
31-
>- MSGraph Schema Extensions
32-
>- MSGraph Open Extensions
30+
>- Custom security attributes in Azure AD (Preview)
31+
>- Microsoft Graph schema extensions
32+
>- Microsoft Graph open extensions
3333
3434

3535
## Requirements
@@ -72,4 +72,4 @@ To check the backfilling status, click **Azure AD DS Health** and verify the **S
7272

7373
To configure onPremisesExtensionAttributes or directory extensions for cloud-only users in Azure AD, see [Custom data options in Microsoft Graph](/graph/extensibility-overview?tabs=http#custom-data-options-in-microsoft-graph).
7474

75-
To sync onPremisesExtensionAttributes or directory extensions from on-premises to Azure AD, [configure Azure AD Connect](../active-directory/hybrid/how-to-connect-sync-feature-directory-extensions.md).
75+
To sync onPremisesExtensionAttributes or directory extensions from on-premises to Azure AD, [configure Azure AD Connect](../active-directory/hybrid/how-to-connect-sync-feature-directory-extensions.md).

articles/active-directory/app-provisioning/how-provisioning-works.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: active-directory
88
ms.subservice: app-provisioning
99
ms.topic: conceptual
1010
ms.workload: identity
11-
ms.date: 03/30/2023
11+
ms.date: 03/31/2023
1212
ms.author: kenwith
1313
ms.reviewer: arvinh
1414
---
@@ -104,7 +104,7 @@ When the provisioning service is started, the first cycle will:
104104

105105
5. If a matching user is found, it's updated using the attributes provided by the source system. After the user account is matched, the provisioning service detects and caches the target system's ID for the new user. This ID is used to run all future operations on that user.
106106

107-
6. If the attribute mappings contain "reference" attributes, the service does additional updates on the target system to create and link the referenced objects. For example, a user may have a "Manager" attribute in the target system, which is linked to another user created in the target system.
107+
6. If the attribute mappings contain "reference" attributes, the service does more updates on the target system to create and link the referenced objects. For example, a user may have a "Manager" attribute in the target system, which is linked to another user created in the target system.
108108

109109
7. Persist a watermark at the end of the initial cycle, which provides the starting point for the later incremental cycles.
110110

@@ -124,7 +124,7 @@ After the initial cycle, all other cycles will:
124124

125125
5. If a matching user is found, it's updated using the attributes provided by the source system. If it's a newly assigned account that is matched, the provisioning service detects and caches the target system's ID for the new user. This ID is used to run all future operations on that user.
126126

127-
6. If the attribute mappings contain "reference" attributes, the service does additional updates on the target system to create and link the referenced objects. For example, a user may have a "Manager" attribute in the target system, which is linked to another user created in the target system.
127+
6. If the attribute mappings contain "reference" attributes, the service does more updates on the target system to create and link the referenced objects. For example, a user may have a "Manager" attribute in the target system, which is linked to another user created in the target system.
128128

129129
7. If a user that was previously in scope for provisioning is removed from scope, including being unassigned, the service disables the user in the target system via an update.
130130

@@ -137,10 +137,10 @@ After the initial cycle, all other cycles will:
137137
> [!NOTE]
138138
> You can optionally disable the **Create**, **Update**, or **Delete** operations by using the **Target object actions** check boxes in the [Mappings](customize-application-attributes.md) section. The logic to disable a user during an update is also controlled via an attribute mapping from a field such as *accountEnabled*.
139139
140-
The provisioning service continues running back-to-back incremental cycles indefinitely, at intervals defined in the [tutorial specific to each application](../saas-apps/tutorial-list.md). Incremental cycles continue until one of the following events occurs:
140+
The provisioning service continues running back-to-back incremental cycles indefinitely, at intervals defined in the [tutorial specific to each application](../saas-apps/tutorial-list.md). Incremental cycles continue until one of the events occurs:
141141

142142
- The service is manually stopped using the Azure portal, or using the appropriate Microsoft Graph API command.
143-
- A new initial cycle is triggered using the **Restart provisioning** option in the Azure portal, or using the appropriate Microsoft Graph API command. This action clears any stored watermark and causes all source objects to be evaluated again. This won't break the links between source and target objects. To break the links use [Restart synchronizationJob](/graph/api/synchronization-synchronizationjob-restart?view=graph-rest-beta&tabs=http&preserve-view=true) with the following request:
143+
- A new initial cycle is triggered using the **Restart provisioning** option in the Azure portal, or using the appropriate Microsoft Graph API command. The action clears any stored watermark and causes all source objects to be evaluated again. Also, the action doesn't break the links between source and target objects. To break the links, use [Restart synchronizationJob](/graph/api/synchronization-synchronizationjob-restart?view=graph-rest-beta&tabs=http&preserve-view=true) with the request:
144144

145145
<!-- {
146146
"blockType": "request",
@@ -157,7 +157,7 @@ Content-type: application/json
157157
}
158158
```
159159
- A new initial cycle is triggered because of a change in attribute mappings or scoping filters. This action also clears any stored watermark and causes all source objects to be evaluated again.
160-
- The provisioning process goes into quarantine (see below) because of a high error rate, and stays in quarantine for more than four weeks. In this event, the service will be automatically disabled.
160+
- The provisioning process goes into quarantine (see example) because of a high error rate, and stays in quarantine for more than four weeks. In this event, the service will be automatically disabled.
161161

162162
### Errors and retries
163163

@@ -200,7 +200,7 @@ Confirm the mapping for *active* for your application. If your using an applicat
200200

201201
**Configure your application to delete a user**
202202

203-
The following scenarios will trigger a disable or a delete:
203+
The scenarios will trigger a disable or a delete:
204204
* A user is soft deleted in Azure AD (sent to the recycle bin / AccountEnabled property set to false).
205205
30 days after a user is deleted in Azure AD, they're permanently deleted from the tenant. At this point, the provisioning service sends a DELETE request to permanently delete the user in the application. At any time during the 30-day window, you can [manually delete a user permanently](../fundamentals/active-directory-users-restore.md), which sends a delete request to the application.
206206
* A user is permanently deleted / removed from the recycle bin in Azure AD.
@@ -211,13 +211,13 @@ The following scenarios will trigger a disable or a delete:
211211

212212
By default, the Azure AD provisioning service soft deletes or disables users that go out of scope. If you want to override this default behavior, you can set a flag to [skip out-of-scope deletions.](skip-out-of-scope-deletions.md)
213213

214-
If one of the above four events occurs and the target application doesn't support soft deletes, the provisioning service will send a DELETE request to permanently delete the user from the app.
214+
If one of the four events occurs and the target application doesn't support soft deletes, the provisioning service will send a DELETE request to permanently delete the user from the app.
215215

216216
If you see an attribute IsSoftDeleted in your attribute mappings, it's used to determine the state of the user and whether to send an update request with active = false to soft delete the user.
217217

218218
**Deprovisioning events**
219219

220-
The following table describes how you can configure deprovisioning actions with the Azure AD provisioning service. These rules are written with the non-gallery / custom application in mind, but generally apply to applications in the gallery. However, the behavior for gallery applications can differ as they have been optimized to meet the needs of the application. For example, the Azure AD provisioning service may always sende a request to hard delete users in certain applications rather than soft deleting, if the target application doesn't support soft deleting users.
220+
The table describes how you can configure deprovisioning actions with the Azure AD provisioning service. These rules are written with the non-gallery / custom application in mind, but generally apply to applications in the gallery. However, the behavior for gallery applications can differ as they've been optimized to meet the needs of the application. For example, the Azure AD provisioning service may always sende a request to hard delete users in certain applications rather than soft deleting, if the target application doesn't support soft deleting users.
221221

222222
|Scenario|How to configure in Azure AD|
223223
|--|--|
@@ -230,7 +230,7 @@ The following table describes how you can configure deprovisioning actions with
230230

231231
**Known limitations**
232232

233-
* If a user that was previously managed by the provisioning service is unassigned from an app, or from a group assigned to an app we will send a disable request. At that point, the user isn't managed by the service and we won't send a delete request when they're deleted from the directory.
233+
* If a user that was previously managed by the provisioning service is unassigned from an app, or from a group assigned to an app then a disable request is sent. At that point, the user isn't managed by the service and a delete request isn't sent when the user is deleted from the directory.
234234
* Provisioning a user that is disabled in Azure AD isn't supported. They must be active in Azure AD before they're provisioned.
235235
* When a user goes from soft-deleted to active, the Azure AD provisioning service will activate the user in the target app, but won't automatically restore the group memberships. The target application should maintain the group memberships for the user in inactive state. If the target application doesn't support this, you can restart provisioning to update the group memberships.
236236

articles/active-directory/authentication/how-to-authentication-methods-manage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ If you aren't using SSPR and aren't yet using the Authentication methods policy,
3838

3939
### Review the legacy MFA policy
4040

41-
Start by documenting which methods are available in the legacy MFA policy. Sign in to the [Azure portal](https://portal.azure.com) as a [Global Administrator](../roles/permissions-reference.md#global-administrator). Go to **Azure Active Directory** > **Security** > **Multifactor Authentication** > **Additional cloud-based multifactor authentication settings** to view the settings. These settings are tenant-wide, so there's no need for user or group information.
41+
Start by documenting which methods are available in the legacy MFA policy. Sign in to the [Azure portal](https://portal.azure.com) as a [Global Administrator](../roles/permissions-reference.md#global-administrator). Go to **Azure Active Directory** > **Users** > **All users** > **Per-user MFA** > **service settings** to view the settings. These settings are tenant-wide, so there's no need for user or group information.
4242

4343
:::image type="content" border="false" source="media/how-to-authentication-methods-manage/legacy-mfa-policy.png" alt-text="Screenshot the shows the legacy Azure AD MFA policy." lightbox="media/how-to-authentication-methods-manage/legacy-mfa-policy.png":::
4444

articles/active-directory/authentication/how-to-certificate-based-authentication.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,10 @@ To enable the certificate-based authentication and configure user bindings in th
7272
1. To delete a CA certificate, select the certificate and click **Delete**.
7373
1. Click **Columns** to add or delete columns.
7474

75-
### Configure certification authorities using PowerShell
75+
>[!NOTE]
76+
>Upload of new CAs will fail when any of the existing CAs are expired. Tenant Admin should delete the expired CAs and then upload the new CA.
77+
78+
### Configure certification authorities(CA) using PowerShell
7679

7780
Only one CRL Distribution Point (CDP) for a trusted CA is supported. The CDP can only be HTTP URLs. Online Certificate Status Protocol (OCSP) or Lightweight Directory Access Protocol (LDAP) URLs aren't supported.
7881

@@ -87,6 +90,9 @@ Only one CRL Distribution Point (CDP) for a trusted CA is supported. The CDP can
8790
[!INCLUDE [Get-AzureAD](../../../includes/active-directory-authentication-get-trusted-azuread.md)]
8891
### Add
8992

93+
>[!NOTE]
94+
>Upload of new CAs will fail when any of the existing CAs are expired. Tenant Admin should delete the expired CAs and then upload the new CA.
95+
9096
[!INCLUDE [New-AzureAD](../../../includes/active-directory-authentication-new-trusted-azuread.md)]
9197

9298
**AuthorityType**

articles/active-directory/conditional-access/concept-conditional-access-report-only.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: conditional-access
88
ms.topic: conceptual
9-
ms.date: 01/24/2023
9+
ms.date: 03/30/2023
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo
@@ -31,7 +31,7 @@ Report-only mode is a new Conditional Access policy state that allows administra
3131
> [!WARNING]
3232
> Policies in report-only mode that require compliant devices may prompt users on Mac, iOS, and Android to select a device certificate during policy evaluation, even though device compliance is not enforced. These prompts may repeat until the device is made compliant. To prevent end users from receiving prompts during sign-in, exclude device platforms Mac, iOS and Android from report-only policies that perform device compliance checks. Note that report-only mode is not applicable for Conditional Access policies with "User Actions" scope.
3333
34-
![Report-only tab in Azure AD sign-in log](./media/concept-conditional-access-report-only/report-only-detail-in-sign-in-log.png)
34+
![Screenshot showing the report-only tab in a sign-in log.](./media/concept-conditional-access-report-only/report-only-detail-in-sign-in-log.png)
3535

3636
## Policy results
3737

0 commit comments

Comments
 (0)