Skip to content

Commit 35546ce

Browse files
authored
Merge pull request #103422 from MicrosoftDocs/master
2/05 AM Publish
2 parents f0f73c5 + 857068d commit 35546ce

32 files changed

+313
-217
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ ms.workload: identity
1111
ms.topic: conceptual
1212
ms.author: marsma
1313
ms.subservice: B2C
14-
ms.date: 02/03/2020
14+
ms.date: 02/05/2020
1515
---
1616

1717
# Monitor Azure AD B2C with Azure Monitor
1818

19-
Use Azure Monitor to route Azure Active Directory B2C (Azure AD B2C) usage activity events to different monitoring solutions. You can retain the logs for long-term use or integrate with third-party security information and event management (SIEM) tools to gain insights into your environment.
19+
Use Azure Monitor to route Azure Active Directory B2C (Azure AD B2C) sign-in and [auditing](view-audit-logs.md) logs to different monitoring solutions. You can retain the logs for long-term use or integrate with third-party security information and event management (SIEM) tools to gain insights into your environment.
2020

2121
You can route log events to:
2222

articles/active-directory-b2c/string-transformations.md

Lines changed: 70 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: celestedg
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: reference
12-
ms.date: 02/04/2020
12+
ms.date: 02/05/2020
1313
ms.author: marsma
1414
ms.subservice: B2C
1515
---
@@ -77,7 +77,7 @@ The self-asserted technical profile calls the validation **login-NonInteractive*
7777
- Input claims:
7878
- **inputClaim1**: [email protected]
7979
- **inputClaim2**: [email protected]
80-
- Input parameters:
80+
- Input parameters:
8181
- **stringComparison**: ordinalIgnoreCase
8282
- Result: Error thrown
8383

@@ -358,6 +358,74 @@ Use this claims transformation to format any string with two parameters, {0} and
358358
- Output claims:
359359
- **outputClaim**: Joe Fernando
360360

361+
## GetLocalizedStringsTransformation
362+
363+
Copies localized strings into claims.
364+
365+
| Item | TransformationClaimType | Data Type | Notes |
366+
| ---- | ----------------------- | --------- | ----- |
367+
| OutputClaim | The name of the localized string | string | List of claim types that is produced after this claims transformation has been invoked. |
368+
369+
To use the GetLocalizedStringsTransformation claims transformation:
370+
371+
1. Define a [localization string](localization.md) and associate it with a [self-asserted-technical-profile](self-asserted-technical-profile.md).
372+
1. The `ElementType` of the `LocalizedString` element must set to `GetLocalizedStringsTransformationClaimType`.
373+
1. The `StringId` is a unique identifier that you define, and use it later in your claims transformation.
374+
1. In the claims transformation specify the list of claims to be set with the localized string. The `ClaimTypeReferenceId` is a reference to a ClaimType already defined in the ClaimsSchema section in the policy. The `TransformationClaimType` is the name of the localized string as defined in the `StringId` of the `LocalizedString` element.
375+
1. In a [self-asserted technical profile](self-asserted-technical-profile.md), or a [display control](display-controls.md) input or output claims transformation, make a reference to your claims transformation.
376+
377+
The following example looks up the email subject, body, your code message, and the signature of the email, from localized strings. These claims later used by custom email verification template.
378+
379+
Define localized strings for English (default) and Spanish.
380+
381+
```XML
382+
<Localization Enabled="true">
383+
<SupportedLanguages DefaultLanguage="en" MergeBehavior="Append">
384+
<SupportedLanguage>en</SupportedLanguage>
385+
<SupportedLanguage>es</SupportedLanguage>
386+
</SupportedLanguages>
387+
388+
<LocalizedResources Id="api.localaccountsignup.en">
389+
<LocalizedStrings>
390+
<LocalizedString ElementType="GetLocalizedStringsTransformationClaimType" StringId="email_subject">Contoso account email verification code</LocalizedString>
391+
<LocalizedString ElementType="GetLocalizedStringsTransformationClaimType" StringId="email_message">Thanks for verifying your account!</LocalizedString>
392+
<LocalizedString ElementType="GetLocalizedStringsTransformationClaimType" StringId="email_code">Your code is</LocalizedString>
393+
<LocalizedString ElementType="GetLocalizedStringsTransformationClaimType" StringId="email_signature">Sincerely</LocalizedString>
394+
</LocalizedStrings>
395+
</LocalizedResources>
396+
<LocalizedResources Id="api.localaccountsignup.es">
397+
<LocalizedStrings>
398+
<LocalizedString ElementType="GetLocalizedStringsTransformationClaimType" StringId="email_subject">Código de verificación del correo electrónico de la cuenta de Contoso</LocalizedString>
399+
<LocalizedString ElementType="GetLocalizedStringsTransformationClaimType" StringId="email_message">Gracias por comprobar la cuenta de </LocalizedString>
400+
<LocalizedString ElementType="GetLocalizedStringsTransformationClaimType" StringId="email_code">Su código es</LocalizedString>
401+
<LocalizedString ElementType="GetLocalizedStringsTransformationClaimType" StringId="email_signature">Atentamente</LocalizedString>
402+
</LocalizedStrings>
403+
</LocalizedResources>
404+
</Localization>
405+
```
406+
407+
The claims transformation sets the value of the claim type *subject* with the value of the string id *email_subject*.
408+
409+
```XML
410+
<ClaimsTransformation Id="GetLocalizedStringsForEmail" TransformationMethod="GetLocalizedStringsTransformation">
411+
<OutputClaims>
412+
<OutputClaim ClaimTypeReferenceId="subject" TransformationClaimType="email_subject" />
413+
<OutputClaim ClaimTypeReferenceId="message" TransformationClaimType="email_message" />
414+
<OutputClaim ClaimTypeReferenceId="codeIntro" TransformationClaimType="email_code" />
415+
<OutputClaim ClaimTypeReferenceId="signature" TransformationClaimType="email_signature" />
416+
</OutputClaims>
417+
</ClaimsTransformation>
418+
```
419+
420+
### Example
421+
422+
- Output claims:
423+
- **subject**: Contoso account email verification code
424+
- **message**: Thanks for verifying your account!
425+
- **codeIntro**: Your code is
426+
- **signature**: Sincerely
427+
428+
361429
## GetMappedValueFromLocalizedCollection
362430

