Skip to content

Commit f9211c8

Browse files
author
RoseHJM
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into mdb-skip-delay-autostop
2 parents 1e4b1d6 + 3f46e13 commit f9211c8

File tree

242 files changed

+4349
-2055
lines changed

Some content is hidden

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

242 files changed

+4349
-2055
lines changed

.openpublishing.redirection.azure-monitor.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6150,6 +6150,11 @@
61506150
"source_path_from_root": "/articles/azure-monitor/logs/dashboard-upgrade.md",
61516151
"redirect_url": "/azure/azure-monitor/visualize/tutorial-logs-dashboards",
61526152
"redirect_document_id": false
6153+
},
6154+
{
6155+
"source_path_from_root": "/articles/azure-monitor/app/opentelemetry-dotnet-exporter.md",
6156+
"redirect_url": "/azure/azure-monitor/app/opentelemetry-enable",
6157+
"redirect_document_id": false
61536158
}
61546159

61556160
]

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Microsoft Azure Documentation
22

3-
Welcome to the open-source [documentation](/azure) of [Microsoft Azure](https://azure.microsoft.com). Please review this README file to understand how you can assist in contributing to the Microsoft Azure documentation.
3+
Welcome to the open-source [documentation](/azure) of [Microsoft Azure](https://azure.microsoft.com). Please review this README file to understand how you can assist in contributing to the Microsoft Azure documentation.
44

55
## Getting Started
66

articles/active-directory-domain-services/use-azure-monitor-workbooks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ To access the workbook template for the security overview report, complete the f
5454
1. Select your managed domain, such as *aaddscontoso.com*
5555
1. From the menu on the left-hand side, choose **Monitoring > Workbooks**
5656

57-
![Screenshot that hightlights where to select the Security Overview Report and the Account Activity Report.](./media/use-azure-monitor-workbooks/select-workbooks-in-azure-portal.png)
57+
![Screenshot that highlights where to select the Security Overview Report and the Account Activity Report.](./media/use-azure-monitor-workbooks/select-workbooks-in-azure-portal.png)
5858

5959
1. Choose the **Security Overview Report**.
6060
1. From the drop-down menus at the top of the workbook, select your Azure subscription and then an Azure Monitor workspace.

articles/active-directory/develop/claims-challenge.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Here's an example:
3434
```https
3535
HTTP 401; Unauthorized
3636
37-
www-authenticate =Bearer realm="", authorization_uri="https://login.microsoftonline.com/common/oauth2/authorize", error="insufficient_claims", claims="eyJhY2Nlc3NfdG9rZW4iOnsiYWNycyI6eyJlc3NlbnRpYWwiOnRydWUsInZhbHVlIjoiYzEifX19"
37+
www-authenticate =Bearer realm="", authorization_uri="https://login.microsoftonline.com/common/oauth2/authorize", error="insufficient_claims", claims="eyJhY2Nlc3NfdG9rZW4iOnsiYWNycyI6eyJlc3NlbnRpYWwiOnRydWUsInZhbHVlIjoiY3AxIn19fQ=="
3838
```
3939

4040
**HTTP Status Code**: Must be **401 Unauthorized**.

articles/active-directory/develop/id-tokens.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ The table below shows the claims that are in most ID tokens by default (except w
7777
|`at_hash`| String |The access token hash is included in ID tokens only when the ID token is issued from the `/authorize` endpoint with an OAuth 2.0 access token. It can be used to validate the authenticity of an access token. To understand how to do this validation, see the [OpenID Connect specification](https://openid.net/specs/openid-connect-core-1_0.html#HybridIDToken). This is not returned on ID tokens from the `/token` endpoint. |
7878
|`aio` | Opaque String | An internal claim used by Azure AD to record data for token reuse. Should be ignored.|
7979
|`preferred_username` | String |The primary username that represents the user. It could be an email address, phone number, or a generic username without a specified format. Its value is mutable and might change over time. Since it is mutable, this value must not be used to make authorization decisions. It can be used for username hints, however, and in human-readable UI as a username. The `profile` scope is required in order to receive this claim. Present only in v2.0 tokens.|
80-
|`email` | String | The `email` claim is present by default for guest accounts that have an email address. Your app can request the email claim for managed users (those from the same tenant as the resource) using the `email` [optional claim](active-directory-optional-claims.md). On the v2.0 endpoint, your app can also request the `email` OpenID Connect scope - you don't need to request both the optional claim and the scope to get the claim.|
80+
|`email` | String | The `email` claim is present by default for guest accounts that have an email address. Your app can request the email claim for managed users (those from the same tenant as the resource) using the `email` [optional claim](active-directory-optional-claims.md). This value isn't guaranteed to be correct and is mutable over time. Never use it for authorization or to save data for a user. If you require an addressable email address in your app, request this data from the user directly by using this claim as a suggestion or prefill in your UX. On the v2.0 endpoint, your app can also request the `email` OpenID Connect scope - you don't need to request both the optional claim and the scope to get the claim.|
8181
|`name` | String | The `name` claim provides a human-readable value that identifies the subject of the token. The value isn't guaranteed to be unique, it can be changed, and it's designed to be used only for display purposes. The `profile` scope is required to receive this claim. |
8282
|`nonce`| String | The nonce matches the parameter included in the original /authorize request to the IDP. If it does not match, your application should reject the token. |
8383
|`oid` | String, a GUID | The immutable identifier for an object in the Microsoft identity system, in this case, a user account. This ID uniquely identifies the user across applications - two different applications signing in the same user will receive the same value in the `oid` claim. The Microsoft Graph will return this ID as the `id` property for a given user account. Because the `oid` allows multiple apps to correlate users, the `profile` scope is required to receive this claim. Note that if a single user exists in multiple tenants, the user will contain a different object ID in each tenant - they're considered different accounts, even though the user logs into each account with the same credentials. The `oid` claim is a GUID and cannot be reused. |

articles/active-directory/develop/msal-android-shared-devices.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,10 @@ These Microsoft applications support Azure AD's shared device mode:
9595

9696
- [Microsoft Teams](/microsoftteams/platform/)
9797
- [Microsoft Managed Home Screen](/mem/intune/apps/app-configuration-managed-home-screen-app) app for Android Enterprise
98-
- [Microsoft Edge](/microsoft-edge) (in Public Preview)
99-
- [Outlook](/mem/intune/apps/app-configuration-policies-outlook) (in Public Preview)
100-
- [Microsoft Power Apps](/power-apps) (in Public Preview)
101-
- [Yammer](/yammer) (in Public Preview)
102-
103-
> [!IMPORTANT]
104-
> Public preview is provided without a service-level agreement and isn't recommended for production workloads. Some features might be unsupported or have constrained capabilities. For more information, see [Supplemental terms of use for Microsoft Azure previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).
98+
- [Microsoft Edge](/microsoft-edge)
99+
- [Outlook](/mem/intune/apps/app-configuration-policies-outlook)
100+
- [Microsoft Power Apps](/power-apps)
101+
- [Microsoft Viva Engage](/viva/engage/overview) (previously [Yammer](/yammer))
105102

106103
## Shared device sign-out and the overall app lifecycle
107104

Loading

articles/active-directory/external-identities/customers/how-to-facebook-federation-customers.md

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: active-directory
88
ms.workload: identity
99
ms.subservice: ciam
1010
ms.topic: how-to
11-
ms.date: 04/28/2023
11+
ms.date: 05/24/2023
1212
ms.author: mimart
1313
ms.custom: it-pro
1414

@@ -38,17 +38,21 @@ If you don't already have a Facebook account, sign up at [https://www.facebook.c
3838
1. Enter a URL for the **Terms of Service URL**, for example `https://www.contoso.com/tos`. The policy URL is a page you maintain to provide terms and conditions for your application.
3939
1. Enter a URL for the **User Data Deletion**, for example `https://www.contoso.com/delete_my_data`. The User Data Deletion URL is a page you maintain to provide away for users to request that their data be deleted.
4040
1. Choose a **Category**, for example `Business and Pages`. Facebook requires this value, but it's not used for Azure AD.
41-
2. At the bottom of the page, select **Add Platform**, and then select **Website**.
42-
3. In **Site URL**, enter the address of your website, for example `https://contoso.com`.
43-
4. Select **Save Changes**.
44-
5. From the menu, select the **plus** sign or **Add Product** link next to **PRODUCTS**. Under the **Add Products to Your App**, select **Set up** under **Facebook Login**.
45-
6. From the menu, select **Facebook Login**, select **Settings**.
46-
7. In **Valid OAuth redirect URIs**, enter:
47-
- `https://login.microsoftonline.com`
48-
- `https://login.microsoftonline.com/te/<tenant ID>/oauth2/authresp`. Replace the tenant ID with your Azure AD for customers tenant ID. To find your tenant ID, go to the [Microsoft Entra admin center](https://entra.microsoft.com). Under **Azure Active Directory**, select **Overview**. Then select the **Overview** tab and copy the **Tenant ID**.
49-
- `https://login.microsoftonline.com/te/<tenant name>.onmicrosoft.com/oauth2/authresp`. Replace the tenant name with your Azure AD for customers tenant name.
50-
8. Select **Save Changes** at the bottom of the page.
51-
9. To make your Facebook application available to Azure AD, select the Status selector at the top right of the page and turn it **On** to make the Application public, and then select **Switch Mode**. At this point, the Status should change from **Development** to **Live**. For more information, see [Facebook App Development](https://developers.facebook.com/docs/development/release).
41+
1. At the bottom of the page, select **Add Platform**, and then select **Website**.
42+
1. In **Site URL**, enter the address of your website, for example `https://contoso.com`.
43+
1. Select **Save Changes**.
44+
1. From the menu, select the **plus** sign or **Add Product** link next to **PRODUCTS**. Under the **Add Products to Your App**, select **Set up** under **Facebook Login**.
45+
1. From the menu, select **Facebook Login**, select **Settings**.
46+
1. In **Valid OAuth redirect URIs**, enter the following URIs, replacing `<tenant-ID>` with your customer tenant ID and `<tenant-name>` with your customer tenant name:
47+
- `https://login.microsoftonline.com/te/<tenant-ID>/oauth2/authresp`
48+
- `https://<tenant-ID>.ciamlogin.com/<tenant-ID>/federation/oidc/www.facebook.com`
49+
- `https://<tenant-ID>.ciamlogin.com/<tenant-name>.onmicrosoft.com/federation/oidc/www.facebook.com`
50+
- `https://<tenant-ID>.ciamlogin.com/<tenant-ID>/federation/oauth2`
51+
- `https://<tenant-ID>.ciamlogin.com/<tenant-name>.onmicrosoft.com/federation/oauth2`
52+
> [!NOTE]
53+
> To find your customer tenant ID, go to the [Microsoft Entra admin center](https://entra.microsoft.com). Under **Azure Active Directory**, select **Overview**. Then select the **Overview** tab and copy the **Tenant ID**.
54+
1. Select **Save Changes** at the bottom of the page.
55+
1. To make your Facebook application available to Azure AD, select the Status selector at the top right of the page and turn it **On** to make the Application public, and then select **Switch Mode**. At this point, the Status should change from **Development** to **Live**. For more information, see [Facebook App Development](https://developers.facebook.com/docs/development/release).
5256

5357
## Configure Facebook federation in Azure AD for customers
5458

articles/active-directory/external-identities/customers/how-to-google-federation-customers.md

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: active-directory
88
ms.workload: identity
99
ms.subservice: ciam
1010
ms.topic: how-to
11-
ms.date: 04/28/2023
11+
ms.date: 05/24/2023
1212
ms.author: mimart
1313
ms.custom: it-pro
1414

@@ -31,21 +31,27 @@ To enable sign-in for customers with a Google account, you need to create an app
3131
1. Under the **Quick access**, or in the left menu, select **APIs & services** and then **OAuth consent screen**.
3232
1. For the **User Type**, select **External** and then select **Create**.
3333
1. On the **OAuth consent screen**, under **App information**
34-
1. Enter a **Name** for your application.
35-
2. Select a **User support email** address.
36-
1. Under the **Authorized domains** section, select **Add domain**, and then type *microsoftonline.com*.
34+
1. Enter a **Name** for your application.
35+
1. Select a **User support email** address.
36+
1. Under the **Authorized domains** section, select **Add domain**, and then add `ciamlogin.com` and `microsoftonline.com`.
3737
1. In the **Developer contact information** section, enter comma separated emails for Google to notify you about any changes to your project.
3838
1. Select **Save and Continue**.
3939
1. From the left menu, select **Credentials**
4040
1. Select **Create credentials**, and then **OAuth client ID**.
4141
1. Under **Application type**, select **Web application**.
42-
1. Enter a suitable **Name** for your application, such as "Azure AD for customers."
43-
1. For the **Authorized redirect URIs**, enter:
44-
- `https://login.microsoftonline.com`
45-
- `https://login.microsoftonline.com/te/<tenant ID>/oauth2/authresp`. Replace the tenant ID with your Azure AD for customers tenant ID. To find your tenant ID, go to the [Microsoft Entra admin center](https://entra.microsoft.com). Under **Azure Active Directory**, select **Overview**. Then select the **Overview** tab and copy the **Tenant ID**.
46-
- `https://login.microsoftonline.com/te/<tenant name>.onmicrosoft.com/oauth2/authresp`. Replace the tenant name with your Azure AD for customers tenant name.
47-
1. Select **Create**.
48-
1. Copy the values of **Client ID** and **Client secret**. You need both values to configure Google as an identity provider in your tenant. **Client secret** is an important security credential.
42+
1. Enter a suitable **Name** for your application, such as "Azure AD for customers."
43+
1. In **Valid OAuth redirect URIs**, enter the following URIs, replacing `<tenant-ID>` with your customer tenant ID and `<tenant-name>` with your customer tenant name:
44+
- `https://login.microsoftonline.com`
45+
- `https://login.microsoftonline.com/te/<tenant-ID>/oauth2/authresp`
46+
- `https://login.microsoftonline.com/te/<tenant-name>.onmicrosoft.com/oauth2/authresp`
47+
- `https://<tenant-ID>.ciamlogin.com/<tenant-ID>/federation/oidc/accounts.google.com`
48+
- `https://<tenant-ID>.ciamlogin.com/<tenant-name>.onmicrosoft.com/federation/oidc/accounts.google.com`
49+
- `https://<tenant-ID>.ciamlogin.com/<tenant-ID>/federation/oauth2`
50+
- `https://<tenant-ID>.ciamlogin.com/<tenant-name>.onmicrosoft.com/federation/oauth2`
51+
> [!NOTE]
52+
> To find your customer tenant ID, go to the [Microsoft Entra admin center](https://entra.microsoft.com). Under **Azure Active Directory**, select **Overview**. Then select the **Overview** tab and copy the **Tenant ID**.
53+
2. Select **Create**.
54+
3. Copy the values of **Client ID** and **Client secret**. You need both values to configure Google as an identity provider in your tenant. **Client secret** is an important security credential.
4955

5056
> [!NOTE]
5157
> In some cases, your app might require verification by Google (for example, if you update the application logo). For more information, check out the [Google's verification status guid](https://support.google.com/cloud/answer/10311615#verification-status).

articles/active-directory/managed-identities-azure-resources/how-manage-user-assigned-managed-identities.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.subservice: msi
1010
ms.topic: how-to
1111
ms.workload: identity
12-
ms.date: 03/08/2022
12+
ms.date: 05/10/2023
1313
ms.author: barclayn
1414
ms.custom: devx-track-azurecli
1515
zone_pivot_groups: identity-mi-methods
@@ -57,7 +57,7 @@ To list or read a user-assigned managed identity, your account needs to have eit
5757
1. Sign in to the [Azure portal](https://portal.azure.com).
5858
1. In the search box, enter **Managed Identities**. Under **Services**, select **Managed Identities**.
5959
1. A list of the user-assigned managed identities for your subscription is returned. To see the details of a user-assigned managed identity, select its name.
60-
1. You can now view the details about the managed identity as shown in the image below.
60+
1. You can now view the details about the managed identity as shown in the image.
6161

6262
:::image type="content" source="media/how-manage-user-assigned-managed-identities/list-user-assigned-managed-identity-portal.png" alt-text="Screenshot that shows the list of user-assigned managed identity.":::
6363

@@ -76,7 +76,7 @@ Deleting a user-assigned identity doesn't remove it from the VM or resource it w
7676

7777
## Manage access to user-assigned managed identities
7878

79-
In some environments, administrators choose to limit who can manage user-assigned managed identities. You do this by using [built-in](../../role-based-access-control/built-in-roles.md#identity) RBAC roles. You can use these roles to grant a user or group in your organization rights over a user-assigned managed identity.
79+
In some environments, administrators choose to limit who can manage user-assigned managed identities. Administrators can implement this limitation using [built-in](../../role-based-access-control/built-in-roles.md#identity) RBAC roles. You can use these roles to grant a user or group in your organization rights over a user-assigned managed identity.
8080

8181
1. Sign in to the [Azure portal](https://portal.azure.com).
8282
1. In the search box, enter **Managed Identities**. Under **Services**, select **Managed Identities**.

0 commit comments

Comments
 (0)