Skip to content

Commit b2bc539

Browse files
author
Ankita Dutta
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into incub-coneptual
2 parents 4805452 + a539141 commit b2bc539

File tree

1,484 files changed

+8607
-10391
lines changed

Some content is hidden

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

1,484 files changed

+8607
-10391
lines changed

.openpublishing.redirection.app-service.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1980,6 +1980,11 @@
19801980
"redirect_url": "/azure/app-service/tutorial-java-spring-cosmosdb",
19811981
"redirect_document_id": false
19821982
},
1983+
{
1984+
"source_path_from_root": "/articles/app-service/tutorial-java-quarkus-postgresql-app.md",
1985+
"redirect_url": "/azure/app-service/tutorial-java-spring-cosmosdb",
1986+
"redirect_document_id": false
1987+
},
19831988
{
19841989
"source_path_from_root": "/articles/app-service/containers/tutorial-java-spring-cosmosdb.md",
19851990
"redirect_url": "/azure/app-service/tutorial-java-spring-cosmosdb",

.openpublishing.redirection.education.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
"source_path_from_root": "/articles/education-hub/custom-tenant-set-up-classroom.md",
55
"redirect_url": "/articles/education-hub/about-education-hub.md",
66
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/education-hub/it-admin-allocate-credit.md",
10+
"redirect_url": "/articles/education-hub/about-education-hub.md",
11+
"redirect_document_id": false
712
}
813
]
914
}

.openpublishing.redirection.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"redirect_url": "/previous-versions/azure/azure-app-configuration/rest-api-fiddler",
1111
"redirect_document_id": false
1212
},
13-
{
13+
{
1414
"source_path": "articles/kinect-dk/index.yml",
1515
"redirect_url": "/previous-versions/azure/kinect-dk/index",
1616
"redirect_document_id": false
@@ -3125,6 +3125,11 @@
31253125
"redirect_url": "/azure/openshift/howto-byok",
31263126
"redirect_document_id": false
31273127
},
3128+
{
3129+
"source_path_from_root": "/articles/openshift/howto-deploy-java-jboss-enterprise-application-platform-with-auto-redeploy.md",
3130+
"redirect_url": "/azure/openshift/index",
3131+
"redirect_document_id": false
3132+
},
31283133
{
31293134
"source_path_from_root": "/articles/openshift/quickstart-portal.md",
31303135
"redirect_url": "/azure/openshift/create-cluster",
@@ -4754,6 +4759,11 @@
47544759
"source_path_from_root": "/articles/virtual-network/virtual-network-service-endpoint-policies-powershell.md",
47554760
"redirect_url": "/azure/virtual-network/virtual-network-service-endpoint-policies",
47564761
"redirect_document_id": false
4762+
},
4763+
{
4764+
"source_path_from_root": "/articles/modeling-simulation-workbench/how-to-guide-manage-storage.md",
4765+
"redirect_url": "/azure/modeling-simulation-workbench/concept-storage",
4766+
"redirect_document_id": false
47574767
}
47584768
]
47594769
}

CODEOWNERS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,8 @@
2525
/articles/genomics @jasonwhowell @thomps23
2626
/articles/open-datasets @jasonwhowell @thomps23
2727
/articles/search @jasonwhowell @thomps23
28+
/articles/azure-monitor @jasonwhowell @thomps23
29+
/articles/advisor @jasonwhowell @thomps23
30+
/articles/chaos-studio @jasonwhowell @thomps23
31+
/articles/service-health @jasonwhowell @thomps23
2832

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ You've decided to contribute. That's great! To contribute to the documentation,
1212

1313
#### GitHub
1414

