Skip to content

Commit 420327a

Browse files
authored
Merge pull request #159239 from MicrosoftDocs/master
5/18 AM Publish
2 parents 83cf64d + 335dcad commit 420327a

File tree

134 files changed

+1183
-1086
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

+1183
-1086
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5028,6 +5028,11 @@
50285028
"redirect_url": "/azure/architecture/reference-architectures/dmz/secure-vnet-hybrid",
50295029
"redirect_document_id": false
50305030
},
5031+
{
5032+
"source_path_from_root": "/articles/logic-apps/parameterize-workflow-app.md",
5033+
"redirect_url": "/azure/logic-apps/",
5034+
"redirect_document_id": false
5035+
},
50315036
{
50325037
"source_path_from_root": "/articles/logic-apps/logic-apps-architectures-simple-enterprise-integration.md",
50335038
"redirect_url": "/azure/architecture/reference-architectures/enterprise-integration/basic-enterprise-integration",

articles/active-directory/saas-apps/jostle-provisioning-tutorial.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@ The Azure AD provisioning service allows you to scope who will be provisioned ba
9292

9393
This section guides you through the steps to configure the Azure AD provisioning service to create, update, and disable users and groups in Jostle app based on user and group assignments in Azure AD.
9494

95+
> [!NOTE]
96+
> For more information on automatic user provisioning to Jostle, see [User-Provisioning-Azure-Integration](https://forum.jostle.us/hc/en-us/articles/360056368534-User-Provisioning-Azure-Integration).
97+
9598
### To configure automatic user provisioning for Jostle in Azure AD:
9699

97100
1. Sign in to the [Azure portal](https://portal.azure.com). Select **Enterprise Applications**, then select **All applications**.
@@ -102,7 +105,7 @@ This section guides you through the steps to configure the Azure AD provisioning
102105

103106
![The Jostle link in the Applications list](common/all-applications.png)
104107

105-
1. Select the **Provisioning** tab.
108+
1. Select the **Provisioning** tab and click **Get Started**.
106109

107110
![Provisioning tab](common/provisioning.png)
108111

@@ -114,13 +117,13 @@ This section guides you through the steps to configure the Azure AD provisioning
114117

115118
![Token](common/provisioning-testconnection-tenanturltoken.png)
116119

117-
1. In the **Notification Email** field, enter the email address of a person or group who should receive the provisioning error notifications. Select the **Send an email notification when a failure occurs** check box.
120+
1. In the **Notification Email** field, enter the email address of a person or group who should receive the provisioning error notifications. Select the **Send an email notification when a failure occurs** check box. But to be noted, Jostle will also send provisioning failure notifications, so this is optional.
118121

119122
![Notification Email](common/provisioning-notification-email.png)
120123

121124
1. Select **Save**.
122125

123-
1. In the **Mappings** section, select **Synchronize Azure Active Directory Users to Jostle**.
126+
1. In the **Mappings** section, select **Provision Azure Active Directory Users to Jostle**.
124127

125128
1. Review the user attributes that are synchronized from Azure AD to Jostle in the **Attribute Mapping** section. The attributes selected as **Matching** properties are used to match the user accounts in Jostle for update operations. If you change the [matching target attribute](../app-provisioning/customize-application-attributes.md), you'll need to ensure that the Jostle API supports filtering users based on that attribute. Select **Save** to commit any changes.
126129

@@ -143,7 +146,7 @@ This section guides you through the steps to configure the Azure AD provisioning
143146

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

146-
1. Define the users or groups that you want to provision to Jostle by selecting the desired values in **Scope** in the **Settings** section.
149+
1. Define the users or groups that you want to provision to Jostle by selecting the desired values in **Scope** in the **Settings** section.For Jostle, the **Scope** should be set to "Sync only assigned users and groups".
147150

148151
![Provisioning Scope](common/provisioning-scope.png)
149152

articles/active-directory/saas-apps/purecloud-by-genesys-provisioning-tutorial.md

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ This tutorial describes the steps you need to perform in both PureCloud by Genes
3131
The scenario outlined in this tutorial assumes that you already have the following prerequisites:
3232

3333
* [An Azure AD tenant](../develop/quickstart-create-new-tenant.md)
34-
* A user account in Azure AD with [permission](../roles/permissions-reference.md) to configure provisioning (e.g. Application Administrator, Cloud Application administrator, Application Owner, or Global Administrator).
34+
* A user account in Azure AD with [permission](../roles/permissions-reference.md) to configure provisioning (for example, Application Administrator, Cloud Application administrator, Application Owner, or Global Administrator).
3535
* A PureCloud [organization](https://help.mypurecloud.com/?p=81984).
3636
* A User with [permissions](https://help.mypurecloud.com/?p=24360) to create an Oauth Client.
3737

@@ -48,7 +48,7 @@ The scenario outlined in this tutorial assumes that you already have the followi
4848

4949
## Step 3. Add PureCloud by Genesys from the Azure AD application gallery
5050

51-
Add PureCloud by Genesys from the Azure AD application gallery to start managing provisioning to PureCloud by Genesys. If you have previously setup PureCloud by Genesys for SSO you can use the same application. However it is recommended that you create a separate app when testing out the integration initially. Learn more about adding an application from the gallery [here](../manage-apps/add-application-portal.md).
51+
Add PureCloud by Genesys from the Azure AD application gallery to start managing provisioning to PureCloud by Genesys. If you have previously setup PureCloud by Genesys for SSO, you can use the same application. However it is recommended that you create a separate app when testing out the integration initially. Learn more about adding an application from the gallery [here](../manage-apps/add-application-portal.md).
5252

5353
## Step 4. Define who will be in scope for provisioning
5454

@@ -81,7 +81,7 @@ This section guides you through the steps to configure the Azure AD provisioning
8181

8282
![Screenshot of the Provisioning Mode dropdown list with the Automatic option called out.](common/provisioning-automatic.png)
8383

84-
5. Under the **Admin Credentials** section, input your PureCloud by Genesys API URL and Oauth Token in the **Tenant URL** and **Secret Token** fields respectively. The API URL will be be structured as `{{API Url}}/api/v2/scim/v2`, using the API URL for your PureCloud region from the [PureCloud Developer Center](https://developer.mypurecloud.com/api/rest/index.html). Click **Test Connection** to ensure Azure AD can connect to PureCloud by Genesys. If the connection fails, ensure your PureCloud by Genesys account has Admin permissions and try again.
84+
5. Under the **Admin Credentials** section, input your PureCloud by Genesys API URL and Oauth Token in the **Tenant URL** and **Secret Token** fields respectively. The API URL will be structured as `{{API Url}}/api/v2/scim/v2`, using the API URL for your PureCloud region from the [PureCloud Developer Center](https://developer.mypurecloud.com/api/rest/index.html). Click **Test Connection** to ensure Azure AD can connect to PureCloud by Genesys. If the connection fails, ensure your PureCloud by Genesys account has Admin permissions and try again.
8585

8686
![Screenshot shows the Admin Credentials dialog box, where you can enter your Tenant U R L and Secret Token.](./media/purecloud-by-genesys-provisioning-tutorial/provisioning.png)
8787

@@ -95,27 +95,36 @@ This section guides you through the steps to configure the Azure AD provisioning
9595

9696
9. Review the user attributes that are synchronized from Azure AD to PureCloud by Genesys in the **Attribute-Mapping** section. The attributes selected as **Matching** properties are used to match the user accounts in PureCloud by Genesys 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 PureCloud by Genesys API supports filtering users based on that attribute. Select the **Save** button to commit any changes.
9797

98-
|Attribute|Type|
99-
|---|---|
100-
|userName|String|
98+
|Attribute|Type|Supported for filtering|
99+
|---|---|---|
100+
|userName|String|✓|
101101
|active|Boolean|
102102
|displayName|String|
103103
|emails[type eq "work"].value|String|
104104
|title|String|
105105
|phoneNumbers[type eq "mobile"].value|String|
106106
|phoneNumbers[type eq "work"].value|String|
107+
|phoneNumbers[type eq "work2"].value|String|
108+
|phoneNumberss[type eq "work3"].value|String|
109+
|phoneNumbers[type eq "work4"].value|String|
110+
|phoneNumbers[type eq "home"].value|String|
111+
|phoneNumbers[type eq "microsoftteams"].value|String|
112+
|roles|String|
107113
|urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:department|String|
108114
|urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:manager|Reference|
109115
|urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:employeeNumber|String|
110-
116+
|urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:division|String|
117+
|urn:ietf:params:scim:schemas:extension:genesys:purecloud:2.0:User:externalIds[authority eq ‘microsoftteams’].value|String|
118+
|urn:ietf:params:scim:schemas:extension:genesys:purecloud:2.0:User:externalIds[authority eq ‘ringcentral’].value|String|
119+
|urn:ietf:params:scim:schemas:extension:genesys:purecloud:2.0:User:externalIds[authority eq ‘zoomphone].value|String|
111120

112121
10. Under the **Mappings** section, select **Synchronize Azure Active Directory Groups to PureCloud by Genesys**.
113122

114123
11. Review the group attributes that are synchronized from Azure AD to PureCloud by Genesys in the **Attribute-Mapping** section. The attributes selected as **Matching** properties are used to match the groups in PureCloud by Genesys for update operations. Select the **Save** button to commit any changes. PureCloud by Genesys does not support group creation or deletion and only supports updating of groups.
115124

116-
|Attribute|Type|
117-
|---|---|
118-
|displayName|String|
125+
|Attribute|Type|Supported for filtering|
126+
|---|---|---|
127+
|displayName|String|✓|
119128
|externalId|String|
120129
|members|Reference|
121130

@@ -144,9 +153,10 @@ Once you've configured provisioning, use the following resources to monitor your
144153

145154
## Change log
146155

147-
09/10 - Added support for enterprise attribute "employeeNumber".
156+
* 09/10/2020 - Added support for extension enterprise attribute **employeeNumber**.
157+
* 05/18/2021 - Added support for core attributes **phoneNumbers[type eq "work2"]**, **phoneNumbers[type eq "work3"]**, **phoneNumbers[type eq "work4"]**, **phoneNumbers[type eq "home"]**, **phoneNumbers[type eq "microsoftteams"]** and roles. And also added support for custom extension attributes **urn:ietf:params:scim:schemas:extension:genesys:purecloud:2.0:User:externalIds[authority eq ‘microsoftteams’]**, **urn:ietf:params:scim:schemas:extension:genesys:purecloud:2.0:User:externalIds[authority eq ‘zoomphone]** and **urn:ietf:params:scim:schemas:extension:genesys:purecloud:2.0:User:externalIds[authority eq ‘ringcentral’]**.
148158

149-
## Additional resources
159+
## More resources
150160

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

articles/aks/availability-zones.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,12 @@ Volumes that use Azure managed disks are currently not zone-redundant resources.
5454

5555
Kubernetes is aware of Azure availability zones since version 1.12. You can deploy a PersistentVolumeClaim object referencing an Azure Managed Disk in a multi-zone AKS cluster and [Kubernetes will take care of scheduling](https://kubernetes.io/docs/setup/best-practices/multiple-zones/#storage-access-for-zones) any pod that claims this PVC in the correct availability zone.
5656

57+
### Azure Resource Manager templates and availability zones
58+
59+
When *creating* an AKS cluster, if you explicitly define a [null value in a template][arm-template-null] with syntax such as `"availabilityZones": null`, the Resource Manager template treats the property as if it doesn't exist, which means your cluster won’t have availability zones enabled. Also, if you create a cluster with a Resource Manager template that omits the availability zones property, availability zones are disabled.
60+
61+
You can't update settings for availability zones on an existing cluster, so the behavior is different when updating am AKS cluster with Resource Manager templates. If you explicitly set a null value in your template for availability zones and *update* your cluster, there are no changes made to your cluster for availability zones. However, if you omit the availability zones property with syntax such as `"availabilityZones": []`, the deployment attempts to disable availability zones on your existing AKS cluster and **fails**.
62+
5763
## Overview of availability zones for AKS clusters
5864

5965
Availability zones are a high-availability offering that protects your applications and data from datacenter failures. Zones are unique physical locations within an Azure region. Each zone is made up of one or more datacenters equipped with independent power, cooling, and networking. To ensure resiliency, there's always more than one zone in all zone enabled regions. The physical separation of availability zones within a region protects applications and data from datacenter failures.
@@ -201,6 +207,7 @@ This article detailed how to create an AKS cluster that uses availability zones.
201207
[az-aks-nodepool-add]: /cli/azure/aks/nodepool#az_aks_nodepool_add
202208
[az-aks-get-credentials]: /cli/azure/aks#az_aks_get_credentials
203209
[vmss-zone-balancing]: ../virtual-machine-scale-sets/virtual-machine-scale-sets-use-availability-zones.md#zone-balancing
210+
[arm-template-null]: ../azure-resource-manager/templates/template-expressions.md#null-values
204211

205212
<!-- LINKS - external -->
206213
[kubectl-describe]: https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#describe

articles/aks/enable-host-encryption.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ title: Enable host-based encryption on Azure Kubernetes Service (AKS)
33
description: Learn how to configure a host-based encryption in an Azure Kubernetes Service (AKS) cluster
44
services: container-service
55
ms.topic: article
6-
ms.date: 03/03/2021
7-
ms.custom: devx-track-azurepowershell, devx-track-azurecli
6+
ms.date: 04/26/2021
7+
ms.custom: devx-track-azurepowershell
8+
89

910
---
1011

@@ -22,7 +23,9 @@ This feature can only be set at cluster creation or node pool creation time.
2223
2324
### Prerequisites
2425

25-
- The Azure CLI version 2.23.0 or later
26+
27+
- Ensure you have the CLI extension v2.23 or higher version installed.
28+
2629

2730
### Limitations
2831

0 commit comments

Comments
 (0)