363431
Looking up an item from a claim **Restriction** collection.

articles/active-directory/privileged-identity-management/azure-ad-custom-roles-activate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Activate an Azure AD custom role in Privileged Identity Management (PIM)| Microsoft Docs
2+
title: Activate Azure AD custom role - Privileged Identity Management (PIM)
33
description: How to activate an Azure AD custom role for assignment Privileged Identity Management (PIM)
44
services: active-directory
55
documentationcenter: ''

articles/active-directory/privileged-identity-management/azure-ad-custom-roles-assign.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Assign an Azure AD custom role in Privileged Identity Management (PIM) | Microsoft Docs
2+
title: Assign Azure AD custom role - Privileged Identity Management (PIM)
33
description: How to assign an Azure AD custom role for assignment Privileged Identity Management (PIM)
44
services: active-directory
55
documentationcenter: ''

articles/active-directory/privileged-identity-management/azure-ad-custom-roles-configure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Configure Azure AD custom roles in Privileged Identity Management (PIM)| Microsoft Docs
2+
title: Configure Azure AD custom role - Privileged Identity Management (PIM)
33
description: How to configure Azure AD custom roles in Privileged Identity Management (PIM)
44
services: active-directory
55
documentationcenter: ''

articles/active-directory/privileged-identity-management/azure-ad-custom-roles-update-remove.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Update or remove an Azure AD custom role assignment in Privileged Identity Management (PIM) | Microsoft Docs
2+
title: Update or remove Azure AD custom role - Privileged Identity Management (PIM)
33
description: How to update or remove an Azure AD custom role assignment Privileged Identity Management (PIM)
44
services: active-directory
55
documentationcenter: ''

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ The scenario outlined in this tutorial assumes that you already have the followi
2929
* An Azure Active directory tenant
3030
* A GitHub organization created in [GitHub Enterprise Cloud](https://help.github.com/articles/github-s-products/#github-enterprise), which requires the [GitHub Enterprise billing plan](https://help.github.com/articles/github-s-billing-plans/#billing-plans-for-organizations)
3131
* A user account in GitHub with Admin permissions to the organization
32+
* Ensure that OAuth access has been provided for your organization as described [here](https://help.github.com/en/github/setting-up-and-managing-organizations-and-teams/approving-oauth-apps-for-your-organization)
3233

3334
> [!NOTE]
3435
> The Azure AD provisioning integration relies on the [GitHub SCIM API](https://developer.github.com/v3/scim/), which is available to [GitHub Enterprise Cloud](https://help.github.com/articles/github-s-products/#github-enterprise) customers on the [GitHub Enterprise billing plan](https://help.github.com/articles/github-s-billing-plans/#billing-plans-for-organizations).
@@ -66,7 +67,7 @@ This section guides you through connecting your Azure AD to GitHub's user accoun
6667

6768
![GitHub Provisioning](./media/github-provisioning-tutorial/GitHub1.png)
6869

69-
5. Under the **Admin Credentials** section, click **Authorize**. This operation opens a GitHub authorization dialog in a new browser window.
70+
5. Under the **Admin Credentials** section, click **Authorize**. This operation opens a GitHub authorization dialog in a new browser window. Note that you need to ensure you are approved to authorize access. Follow the directions described [here](https://help.github.com/github/setting-up-and-managing-organizations-and-teams/approving-oauth-apps-for-your-organization).
7071

7172
6. In the new window, sign into GitHub using your Admin account. In the resulting authorization dialog, select the GitHub team that you want to enable provisioning for, and then select **Authorize**. Once completed, return to the Azure portal to complete the provisioning configuration.
7273

7.15 KB
Loading

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

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -95,51 +95,45 @@ This section guides you through the steps to configure the Azure AD provisioning
9595

9696
4. Set the **Provisioning Mode** to **Automatic**.
9797

98-
![Samanage Provisioning Mode](./media/samanage-provisioning-tutorial/ProvisioningCredentials.png)
98+
![Provisioning tab](common/provisioning-automatic.png)
9999

100-
5. Under the **Admin Credentials** section, enter the admin username and admin password of your Samanage account. Examples of these values are:
100+
5. Under the **Admin Credentials** section, input your Samanage **Tenant URL** and **Secret Token**. Click **Test Connection** to ensure Azure AD can connect to Samanage. If the connection fails, ensure your Samanage account has Admin permissions and try again.
101101

102-
* In the **Admin Username** box, fill in the username of the admin account on your Samanage tenant. An example is [email protected].
102+
![Samanage Test Connection](./media/samanage-provisioning-tutorial/provisioning.png)
103103

104-
* In the **Admin Password** box, fill in the password of the admin account that corresponds to the admin username.
105-
106-
6. After you fill in the boxes shown in Step 5, select **Test Connection** to make sure that Azure AD can connect to Samanage. If the connection fails, make sure that your Samanage account has admin permissions and try again.
107-
108-
![Samanage Test Connection](./media/samanage-provisioning-tutorial/TestConnection.png)
109-
110-
7. In the **Notification Email** box, enter the email address of the person or group to receive the provisioning error notifications. Select the **Send an email notification when a failure occurs** check box.
104+
6. In the **Notification Email** box, enter the email address of the person or group to receive the provisioning error notifications. Select the **Send an email notification when a failure occurs** check box.
111105

112106
![Samanage Notification Email](./media/samanage-provisioning-tutorial/EmailNotification.png)
113107

114-
8. Select **Save**.
108+
7. Select **Save**.
115109

116-
9. Under the **Mappings** section, select **Synchronize Azure Active Directory Users to Samanage**.
110+
8. Under the **Mappings** section, select **Synchronize Azure Active Directory Users to Samanage**.
117111

118112
![Samanage user synchronization](./media/samanage-provisioning-tutorial/UserMappings.png)
119113

120-
10. Review the user attributes that are synchronized from Azure AD to Samanage in the **Attribute Mappings** section. The attributes selected as **Matching** properties are used to match the user accounts in Samanage for update operations. To save any changes, select **Save**.
114+
9. Review the user attributes that are synchronized from Azure AD to Samanage in the **Attribute Mappings** section. The attributes selected as **Matching** properties are used to match the user accounts in Samanage for update operations. To save any changes, select **Save**.
121115

122116
![Samanage matching user attributes](./media/samanage-provisioning-tutorial/UserAttributeMapping.png)
123117

124-
11. To enable group mappings, under the **Mappings** section, select **Synchronize Azure Active Directory Groups to Samanage**.
118+
10. To enable group mappings, under the **Mappings** section, select **Synchronize Azure Active Directory Groups to Samanage**.
125119

126120
![Samanage group synchronization](./media/samanage-provisioning-tutorial/GroupMappings.png)
127121

128-
12. Set **Enabled** to **Yes** to synchronize groups. Review the group attributes that are synchronized from Azure AD to Samanage in the **Attribute Mappings** section. The attributes selected as **Matching** properties are used to match the user accounts in Samanage for update operations. To save any changes, select **Save**.
122+
11. Set **Enabled** to **Yes** to synchronize groups. Review the group attributes that are synchronized from Azure AD to Samanage in the **Attribute Mappings** section. The attributes selected as **Matching** properties are used to match the user accounts in Samanage for update operations. To save any changes, select **Save**.
129123

130124
![Samanage matching group attributes](./media/samanage-provisioning-tutorial/GroupAttributeMapping.png)
131125

132-
13. To configure scoping filters, follow the instructions in the [scoping filter tutorial](../manage-apps/define-conditional-rules-for-provisioning-user-accounts.md).
126+
12. To configure scoping filters, follow the instructions in the [scoping filter tutorial](../manage-apps/define-conditional-rules-for-provisioning-user-accounts.md).
133127

134-
14. To enable the Azure AD provisioning service for Samanage, in the **Settings** section, change **Provisioning Status** to **On**.
128+
13. To enable the Azure AD provisioning service for Samanage, in the **Settings** section, change **Provisioning Status** to **On**.
135129

136130
![Samanage Provisioning Status](./media/samanage-provisioning-tutorial/ProvisioningStatus.png)
137131

138-
15. Define the users or groups that you want to provision to Samanage. In the **Settings** section, select the values you want in **Scope**. When you select the **Sync all users and groups** option, consider the limitations as described in the following section "Connector limitations."
132+
14. Define the users or groups that you want to provision to Samanage. In the **Settings** section, select the values you want in **Scope**. When you select the **Sync all users and groups** option, consider the limitations as described in the following section "Connector limitations."
139133

140134
![Samanage Scope](./media/samanage-provisioning-tutorial/ScopeSync.png)
141135

142-
16. When you're ready to provision, select **Save**.
136+
15. When you're ready to provision, select **Save**.
143137

144138
![Samanage Save](./media/samanage-provisioning-tutorial/SaveProvisioning.png)
145139

articles/aks/concepts-network.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ Regardless of the network model you use, both kubenet and Azure CNI can be deplo
113113

114114
Although capabilities like service endpoints or UDRs are supported with both kubenet and Azure CNI, the [support policies for AKS][support-policies] define what changes you can make. For example:
115115

116-
* If you manually create the virtual network resources for an AKS cluster, you are supported when configuring your own UDRs or service endpoints.
117-
* If the Azure platform automatically creates the virtual network resources for your AKS cluster, it is not supported to manually change those AKS-managed resources to configure your own UDRs or service endpoints.
116+
* If you manually create the virtual network resources for an AKS cluster, you're supported when configuring your own UDRs or service endpoints.
117+
* If the Azure platform automatically creates the virtual network resources for your AKS cluster, it isn't supported to manually change those AKS-managed resources to configure your own UDRs or service endpoints.
118118

119119
## Ingress controllers
120120

@@ -128,7 +128,7 @@ In AKS, you can create an Ingress resource using something like NGINX, or use th
128128

129129
Another common feature of Ingress is SSL/TLS termination. On large web applications accessed via HTTPS, the TLS termination can be handled by the Ingress resource rather than within the application itself. To provide automatic TLS certification generation and configuration, you can configure the Ingress resource to use providers such as Let's Encrypt. For more information on configuring an NGINX Ingress controller with Let's Encrypt, see [Ingress and TLS][aks-ingress-tls].
130130

131-
You can also configure your ingress controller to preserve the client source IP on requests to containers in your AKS cluster. When a client's request is routed to a container in your AKS cluster via your ingress controller, the original source IP of that request will not be available to the target container. When you enable *client source IP preservation*, the source IP for the client is available in the request header under *X-Forwarded-For*. If you are using client source IP preservation on your ingress controller, you cannot use SSL pass-through. Client source IP preservation and SSL pass-through can be used with other services, such as the *LoadBalancer* type.
131+
You can also configure your ingress controller to preserve the client source IP on requests to containers in your AKS cluster. When a client's request is routed to a container in your AKS cluster via your ingress controller, the original source IP of that request won't be available to the target container. When you enable *client source IP preservation*, the source IP for the client is available in the request header under *X-Forwarded-For*. If you're using client source IP preservation on your ingress controller, you can't use SSL pass-through. Client source IP preservation and SSL pass-through can be used with other services, such as the *LoadBalancer* type.
132132

133133
## Network security groups
134134

0 commit comments

Comments
 (0)