Skip to content

Commit d725467

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into heidist-refresh
2 parents 8bb1465 + 7576314 commit d725467

File tree

75 files changed

+1745
-1537
lines changed

Some content is hidden

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

75 files changed

+1745
-1537
lines changed

.openpublishing.redirection.azure-monitor.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,16 @@
3535
"redirect_url": "/azure/azure-monitor/change/change-analysis",
3636
"redirect_document_id": false
3737
},
38+
{
39+
"source_path_from_root": "/articles/azure-monitor/app/javascript.md",
40+
"redirect_url": "/azure/azure-monitor/app/javascript-sdk",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path_from_root": "/articles/azure-monitor/app/source-map-support.md",
45+
"redirect_url": "/azure/azure-monitor/app/javascript-sdk-advanced",
46+
"redirect_document_id": false
47+
},
3848
{
3949
"source_path_from_root": "/articles/azure-monitor/app/release-notes.md",
4050
"redirect_url": "/azure/azure-monitor/app/app-insights-overview",

articles/active-directory/authentication/how-to-mfa-authenticator-lite.md

Lines changed: 36 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: authentication
88
ms.topic: conceptual
9-
ms.date: 03/14/2023
9+
ms.date: 03/15/2023
1010

1111
ms.author: justinha
1212
author: sabina-smith
@@ -23,6 +23,9 @@ Microsoft Authenticator Lite is another surface for Azure Active Directory (Azur
2323

2424
Users receive a notification in Outlook mobile to approve or deny sign-in, or they can copy a TOTP to use during sign-in.
2525

26+
>[!NOTE]
27+
>This is an important security enhancement for users authenticating via telecom transports. The 'Microsoft managed' setting for this feature will be set to enabled on May 26th, 2023. This will enable the feature for all users in tenants where the feature is set to Microsoft managed. If you wish to change the state of this feature, please do so before May 26th, 2023.
28+
2629
## Prerequisites
2730

2831
- Your organization needs to enable Microsoft Authenticator (second factor) push notifications for some users or groups by using the Authentication methods policy. You can edit the Authentication methods policy by using the Azure portal or Microsoft Graph API.
@@ -56,26 +59,40 @@ https://graph.microsoft.com/beta/authenticationMethodsPolicy/authenticationMetho
5659
5760
### Request
5861

59-
```http
60-
PATCH https://graph.microsoft.com/beta/policies/authenticationMethodsPolicy
61-
Content-Type: application/json
62-
62+
```JSON
63+
//Retrieve your existing policy via a GET.
64+
//Leverage the Response body to create the Request body section. Then update the Request body similar to the Request body as shown below.
65+
//Change the Query to PATCH and Run query
66+
6367
{
64-
"CompanionAppAllowedState": {
65-
"state": "enabled",
66-
"excludeTargets": [
67-
{
68-
"id": "s4432809-3bql-5m2l-0p42-8rq4707rq36m",
69-
"targetType": "group"
70-
}
71-
],
72-
"includeTargets": [
73-
{
74-
"id": "all_users",
75-
"targetType": "group"
68+
"@odata.context": "https://graph.microsoft.com/beta/$metadata#authenticationMethodConfigurations/$entity",
69+
"@odata.type": "#microsoft.graph.microsoftAuthenticatorAuthenticationMethodConfiguration",
70+
"id": "MicrosoftAuthenticator",
71+
"state": "enabled",
72+
"isSoftwareOathEnabled": false,
73+
"excludeTargets": [],
74+
"featureSettings": {
75+
"companionAppAllowedState": {
76+
"state": "enabled",
77+
"includeTarget": {
78+
"targetType": "group",
79+
"id": "s4432809-3bql-5m2l-0p42-8rq4707rq36m"
80+
},
81+
"excludeTarget": {
82+
"targetType": "group",
83+
"id": "00000000-0000-0000-0000-000000000000"
7684
}
77-
]
78-
}
85+
}
86+
},
87+
"[email protected]": "https://graph.microsoft.com/beta/$metadata#authenticationMethodsPolicy/authenticationMethodConfigurations('MicrosoftAuthenticator')/microsoft.graph.microsoftAuthenticatorAuthenticationMethodConfiguration/includeTargets",
88+
"includeTargets": [
89+
{
90+
"targetType": "group",
91+
"id": "all_users",
92+
"isRegistrationRequired": false,
93+
"authenticationMode": "any"
94+
}
95+
]
7996
}
8097
```
8198

articles/active-directory/develop/scenario-web-app-call-api-acquire-token.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public async Task<ActionResult> ReadMail()
115115
}
116116
```
117117

118-
For details see the code for [BuildConfidentialClientApplication()](https://github.com/Azure-Samples/ms-identity-aspnet-webapp-openidconnect/blob/master/WebApp/Utils/MsalAppBuilder.cs) and [GetMsalAccountId](https://github.com/Azure-Samples/ms-identity-aspnet-webapp-openidconnect/blob/257c8f96ec3ff875c351d1377b36403eed942a18/WebApp/Utils/ClaimPrincipalExtension.cs#L38) in the code sample
118+
For details see the code for [GetMsalAccountId](https://github.com/Azure-Samples/ms-identity-aspnet-webapp-openidconnect/blob/257c8f96ec3ff875c351d1377b36403eed942a18/WebApp/Utils/ClaimPrincipalExtension.cs#L38) in the code sample.
119119

120120

121121
# [Java](#tab/java)

articles/active-directory/develop/userinfo.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.custom: aaddev
1717

1818
# Microsoft identity platform UserInfo endpoint
1919

20-
As part of the OpenID Connect (OIDC) standard, the [UserInfo endpoint](https://openid.net/specs/openid-connect-core-1_0.html#UserInfo) returns information about an authenticated user. In the Microsoft identity platform, the UserInfo endpoint is hosted by Microsoft Graph at https://graph.microsoft.com/oidc/userinfo.
20+
As part of the OpenID Connect (OIDC) standard, the [UserInfo endpoint](https://openid.net/specs/openid-connect-core-1_0.html#UserInfo) returns information about an authenticated user.
2121

2222
## Find the .well-known configuration endpoint
2323

@@ -85,7 +85,7 @@ You can't add to or customize the information returned by the UserInfo endpoint.
8585

8686
To customize the information returned by the identity platform during authentication and authorization, use [claims mapping]( active-directory-claims-mapping.md) and [optional claims]( active-directory-optional-claims.md) to modify security token configuration.
8787

88-
## Next Steps
88+
## Next steps
8989

9090
* [Review the contents of ID tokens](id-tokens.md).
9191
* [Customize the contents of an ID token using optional claims](active-directory-optional-claims.md).

articles/active-directory/external-identities/external-identities-pricing.md

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: B2B
88
ms.topic: conceptual
9-
ms.date: 03/29/2022
9+
ms.date: 03/15/2023
1010

1111
ms.author: mimart
1212
author: msmimart
1313
manager: celestedg
1414
ms.workload: identity
15-
ms.collection: M365-identity-device-management
15+
ms.collection: engagement-fy23, M365-identity-device-management
1616
---
1717

1818
# Billing model for Azure AD External Identities
@@ -30,7 +30,6 @@ To take advantage of MAU billing, your Azure AD tenant must be linked to an Azur
3030
|---------|---------|
3131
| An Azure AD tenant already linked to a subscription | Do nothing. When you use External Identities features to collaborate with guest users, you'll be automatically billed using the MAU model. |
3232
| An Azure AD tenant not yet linked to a subscription | [Link your Azure AD tenant to a subscription](#link-your-azure-ad-tenant-to-a-subscription) to activate MAU billing. |
33-
| | |
3433

3534
## About monthly active users (MAU) billing
3635

@@ -44,7 +43,7 @@ The pricing tier that applies to your guest users is based on the highest pricin
4443

4544
An Azure AD tenant must be linked to a resource group within an Azure subscription for proper billing and access to features.
4645

47-
1. Sign in to the [Azure portal](https://portal.azure.com/) with an Azure account that's been assigned at least the [Contributor](../../role-based-access-control/built-in-roles.md) role within the subscription or a resource group within the subscription.
46+
1. Sign in to the [Azure portal](https://portal.azure.com/) with an Azure account that's been assigned at least the Contributor role within the subscription or a resource group within the subscription.
4847

4948
2. Select the directory you want to link: In the Azure portal toolbar, select the **Directories + subscriptions** icon in the portal toolbar. Then on the **Portal settings | Directories + subscriptions** page, find your directory in the **Directory name** list, and then select **Switch**.
5049

@@ -56,25 +55,24 @@ An Azure AD tenant must be linked to a resource group within an Azure subscripti
5655

5756
6. In the tenant list, select the checkbox next to the tenant, and then select **Link subscription**.
5857

59-
![Select the tenant and link a subscription](media/external-identities-pricing/linked-subscriptions.png)
58+
:::image type="content" source="media/external-identities-pricing/linked-subscriptions.png" alt-text="Screenshot of the link a subscription option.":::
6059

6160
7. In the **Link a subscription** pane, select a **Subscription** and a **Resource group**. Then select **Apply**. (If there are no subscriptions listed, see [What if I can't find a subscription?](#what-if-i-cant-find-a-subscription).)
6261

63-
![Select a subscription and resource group](media/external-identities-pricing/link-subscription-resource.png)
62+
:::image type="content" source="media/external-identities-pricing/link-subscription-resource.png" alt-text="Screenshot of how to link a subscription.":::
6463

6564
After you complete these steps, your Azure subscription is billed based on your Azure Direct or Enterprise Agreement details, if applicable.
6665

6766
## What if I can't find a subscription?
6867

6968
If no subscriptions are available in the **Link a subscription** pane, here are some possible reasons:
7069

71-
- You don't have the appropriate permissions. Be sure to sign in with an Azure account that's been assigned at least the [Contributor](../../role-based-access-control/built-in-roles.md) role within the subscription or a resource group within the subscription.
70+
- You don't have the appropriate permissions. Be sure to sign in with an Azure account that's been assigned at least the Contributor role within the subscription or a resource group within the subscription.
7271

7372
- A subscription exists, but it hasn't been associated with your directory yet. You can [associate an existing subscription to your tenant](../fundamentals/active-directory-how-subscriptions-associated-directory.md) and then repeat the steps for [linking it to your tenant](#link-your-azure-ad-tenant-to-a-subscription).
7473

7574
- No subscription exists. In the **Link a subscription** pane, you can create a subscription by selecting the link **if you don't already have a subscription you may create one here**. After you create a new subscription, you'll need to [create a resource group](../../azure-resource-manager/management/manage-resource-groups-portal.md) in the new subscription, and then repeat the steps for [linking it to your tenant](#link-your-azure-ad-tenant-to-a-subscription).
7675

7776
## Next steps
7877

79-
For the latest pricing information, see [Azure Active Directory pricing](https://www.microsoft.com/security/business/identity-access-management/azure-ad-pricing).
80-
Learn more about [managing Azure resources](../../azure-resource-manager/management/overview.md).
78+
For the latest pricing information, see [Azure Active Directory pricing](https://www.microsoft.com/security/business/identity-access-management/azure-ad-pricing).
108 Bytes
Loading
-7.56 KB
Loading

articles/active-directory/hybrid/how-to-connect-sync-change-the-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ String attributes are indexable by default, and the maximum length is 448 charac
137137
The userPrincipalName attribute in Active Directory is not always known by the users and might not be suitable as the sign-in ID. With the Azure AD Connect sync installation wizard, you can choose a different attribute--for example, *mail*. But in some cases, the attribute must be calculated.
138138

139139
For example, the company Contoso has two Azure AD directories, one for production and one for testing. They want the users in their test tenant to use another suffix in the sign-in ID:
140-
`userPrincipalName` <- `Word([userPrincipalName],1,"@") & "@contosotest.com"`.
140+
`Word([userPrincipalName],1,"@") & "@contosotest.com"`.
141141

142142
In this expression, take everything left of the first @-sign (Word) and concatenate with a fixed string.
143143

articles/aks/cluster-autoscaler.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ To adjust to changing application demands, such as between the workday and eveni
2525

2626
![The cluster autoscaler and horizontal pod autoscaler often work together to support the required application demands](media/autoscaler/cluster-autoscaler.png)
2727

28-
Both the horizontal pod autoscaler and cluster autoscaler can also decrease the number of pods and nodes as needed. The cluster autoscaler decreases the number of nodes when there has been unused capacity for a period of time. Pods on a node to be removed by the cluster autoscaler are safely scheduled elsewhere in the cluster. For more information about how scaling down works, see [How does scale-down work?]https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/FAQ.md#how-does-scale-down-work).
28+
Both the horizontal pod autoscaler and cluster autoscaler can also decrease the number of pods and nodes as needed. The cluster autoscaler decreases the number of nodes when there has been unused capacity for a period of time. Pods on a node to be removed by the cluster autoscaler are safely scheduled elsewhere in the cluster. For more information about how scaling down works, see [How does scale-down work?](https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/FAQ.md#how-does-scale-down-work).
2929

3030
The cluster autoscaler may be unable to scale down if pods can't move, such as in the following situations:
3131

0 commit comments

Comments
 (0)