15-
Contributing to the documentation requires a GitHub account. If you don't have an account, follow the instructions for [GitHub account setup](https://learn.microsoft.com/contribute/get-started-setup-github) from our contributor guide.
15+
Contributing to the documentation requires a [GitHub account](https://github.com/). If you don't have an account, follow the instructions for [GitHub account setup](https://learn.microsoft.com/contribute/get-started-setup-github) from our contributor guide.
1616

1717
#### Tools
1818

articles/active-directory-b2c/add-ropc-policy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: CelesteDG
99
ms.service: active-directory
1010

1111
ms.topic: how-to
12-
ms.date: 01/11/2024
12+
ms.date: 09/11/2024
1313
ms.author: kengaderdus
1414
ms.subservice: B2C
1515
zone_pivot_groups: b2c-policy-type
@@ -55,7 +55,7 @@ When using the ROPC flow, consider the following limitations:
5555

5656
## Create a resource owner user flow
5757

58-
1. Sign in to the [Azure portal](https://portal.azure.com) as the **global administrator** of your Azure AD B2C tenant.
58+
1. Sign in to the [Azure portal](https://portal.azure.com) as the [External ID User Flow Administrator](/entra/identity/role-based-access-control/permissions-reference#external-id-user-flow-administrator) of your Azure AD B2C tenant.
5959
1. If you have access to multiple tenants, select the **Settings** icon in the top menu to switch to your Azure AD B2C tenant from the **Directories + subscriptions** menu.
6060
1. In the Azure portal, search for and select **Azure AD B2C**.
6161
1. Select **User flows**, and select **New user flow**.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.service: active-directory
1111
ms.topic: how-to
1212
ms.author: kengaderdus
1313
ms.subservice: B2C
14-
ms.date: 01/11/2024
14+
ms.date: 09/11/2024
1515
ms.custom: "b2c-support"
1616

1717

@@ -56,13 +56,13 @@ The following diagram depicts the components you'll configure in your Microsoft
5656

5757
![Resource group projection](./media/azure-monitor/resource-group-projection.png)
5858

59-
During this deployment, you'll configure your Azure AD B2C tenant where logs are generated. You'll also configure Microsoft Entra tenant where the Log Analytics workspace will be hosted. The Azure AD B2C accounts used (such as your admin account) should be assigned the [Global Administrator](../active-directory/roles/permissions-reference.md#global-administrator) role on the Azure AD B2C tenant. The Microsoft Entra account you'll use to run the deployment must be assigned the [Owner](../role-based-access-control/built-in-roles.md#owner) role in the Microsoft Entra subscription. It's also important to make sure you're signed in to the correct directory as you complete each step as described.
59+
During this deployment, you'll configure your Azure AD B2C tenant where logs are generated. You'll also configure Microsoft Entra tenant where the Log Analytics workspace will be hosted. The Azure AD B2C accounts used (such as your admin account) should be assigned the [Global Administrator](/entra/identity/role-based-access-control/permissions-reference#global-administrator) role on the Azure AD B2C tenant. The Microsoft Entra account you'll use to run the deployment must be assigned the [Owner](../role-based-access-control/built-in-roles.md#owner) role in the Microsoft Entra subscription. It's also important to make sure you're signed in to the correct directory as you complete each step as described.
6060

6161
In summary, you'll use Azure Lighthouse to allow a user or group in your Azure AD B2C tenant to manage a resource group in a subscription associated with a different tenant (the Microsoft Entra tenant). After this authorization is completed, the subscription and log analytics workspace can be selected as a target in the Diagnostic settings in Azure AD B2C.
6262

6363
## Prerequisites
6464

65-
- An Azure AD B2C account with [Global Administrator](../active-directory/roles/permissions-reference.md#global-administrator) role on the Azure AD B2C tenant.
65+
- An Azure AD B2C account with [Global Administrator](/entra/identity/role-based-access-control/permissions-reference#global-administrator) role on the Azure AD B2C tenant.
6666

6767
- A Microsoft Entra account with the [Owner](../role-based-access-control/built-in-roles.md#owner) role in the Microsoft Entra subscription. See how to [Assign a user as an administrator of an Azure subscription](../role-based-access-control/role-assignments-portal-subscription-admin.yml).
6868

articles/active-directory-b2c/billing.md

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
---
22
title: Billing model for Azure Active Directory B2C
33
description: Learn about Azure AD B2C's monthly active users (MAU) billing model, how to link an Azure AD B2C tenant to an Azure subscription, and how to select the appropriate premium tier pricing.
4-
54
author: kengaderdus
65
manager: CelesteDG
7-
86
ms.service: active-directory
97
ms.topic: reference
10-
11-
ms.date: 01/11/2024
8+
ms.date: 09/11/2024
129
ms.author: kengaderdus
1310
ms.subservice: B2C
1411
ms.custom: fasttrack-edit
1512

16-
1713
#Customer intent: As a business decision maker managing an Azure AD B2C tenant, I want to understand the billing model based on monthly active users (MAU), so that I can determine the cost and pricing structure for my Azure AD B2C tenant.
1814

1915
---
@@ -33,7 +29,7 @@ A monthly active user (MAU) is a unique user that performs an authentication wit
3329

3430
If Azure AD B2C [Go-Local add-on](data-residency.md#go-local-add-on) is available in your country/region, and you enable it, you'll be charged per MAU, which is an added charge to your Azure AD B2C [Premium P1 or P2 pricing](https://azure.microsoft.com/pricing/details/active-directory-b2c/) license. Learn more [About Local Data Residency add-on](#about-go-local-add-on)
3531

36-
Also, if you choose to provide higher levels of assurance by using Multi-factor Authentication (MFA) for Voice and SMS, you'll be charged a worldwide flat fee for each MFA attempt that month, whether the sign in is successful or unsuccessful.
32+
Also, if you choose to provide higher levels of assurance by using multifactor authentication (MFA) for Voice and SMS, you'll be charged a worldwide flat fee for each MFA attempt that month, whether the sign in is successful or unsuccessful.
3733

3834

3935
> [!IMPORTANT]
@@ -93,7 +89,7 @@ A subscription linked to an Azure AD B2C tenant can be used for the billing of A
9389
1. Select **Create a resource**, and then, in the **Search services and Marketplace** field, search for and select **Azure Active Directory B2C**.
9490
1. Select **Create**.
9591
1. Select **Link an existing Azure AD B2C Tenant to my Azure subscription**.
96-
1. Select an **Azure AD B2C Tenant** from the dropdown. Only tenants for which you're a global administrator and that aren't already linked to a subscription are shown. The **Azure AD B2C Resource name** field is populated with the domain name of the Azure AD B2C tenant you select.
92+
1. Select an **Azure AD B2C Tenant** from the dropdown. Only tenants for which you're a Global Administrator and that aren't already linked to a subscription are shown. The **Azure AD B2C Resource name** field is populated with the domain name of the Azure AD B2C tenant you select.
9793
1. Select an active Azure **Subscription** of which you're an owner.
9894
1. Under **Resource group**, select **Create new**, and then specify the **Resource group location**. The resource group settings here have no impact on your Azure AD B2C tenant location, performance, or billing status.
9995
1. Select **Create**.
@@ -214,7 +210,7 @@ Before you start the move, be sure to read the entire article to fully understan
214210

215211
If the source and destination subscriptions are associated with different Microsoft Entra tenants, you can't perform the move via Azure Resource Manager as explained above. However, you can still achieve the same result by unlinking the Azure AD B2C tenant from the source subscription and relinking it to the destination subscription. This method is safe because the only object you delete is the *billing link*, not the Azure AD B2C tenant itself. None of the users, apps, user flows, etc. will be affected.
216212

217-
1. In the Azure AD B2C directory itself, [invite a guest user](user-overview.md#guest-user) from the destination Microsoft Entra tenant (the one that the destination Azure subscription is linked to) and ensure this user has the **Global administrator** role in Azure AD B2C.
213+
1. In the Azure AD B2C directory itself, [invite a guest user](user-overview.md#guest-user) from the destination Microsoft Entra tenant (the one that the destination Azure subscription is linked to) and ensure this user has the *Global Administrator* role in Azure AD B2C.
218214
1. Navigate to the *Azure resource* representing Azure AD B2C in your source Azure subscription as explained in the [Manage your Azure AD B2C tenant resources](#manage-your-azure-ad-b2c-tenant-resources) section above. Don't switch to the actual Azure AD B2C tenant.
219215
1. Select the **Delete** button on the **Overview** page. This action *doesn't* delete the related Azure AD B2C tenant's users or applications. It merely removes the billing link from the source subscription.
220216
1. Sign in to the Azure portal with the user account that was added as an administrator in Azure AD B2C in step 1. Then navigate to the destination Azure subscription, which is linked to the destination Microsoft Entra tenant.

articles/active-directory-b2c/conditional-access-user-flow.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Learn how to add Conditional Access to your Azure AD B2C user flows
55
ms.service: active-directory
66
ms.subservice: B2C
77
ms.topic: overview
8-
ms.date: 01/11/2024
8+
ms.date: 09/11/2024
99
ms.author: kengaderdus
1010
author: kengaderdus
1111
manager: CelesteDG
@@ -437,4 +437,4 @@ To review the result of a Conditional Access event:
437437

438438
## Next steps
439439

440-
[Customize the user interface in an Azure AD B2C user flow](customize-ui-with-html.md)
440+
[Customize the user interface in an Azure AD B2C user flow](customize-ui-with-html.md)

articles/active-directory-b2c/custom-policies-series-store-user.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.service: active-directory
1010

1111
ms.topic: how-to
1212
ms.custom: b2c-docs-improvements
13-
ms.date: 06/21/2024
13+
ms.date: 09/11/2024
1414
ms.author: kengaderdus
1515
ms.reviewer: yoelh
1616
ms.subservice: B2C
@@ -263,7 +263,7 @@ Follow the steps in [Test the custom policy](custom-policies-series-validate-use
263263

264264
After the policy finishes execution, and you receive your ID token, check that the user record has been created:
265265

266-
1. Sign in to the [Azure portal](https://portal.azure.com/) as at least Privileged Role Administrator.
266+
1. Sign in to the [Azure portal](https://portal.azure.com/).
267267

268268
1. If you have access to multiple tenants, select the **Settings** icon in the top menu to switch to your Azure AD B2C tenant from the **Directories + subscriptions** menu.
269269

0 commit comments

Comments
 (0)