Skip to content

Commit 1260adc

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 8aea2d8 + 7c18afd commit 1260adc

File tree

214 files changed

+2101
-1255
lines changed

Some content is hidden

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

214 files changed

+2101
-1255
lines changed

.openpublishing.redirection.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24510,6 +24510,11 @@
2451024510
"redirect_url": "/azure/virtual-machines/workloads/sap/high-availability-multi-sid",
2451124511
"redirect_document_id": false
2451224512
},
24513+
{
24514+
"source_path": "articles/virtual-machines/virtual-machines-azure-slave-plugin-for-hudson-classic.md",
24515+
"redirect_url": "/azure/virtual-machines/",
24516+
"redirect_document_id": false
24517+
},
2451324518
{
2451424519
"source_path": "articles/virtual-machines/virtual-machines-windows-sap-planning-guide.md",
2451524520
"redirect_url": "/azure/virtual-machines/workloads/sap/planning-guide",
@@ -38602,7 +38607,7 @@
3860238607
},
3860338608
{
3860438609
"source_path": "articles/billing/billing-set-up-alerts.md",
38605-
"redirect_url": "/azure/billing/billing-getting-started",
38610+
"redirect_url": "/azure/cost-management-billing/costs/cost-mgt-alerts-monitor-usage-spending",
3860638611
"redirect_document_id": false
3860738612
},
3860838613
{
@@ -41704,6 +41709,11 @@
4170441709
"source_path": "articles/virtual-machines/windows/classic/capture-image-classic.md",
4170541710
"redirect_url": "/previous-versions/azure/virtual-machines/windows/classic/capture-image-classic",
4170641711
"redirect_document_id": false
41712+
},
41713+
{
41714+
"source_path": "articles/virtual-machines/virtual-machines-availability-set-supportability.md",
41715+
"redirect_url": "/azure/virtual-machines/troubleshooting/virtual-machines-availability-set-supportability",
41716+
"redirect_document_id": false
4170741717
},
4170841718
{
4170941719
"source_path": "articles/virtual-machines/windows/classic/configure-availability-classic.md",

articles/active-directory-b2c/azure-monitor.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ You authorize a user or group in your Azure AD B2C directory (the **Service Prov
4444

4545
This is the resource group containing the destination Azure storage account, event hub, or Log Analytics workspace to receive data from Azure Monitor. You specify the resource group name when you deploy the Azure Resource Manager template.
4646

47-
[Create a resource group](../azure-resource-manager/management/manage-resource-groups-portal.md#create-resource-groups) or choose an existing one the Azure Active Directory (Azure AD) tenant that contains your Azure subscription, *not* the directory that contains your Azure AD B2C tenant.
47+
[Create a resource group](../azure-resource-manager/management/manage-resource-groups-portal.md#create-resource-groups) or choose an existing one in the Azure Active Directory (Azure AD) tenant that contains your Azure subscription, *not* the directory that contains your Azure AD B2C tenant.
4848

4949
This example uses a resource group named *azure-ad-b2c-monitor* in the *Central US* region.
5050

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ You can use scoping filters to define attribute-based rules that determine which
8484
It's possible to use the Azure AD user provisioning service to provision B2B (or guest) users in Azure AD to SaaS applications.
8585
However, for B2B users to sign in to the SaaS application using Azure AD, the SaaS application must have its SAML-based single sign-on capability configured in a specific way. For more information on how to configure SaaS applications to support sign-ins from B2B users, see [Configure SaaS apps for B2B collaboration](../b2b/configure-saas-apps.md).
8686

87+
Note that the userPrincipalName for a guest user is often stored as "alias#EXT#@domain.com". when the userPrincipalName is included in your attribute mappings as a source attribute, the #EXT# is stripped from the userPrincipalName. If you require the #EXT# to be present, replace userPrincipalName with originalUserPrincipalName as the source attribute.
88+
8789
## Provisioning cycles: Initial and incremental
8890

8991
When Azure AD is the source system, the provisioning service uses the [Differential Query feature of the Azure AD Graph API](https://msdn.microsoft.com/Library/Azure/Ad/Graph/howto/azure-ad-graph-api-differential-query) to monitor users and groups. The provisioning service runs an initial cycle against the source system and target system, followed by periodic incremental cycles.

articles/active-directory/governance/entitlement-management-access-package-assignments.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ms.collection: M365-identity-device-management
2323
---
2424
# View, add, and remove assignments for an access package in Azure AD entitlement management
2525

26-
In Azure AD entitlement management, you can see who has been assigned to access packages, their policy, and status. If an access package has an appropriate policy, you can also directly assign user to an access package. This article describes how to view, add, and remove assignments for an access packages.
26+
In Azure AD entitlement management, you can see who has been assigned to access packages, their policy, and status. If an access package has an appropriate policy, you can also directly assign user to an access package. This article describes how to view, add, and remove assignments for access packages.
2727

2828
## View who has an assignment
2929

@@ -47,6 +47,10 @@ In Azure AD entitlement management, you can see who has been assigned to access
4747

4848
1. To download a CSV file of the filtered list, click **Download**.
4949

50+
### Viewing assignments programmatically
51+
52+
You can also retrieve assignments in an access package using Microsoft Graph. A user in an appropriate role with an application that has the delegated `EntitlementManagement.ReadWrite.All` permission can call the API to [list accessPackageAssignments](https://docs.microsoft.com/graph/api/accesspackageassignment-list?view=graph-rest-beta).
53+
5054
## Directly assign a user
5155

5256
In some cases, you might want to directly assign specific users to an access package so that users don't have to go through the process of requesting the access package. To directly assign users, the access package must have a policy that allows administrator direct assignments.
@@ -75,6 +79,10 @@ In some cases, you might want to directly assign specific users to an access pac
7579

7680
After a few moments, click **Refresh** to see the users in the Assignments list.
7781

82+
### Directly assigning users programmatically
83+
84+
You can also directly assign a user to an access package using Microsoft Graph. A user in an appropriate role with an application that has the delegated `EntitlementManagement.ReadWrite.All` permission can call the API to [create an accessPackageAssignmentRequest](https://docs.microsoft.com/graph/api/accesspackageassignmentrequest-post?view=graph-rest-beta).
85+
7886
## Remove an assignment
7987

8088
**Prerequisite role:** Global administrator, User administrator, Catalog owner, or Access package manager

articles/active-directory/governance/entitlement-management-access-package-create.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,18 @@ On the **Review + create** tab, you can review your settings and check for any v
129129

130130
The new access package appears in the list of access packages.
131131

132+
## Creating an access package programmatically
133+
134+
You can also create an access package using Microsoft Graph. A user in an appropriate role with an application that has the delegated `EntitlementManagement.ReadWrite.All` permission can call the API to
135+
136+
1. [List the accessPackageResources in the catalog](https://docs.microsoft.com/graph/api/accesspackagecatalog-list-accesspackageresources?view=graph-rest-beta) and [create an accessPackageResourceRequest](https://docs.microsoft.com/graph/api/accesspackageresourcerequest-post?view=graph-rest-beta) for any resources that are not yet in the catalog.
137+
1. [List the accessPackageResourceRoles](https://docs.microsoft.com/graph/api/accesspackagecatalog-list-accesspackageresourceroles?view=graph-rest-beta) of each accessPackageResource in an accessPackageCatalog. This list of roles will then be used to select a role, when subsequently creating an accessPackageResourceRoleScope.
138+
1. [Create an accessPackage](https://docs.microsoft.com/graph/api/accesspackage-post?view=graph-rest-beta).
139+
1. [Create an accessPackageAssignmentPolicy](https://docs.microsoft.com/graph/api/accesspackageassignmentpolicy-post?view=graph-rest-beta).
140+
1. [Create an accessPackageResourceRoleScope](https://docs.microsoft.com/graph/api/accesspackage-post-accesspackageresourcerolescopes?view=graph-rest-beta) for each resource role needed in the access package.
141+
132142
## Next steps
133143

134144
- [Share link to request an access package](entitlement-management-access-package-settings.md)
135145
- [Change resource roles for an access package](entitlement-management-access-package-resources.md)
146+
- [Directly assign a user to the access package](entitlement-management-access-package-assignments.md)

articles/active-directory/governance/entitlement-management-catalog-create.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ A catalog is a container of resources and access packages. You create a catalog
4949

5050
1. Click **Create** to create the catalog.
5151

52+
### Creating a catalog programmatically
53+
54+
You can also create a catalog using Microsoft Graph. A user in an appropriate role with an application that has the delegated `EntitlementManagement.ReadWrite.All` permission can call the API to [create an accessPackageCatalog](https://docs.microsoft.com/graph/api/accesspackagecatalog-post?view=graph-rest-beta).
55+
5256
## Add resources to a catalog
5357

5458
To include resources in an access package, the resources must exist in a catalog. The types of resources you can add are groups, applications, and SharePoint Online sites. The groups can be cloud-created Office 365 Groups or cloud-created Azure AD security groups. The applications can be Azure AD enterprise applications, including both SaaS applications and your own applications federated to Azure AD. The sites can be SharePoint Online sites or SharePoint Online site collections.
@@ -75,6 +79,10 @@ To include resources in an access package, the resources must exist in a catalog
7579

7680
These resources can now be included in access packages within the catalog.
7781

82+
### Adding a resource to a catalog programmatically
83+
84+
You can also add a resource to a catalog using Microsoft Graph. A user in an appropriate role, or a catalog and resource owner, with an application that has the delegated `EntitlementManagement.ReadWrite.All` permission can call the API to [create an accessPackageResourceRequest](https://docs.microsoft.com/graph/api/accesspackageresourcerequest-post?view=graph-rest-beta).
85+
7886
## Remove resources from a catalog
7987

8088
You can remove resources from a catalog. A resource can only be removed from a catalog if it is not being used in any of the catalog's access packages.
@@ -143,6 +151,10 @@ You can delete a catalog, but only if it does not have any access packages.
143151

144152
1. In the message box that appears, click **Yes**.
145153

154+
### Deleting a catalog programmatically
155+
156+
You can also delete a catalog using Microsoft Graph. A user in an appropriate role with an application that has the delegated `EntitlementManagement.ReadWrite.All` permission can call the API to [delete an accessPackageCatalog](https://docs.microsoft.com/graph/api/accesspackagecatalog-delete?view=graph-rest-beta).
157+
146158
## Next steps
147159

148160
- [Delegate access governance to access package managers](entitlement-management-delegate-managers.md)

articles/active-directory/governance/entitlement-management-delegate-catalog.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ ms.collection: M365-identity-device-management
2424

2525
# Delegate access governance to catalog creators in Azure AD entitlement management
2626

27-
To delegate to users who aren't administrators, so that they can create their own catalogs, you can add those users to the Azure AD entitlement management-defined catalog creator role. You can add individual users, or you can add a group, whose members are then able to create catalogs.
27+
A catalog is a container of resources and access packages. You create a catalog when you want to group related resources and access packages. By default, a Global administrator or a User administrator can [create a catalog](entitlement-management-catalog-create.md), and can add additional users as catalog owners.
28+
29+
To delegate to users who aren't administrators, so that they can create their own catalogs, you can add those users to the Azure AD entitlement management-defined catalog creator role. You can add individual users, or you can add a group, whose members are then able to create catalogs. After creating a catalog, they can subsequently add resources they own to their catalog.
2830

2931
## As an IT administrator, delegate to a catalog creator
3032

articles/active-directory/governance/entitlement-management-scenarios.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,10 @@ There are several ways that you can configure entitlement management for your or
149149
1. [View access packages for a user](entitlement-management-reports.md#view-access-packages-for-a-user)
150150
1. [View resource assignments for a user](entitlement-management-reports.md#view-resource-assignments-for-a-user)
151151

152+
## Programmatic administration
153+
154+
You can also manage access packages, catalogs, policies, requests and assignments using Microsoft Graph. A user in an appropriate role with an application that has the delegated `EntitlementManagement.ReadWrite.All` permission can call the [entitlement management API](https://docs.microsoft.com/graph/api/resources/entitlementmanagement-root?view=graph-rest-beta).
155+
152156
## Next steps
153157

154158
- [Delegation and roles](entitlement-management-delegate.md)

articles/active-directory/manage-apps/access-panel-collections.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.workload: identity
1313
ms.tgt_pltfrm: na
1414
ms.devlang: na
1515
ms.topic: article
16-
ms.date: 01/28/2020
16+
ms.date: 02/10/2020
1717
ms.author: mimart
1818
ms.reviewer: kasimpso
1919
ms.collection: M365-identity-device-management
@@ -26,7 +26,7 @@ Your users can use the My Apps portal to view and start the cloud-based applicat
2626
> [!NOTE]
2727
> This article covers how an admin can enable and create collections. For information for the end user about how to use the My Apps portal and collections, see [Access and use collections](https://docs.microsoft.com/azure/active-directory/user-help/my-applications-portal-workspaces).
2828
29-
## Enable My Apps preview features
29+
## Enable the latest My Apps features
3030

3131
1. Open the [**Azure portal**](https://portal.azure.com/) and sign in as a user administrator or Global Administrator.
3232

@@ -35,8 +35,8 @@ Your users can use the My Apps portal to view and start the cloud-based applicat
3535
3. Under **User feature previews**, select **Manage user feature preview settings**.
3636

3737
4. Under **Users can use preview features for My Apps**, choose one of the following options:
38-
* **Selected** - Enables preview features for a specific group. Use the **Select a group** option to select the group for which you want to enable preview features.
39-
* **All** - Enables preview features for all users.
38+
* **Selected** - Enables the features for a specific group. Use the **Select a group** option to select the group for which you want to enable the features.
39+
* **All** - Enables the features for all users.
4040

4141
> [!NOTE]
4242
> To open the My Apps portal, users can use the link `https://myapps.microsoft.com` or the customized link for your organization, such as `https://myapps.microsoft.com/contoso.com`. After you enable the new My Apps experience, the **An updated My Applications experience is available** banner will display at the top of the My Apps page, and users can select **Try it** to view the new experience. To stop using the new experience, users can select **Yes** from the **Leave new experience** banner at the top of the page.

articles/app-service/configure-connect-to-azure-storage.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ This guide shows how to access Azure Storage in Windows Containers. Only [Azure
3333
- Azure Storage in Windows containers is currently **not supported** for bring your own code scenarios on Windows App Service plans.
3434
- Azure Storage in Windows containers **doesn't support** using the **Storage Firewall** configuration because of infrastructure limitations.
3535
- Azure Storage in Windows containers lets you specify **up to five** mount points per app.
36+
- Azure Storage mounted to an app is not accessible through App Service FTP/FTPs endpoints. Use [Azure Storage explorer](https://azure.microsoft.com/features/storage-explorer/).
3637
- Azure Storage is billed independently and **not included** with your web app. Learn more about [Azure Storage pricing](https://azure.microsoft.com/pricing/details/storage).
3738

3839
## Link storage to your web app (preview)

0 commit comments

Comments
 (0)