Skip to content

Commit d4bfea4

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into heidist-fresh
2 parents d3b168e + d18c342 commit d4bfea4

File tree

134 files changed

+1762
-1217
lines changed

Some content is hidden

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

134 files changed

+1762
-1217
lines changed

.openpublishing.publish.config.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -931,6 +931,12 @@
931931
"url": "https://github.com/Azure-Samples/cosmos-db-sql-api-dotnet-samples",
932932
"branch": "v3",
933933
"branch_mapping": {}
934+
},
935+
{
936+
"path_to_root": "azure-cosmos-mongodb-dotnet",
937+
"url": "https://github.com/Azure-Samples/cosmos-db-mongodb-api-dotnet-samples",
938+
"branch": "quickstart-test",
939+
"branch_mapping": {}
934940
}
935941
],
936942
"branch_target_mapping": {

.openpublishing.redirection.defender-for-iot.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/defender-for-iot/organizations/plan-network-monitoring.md",
5+
"redirect_url": "/azure/defender-for-iot/organizations/best-practices/plan-network-monitoring",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-identify-required-appliances.md",
510
"redirect_url": "/azure/defender-for-iot/organizations/ot-appliance-sizing",

articles/active-directory-domain-services/concepts-forest-trust.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.subservice: domain-services
1010
ms.workload: identity
1111
ms.topic: conceptual
12-
ms.date: 06/07/2021
12+
ms.date: 07/05/2022
1313
ms.author: justinha
1414
---
1515

@@ -280,11 +280,8 @@ Administrators can use *Active Directory Domains and Trusts*, *Netdom* and *Nlte
280280

281281
## Next steps
282282

283-
To learn more about forest trusts, see [How do forest trusts work in Azure AD DS?][concepts-trust]
284-
285283
To get started with creating a managed domain with a forest trust, see [Create and configure an Azure AD DS managed domain][tutorial-create-advanced]. You can then [Create an outbound forest trust to an on-premises domain][create-forest-trust].
286284

287285
<!-- LINKS - INTERNAL -->
288-
[concepts-trust]: concepts-forest-trust.md
289286
[tutorial-create-advanced]: tutorial-create-instance-advanced.md
290287
[create-forest-trust]: tutorial-create-forest-trust.md

articles/active-directory/app-provisioning/on-premises-scim-provisioning.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.service: active-directory
77
ms.subservice: app-provisioning
88
ms.topic: conceptual
99
ms.workload: identity
10-
ms.date: 11/17/2021
10+
ms.date: 07/05/2022
1111
ms.author: billmath
1212
ms.reviewer: arvinh
1313
---
@@ -27,7 +27,6 @@ The Azure Active Directory (Azure AD) provisioning service supports a [SCIM 2.0]
2727
To provision users to SCIM-enabled apps:
2828

2929
1. [Download](https://aka.ms/OnPremProvisioningAgent) the provisioning agent and copy it onto the virtual machine or server that your SCIM endpoint is hosted on.
30-
1. Copy the agent onto the virtual machine or server that your SCIM endpoint is hosted on.
3130
1. Open the provisioning agent installer, agree to the terms of service, and select **Install**.
3231
1. Open the provisioning agent wizard, and select **On-premises provisioning** when prompted for the extension you want to enable.
3332
1. Provide credentials for an Azure AD administrator when you're prompted to authorize. Hybrid administrator or global administrator is required.

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Provision a user on demand by using Azure Active Directory
2+
title: Provision a user or group on demand using the Azure Active Directory provisioning service
33
description: Learn how to provision users on demand in Azure Active Directory.
44
services: active-directory
55
author: kenwith
@@ -8,13 +8,13 @@ ms.service: active-directory
88
ms.subservice: app-provisioning
99
ms.workload: identity
1010
ms.topic: how-to
11-
ms.date: 03/09/2022
11+
ms.date: 06/30/2022
1212
ms.author: kenwith
1313
ms.reviewer: arvinh
1414
---
1515

1616
# On-demand provisioning in Azure Active Directory
17-
Use on-demand provisioning to provision a user into an application in seconds. Among other things, you can use this capability to:
17+
Use on-demand provisioning to provision a user or group in seconds. Among other things, you can use this capability to:
1818

1919
* Troubleshoot configuration issues quickly.
2020
* Validate expressions that you've defined.
@@ -27,7 +27,7 @@ Use on-demand provisioning to provision a user into an application in seconds. A
2727
1. Select your application, and then go to the provisioning configuration page.
2828
1. Configure provisioning by providing your admin credentials.
2929
1. Select **Provision on demand**.
30-
1. Search for a user by first name, last name, display name, user principal name, or email address.
30+
1. Search for a user by first name, last name, display name, user principal name, or email address. Alternatively, you can search for a group and pick up to 5 users.
3131
> [!NOTE]
3232
> For Cloud HR provisioning app (Workday/SuccessFactors to AD/Azure AD), the input value is different.
3333
> For Workday scenario, please provide "WorkerID" or "WID" of the user in Workday.
@@ -130,6 +130,7 @@ The **View details** section displays the attributes that were modified in the t
130130
#### Troubleshooting tips
131131

132132
* Failures for exporting changes can vary greatly. Check the [documentation for provisioning logs](../reports-monitoring/concept-provisioning-logs.md#error-codes) for common failures.
133+
* On-demand provisioning says the group or user can't be provisioned because they're not assigned to the application. Note that there is a replicate delay of up to a few minutes between when an object is assigned to an application and that assignment being honored by on-demand provisioning. You may need to wait a few minutes and try again.
133134

134135
## Frequently asked questions
135136

@@ -145,9 +146,9 @@ There are currently a few known limitations to on-demand provisioning. Post your
145146
> 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.
146147
147148
* Amazon Web Services (AWS) application does not support on-demand provisioning.
148-
* On-demand provisioning of groups and roles isn't supported.
149+
* On-demand provisioning of groups supports updating up to 5 members at a time
150+
* On-demand provisioning of roles isn't supported.
149151
* 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.
150-
* Provisioning multiple roles on a user isn't supported by on-demand provisioning.
151152

152153
## Next steps
153154

articles/active-directory/roles/admin-units-faq-troubleshoot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ sections:
5454
- question: |
5555
What does it mean to add a group to an administrative unit?
5656
answer: |
57-
Adding a group to an administrative unit brings the group itself into the management scope of any group administrator who is also scoped to that administrative unit. For more information, see [Administrative units in Azure Active Directory](administrative-units.md#groups).
57+
Adding a group to an administrative unit brings the group itself into the management scope of the administrative unit, but **not** the members of the group. For more information, see [Administrative units in Azure Active Directory](administrative-units.md#groups).
5858
5959
- question: |
6060
Can a resource (user, group, or device) be a member of more than one administrative unit?

articles/active-directory/roles/admin-units-members-add.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ms.collection: M365-identity-device-management
2222
> Administrative units support for devices is currently in PREVIEW.
2323
> See the [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/) for legal terms that apply to Azure features that are in beta, preview, or otherwise not yet released into general availability.
2424
25-
In Azure Active Directory (Azure AD), you can add users, groups, or devices to an administrative unit to restrict the scope of role permissions. Adding a group to an administrative unit brings the group itself into the management scope of any group administrator who is also scoped to that administrative unit. For additional details on what scoped administrators can do, see [Administrative units in Azure Active Directory](administrative-units.md).
25+
In Azure Active Directory (Azure AD), you can add users, groups, or devices to an administrative unit to restrict the scope of role permissions. Adding a group to an administrative unit brings the group itself into the management scope of the administrative unit, but **not** the members of the group. For additional details on what scoped administrators can do, see [Administrative units in Azure Active Directory](administrative-units.md).
2626

2727
This article describes how to add users, groups, or devices to administrative units manually. For information about how to add users or devices to administrative units dynamically using rules, see [Manage users or devices for an administrative unit with dynamic membership rules](admin-units-members-dynamic.md).
2828

articles/api-management/authorizations-how-to.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Four steps are needed to set up an authorization with the authorization code gra
7373
1. Sign in to your GitHub account if you're prompted to do so.
7474
1. Select **Authorize** so that the application can access the signed-in user’s account.
7575

76-
:::image type="content" source="media/authorizations-how-to/consent-to-authorization.png" alt-text="Screenshot of consenting to authorize with Github.":::
76+
:::image type="content" source="media/authorizations-how-to/consent-to-authorization.png" alt-text="Screenshot of consenting to authorize with GitHub.":::
7777

7878
After authorization, the browser is redirected to API Management and the window is closed. If prompted during redirection, select **Allow access**. In API Management, select **Next**.
7979
1. On the **Access policy** page, create an access policy so that API Management has access to use the authorization. Ensure that a managed identity is configured for API Management. [Learn more about managed identities in API Management](api-management-howto-use-managed-service-identity.md#create-a-system-assigned-managed-identity).

articles/app-service/environment/using-an-ase.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ In an ILB ASE, the domain suffix used for app creation is *.&lt;asename&gt;.apps
116116

117117
For information about how to create an ILB ASE, see [Create and use an ILB ASE][MakeILBASE].
118118

119-
The SCM URL is used to access the Kudu console or for publishing your app by using Web Deploy. For information on the Kudu console, see [Kudu console for Azure App Service][Kudu]. The Kudu console gives you a web UI for debugging, uploading files, editing files, and much more.
119+
The SCM URL is used to access the Kudu console or for publishing your app by using Web Deploy. The Kudu console gives you a web UI for debugging, uploading files, editing files, and much more.
120120

121121
### DNS configuration
122122

@@ -300,7 +300,6 @@ For more specific examples, use: az find "az appservice ase"
300300
[Pricing]: https://azure.microsoft.com/pricing/details/app-service/
301301
[ARMOverview]: ../../azure-resource-manager/management/overview.md
302302
[ConfigureSSL]: ../configure-ssl-certificate.md
303-
[Kudu]: https://azure.microsoft.com/resources/videos/super-secret-kudu-debug-console-for-azure-web-sites/
304303
[AppDeploy]: ../deploy-local-git.md
305304
[ASEWAF]: ./integrate-with-application-gateway.md
306305
[AppGW]: ../../web-application-firewall/ag/ag-overview.md

articles/azure-arc/data/includes/azure-arc-data-preview-release.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
---
22
author: MikeRayMSFT
3+
ms.author: mikeray
34
ms.service: azure-arc
45
ms.topic: include
5-
ms.date: 06/28/2022
6-
ms.author: mikeray
6+
ms.date: 07/05/2022
77
---
88

9-
The current preview released on June 28, 2022.
10-
11-
This preview is a test release.
9+
The current preview released on July 05, 2022.
1210

1311
|Component|Value|
1412
|-----------|-----------|
15-
|Container images registry/repository |`mcr.microsoft.com/arcdata/test`|
13+
|Container images registry/repository |`mcr.microsoft.com/arcdata/preview`|
1614
|Container images tag |`v1.9.0_2022-07-12`|
1715
|CRD names and version|`datacontrollers.arcdata.microsoft.com`: v1beta1, v1 through v6<br/>`exporttasks.tasks.arcdata.microsoft.com`: v1beta1, v1, v2<br/>`kafkas.arcdata.microsoft.com`: v1beta1<br/>`monitors.arcdata.microsoft.com`: v1beta1, v1, v2<br/>`sqlmanagedinstances.sql.arcdata.microsoft.com`: v1beta1, v1 through v6<br/>`postgresqls.arcdata.microsoft.com`: v1beta1, v1beta2<br/>`sqlmanagedinstancerestoretasks.tasks.sql.arcdata.microsoft.com`: v1beta1, v1<br/>`failovergroups.sql.arcdata.microsoft.com`: v1beta1, v1beta2, v1<br/>`activedirectoryconnectors.arcdata.microsoft.com`: v1beta1, v1beta2<br/>|
1816
|Azure Resource Manager (ARM) API version|2022-03-01-preview (No change)|
@@ -31,8 +29,9 @@ New for this release:
3129
- Added process level CPU and memory metrics to the monitoring dashboards for the SQL managed instance process.
3230
- syncSecondaryToCommit property is now available to be viewed and edited in Azure portal and Azure Data Studio.
3331
- Added ability to set the DNS name for the readableSecondaries service in Azure CLI and Azure portal.
32+
- Now collecting the agent.log, security.log and sqlagentstartup.log for Arc-enabled SQL Managed instance to ElasticSearch so they're searchable via Kibana and optionally uploading them to Azure Log Analytics.
33+
- There are more additional notifications when provisioning new SQL managed instances is blocked due to not exporting/uploading billing data to Azure.
3434

3535
- Data controller
3636
- Permissions required to deploy the Arc data controller have been reduced to a least-privilege level.
37-
- When deployed via the Azure CLI, the Arc data controller is now installed via a K8s job that uses a helm chart to do the installation. There's no change to the user experience.
38-
37+
- When deployed via the Azure CLI, the Arc data controller is now installed via a K8s job that uses a helm chart to do the installation. There's no change to the user experience.

0 commit comments

Comments
 (0)