Skip to content

Commit c102149

Browse files
authored
Merge pull request #254740 from MicrosoftDocs/main
Merge main to live, 4 AM
2 parents a3f5157 + 78f8727 commit c102149

File tree

1,286 files changed

+6283
-5464
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,286 files changed

+6283
-5464
lines changed

articles/active-directory-b2c/custom-policy-developer-notes.md

Lines changed: 2 additions & 1 deletion
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: 09/06/2023
12+
ms.date: 10/05/2023
1313
ms.custom: project-no-code
1414
ms.author: kengaderdus
1515
ms.subservice: B2C
@@ -38,6 +38,7 @@ Azure Active Directory B2C [user flows and custom policies](user-flow-overview.m
3838
| [Force password reset](force-password-reset.md) | GA | NA | |
3939
| [Phone sign-up and sign-in](phone-authentication-user-flows.md) | GA | GA | |
4040
| [Conditional Access and Identity Protection](conditional-access-user-flow.md) | GA | GA | Not available for SAML applications |
41+
| [Smart lockout](threat-management.md) | GA | GA | |
4142

4243
## OAuth 2.0 application authorization flows
4344

articles/active-directory-b2c/error-codes.md

Lines changed: 2 additions & 1 deletion
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: 10/28/2022
12+
ms.date: 10/11/2023
1313
ms.author: kengaderdus
1414
ms.subservice: B2C
1515
---
@@ -151,3 +151,4 @@ The following errors can be returned by the Azure Active Directory B2C service.
151151
| `AADB2C99011` | The metadata value '{0}' has not been specified in TechnicalProfile '{1}' in policy '{2}'. | [Custom policy Technical profiles](technicalprofiles.md) |
152152
| `AADB2C99013` | The supplied grant_type [{0}] and token_type [{1}] combination is not supported. |
153153
| `AADB2C99015` | Profile '{0}' in policy '{1}' in tenant '{2}' is missing all InputClaims required for resource owner password credential flow. | [Create a resource owner policy](add-ropc-policy.md#create-a-resource-owner-policy) |
154+
|`AADB2C99002`| User doesn't exist. Please sign up before you can sign in. |

articles/active-directory-b2c/identity-provider-azure-ad-b2c.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
ms.workload: identity
1111
ms.topic: how-to
12-
ms.date: 09/16/2021
12+
ms.date: 10/11/2023
1313
ms.author: godonnell
1414
ms.subservice: B2C
1515
ms.custom: fasttrack-edit, project-no-code
@@ -28,7 +28,7 @@ zone_pivot_groups: b2c-policy-type
2828

2929
## Overview
3030

31-
This article describes how to set up a federation with another Azure AD B2C tenant. When your applications are protected with your Azure AD B2C, this allows users from other Azure AD B2C’s to login with their existing accounts. In the following diagram, users are able to sign-in to an Application protected by *Contoso*’s Azure AD B2C, with an account managed by *Fabrikam*’s Azure AD B2C tenant
31+
This article describes how to set up a federation with another Azure AD B2C tenant. When your applications are protected with your Azure AD B2C, this allows users from other Azure AD B2C’s to login with their existing accounts. In the following diagram, users are able to sign in to an application protected by *Contoso*’s Azure AD B2C, with an account managed by *Fabrikam*’s Azure AD B2C tenant. In this case, user account must be present in *Fabrikam*’s tenant before an application protected by *Contoso*’s Azure AD B2C can attempt to sign in.
3232

3333
![Azure AD B2C federation with another Azure AD B2C tenant](./media/identity-provider-azure-ad-b2c/azure-ad-b2c-federation.png)
3434

articles/azure-arc/data/automated-integration-testing.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,13 +247,15 @@ export ARC_DATASERVICES_WHL_OVERRIDE="https://azurearcdatacli.blob.core.windows.
247247
```
248248
The CLI version to Blob URL mapping can be found [here](https://azcliextensionsync.blob.core.windows.net/index1/index.json).
249249

250-
##### 3. `CUSTOM_LOCATION_OID` - Custom Locations Object ID from your specific Azure AD Tenant
250+
<a name='3-custom_location_oid---custom-locations-object-id-from-your-specific-azure-ad-tenant'></a>
251+
252+
##### 3. `CUSTOM_LOCATION_OID` - Custom Locations Object ID from your specific Microsoft Entra tenant
251253

252254
> Mandatory: this is required for Connected Cluster Custom Location creation.
253255
254-
The following steps are sourced from [Enable custom locations on your cluster](../kubernetes/custom-locations.md#enable-custom-locations-on-your-cluster) to retrieve the unique Custom Location Object ID for your Azure AD tenant.
256+
The following steps are sourced from [Enable custom locations on your cluster](../kubernetes/custom-locations.md#enable-custom-locations-on-your-cluster) to retrieve the unique Custom Location Object ID for your Microsoft Entra tenant.
255257

256-
There are two approaches to obtaining the `CUSTOM_LOCATION_OID` for your Azure AD tenant.
258+
There are two approaches to obtaining the `CUSTOM_LOCATION_OID` for your Microsoft Entra tenant.
257259

258260
1. Via Azure CLI:
259261

@@ -264,7 +266,7 @@ There are two approaches to obtaining the `CUSTOM_LOCATION_OID` for your Azure A
264266

265267
![A screenshot of a PowerShell terminal that shows `az ad sp show --id <>`.](media/automated-integration-testing/custom-location-oid-cli.png)
266268

267-
2. Via Azure portal - navigate to your Azure Active Directory blade, and search for `Custom Locations RP`:
269+
2. Via Azure portal - navigate to your Microsoft Entra blade, and search for `Custom Locations RP`:
268270

269271
![A screenshot of the custom locations RP.](media/automated-integration-testing/custom-location-oid-portal.png)
270272

articles/azure-arc/data/connectivity.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ The connectivity mode provides you the flexibility to choose how much data is se
2828

2929
Importantly, if the Azure Arc-enabled data services are directly connected to Azure, then users can use [Azure Resource Manager APIs](/rest/api/resources/), the Azure CLI, and the Azure portal to operate the Azure Arc data services. The experience in directly connected mode is much like how you would use any other Azure service with provisioning/de-provisioning, scaling, configuring, and so on all in the Azure portal. If the Azure Arc-enabled data services are indirectly connected to Azure, then the Azure portal is a read-only view. You can see the inventory of SQL managed instances and PostgreSQL servers that you have deployed and the details about them, but you cannot take action on them in the Azure portal. In the indirectly connected mode, all actions must be taken locally using Azure Data Studio, the appropriate CLI, or Kubernetes native tools like kubectl.
3030

31-
Additionally, Azure Active Directory and Azure Role-Based Access Control can be used in the directly connected mode only because there is a dependency on a continuous and direct connection to Azure to provide this functionality.
31+
Additionally, Microsoft Entra ID and Azure Role-Based Access Control can be used in the directly connected mode only because there is a dependency on a continuous and direct connection to Azure to provide this functionality.
3232

3333
Some Azure-attached services are only available when they can be directly reached such as Container Insights, and backup to blob storage.
3434

@@ -51,8 +51,8 @@ Some Azure-attached services are only available when they can be directly reache
5151
|**Automatic upgrades and patching**|Supported<br/>The data controller must either have direct access to the Microsoft Container Registry (MCR) or the container images need to be pulled from MCR and pushed to a local, private container registry that the data controller has access to.|Supported|
5252
|**Automatic backup and restore**|Supported<br/>Automatic local backup and restore.|Supported<br/>In addition to automated local backup and restore, you can _optionally_ send backups to Azure blob storage for long-term, off-site retention.|
5353
|**Monitoring**|Supported<br/>Local monitoring using Grafana and Kibana dashboards.|Supported<br/>In addition to local monitoring dashboards, you can _optionally_ send monitoring data and logs to Azure Monitor for at-scale monitoring of multiple sites in one place. |
54-
|**Authentication**|Use local username/password for data controller and dashboard authentication. Use SQL and Postgres logins or Active Directory (AD is not currently supported) for connectivity to database instances. Use Kubernetes authentication providers for authentication to the Kubernetes API.|In addition to or instead of the authentication methods for the indirectly connected mode, you can _optionally_ use Azure Active Directory.|
55-
|**Role-based access control (RBAC)**|Use Kubernetes RBAC on Kubernetes API. Use SQL and Postgres RBAC for database instances.|You can use Azure Active Directory and Azure RBAC.|
54+
|**Authentication**|Use local username/password for data controller and dashboard authentication. Use SQL and Postgres logins or Active Directory (AD is not currently supported) for connectivity to database instances. Use Kubernetes authentication providers for authentication to the Kubernetes API.|In addition to or instead of the authentication methods for the indirectly connected mode, you can _optionally_ use Microsoft Entra ID.|
55+
|**Role-based access control (RBAC)**|Use Kubernetes RBAC on Kubernetes API. Use SQL and Postgres RBAC for database instances.|You can use Microsoft Entra ID and Azure RBAC.|
5656

5757
## Connectivity requirements
5858

@@ -67,7 +67,7 @@ Some Azure-attached services are only available when they can be directly reache
6767
|**Billing telemetry data**|Customer environment -> Azure|Required|No|Indirect or direct|Utilization of database instances must be sent to Azure for billing purposes. |
6868
|**Monitoring data and logs**|Customer environment -> Azure|Optional|Maybe depending on data volume (see [Azure Monitor pricing](https://azure.microsoft.com/pricing/details/monitor/))|Indirect or direct|You may want to send the locally collected monitoring data and logs to Azure Monitor for aggregating data across multiple environments into one place and also to use Azure Monitor services like alerts, using the data in Azure Machine Learning, etc.|
6969
|**Azure Role-based Access Control (Azure RBAC)**|Customer environment -> Azure -> Customer Environment|Optional|No|Direct only|If you want to use Azure RBAC, then connectivity must be established with Azure at all times. If you don’t want to use Azure RBAC then local Kubernetes RBAC can be used.|
70-
|**Azure Active Directory (AAD) (Future)**|Customer environment -> Azure -> Customer environment|Optional|Maybe, but you may already be paying for Azure AD|Direct only|If you want to use Azure AD for authentication, then connectivity must be established with Azure at all times. If you don’t want to use Azure AD for authentication, you can use Active Directory Federation Services (ADFS) over Active Directory. **Pending availability in directly connected mode**|
70+
|**Microsoft Entra ID (Future)**|Customer environment -> Azure -> Customer environment|Optional|Maybe, but you may already be paying for Microsoft Entra ID|Direct only|If you want to use Microsoft Entra ID for authentication, then connectivity must be established with Azure at all times. If you don’t want to use Microsoft Entra ID for authentication, you can use Active Directory Federation Services (ADFS) over Active Directory. **Pending availability in directly connected mode**|
7171
|**Backup and restore**|Customer environment -> Customer environment|Required|No|Direct or indirect|The backup and restore service can be configured to point to local storage classes. |
7272
|**Azure backup - long term retention (Future)**| Customer environment -> Azure | Optional| Yes for Azure storage | Direct only |You may want to send backups that are taken locally to Azure Backup for long-term, off-site retention of backups and bring them back to the local environment for restore. |
7373
|**Provisioning and configuration changes from Azure portal**|Customer environment -> Azure -> Customer environment|Optional|No|Direct only|Provisioning and configuration changes can be done locally using Azure Data Studio or the appropriate CLI. In directly connected mode, you will also be able to provision and make configuration changes from the Azure portal.|
@@ -78,4 +78,4 @@ Some Azure-attached services are only available when they can be directly reache
7878

7979
## Additional network requirements
8080

81-
In addition, resource bridge (preview) requires [Arc-enabled Kubernetes endpoints](../network-requirements-consolidated.md#azure-arc-enabled-kubernetes-endpoints).
81+
In addition, resource bridge (preview) requires [Arc-enabled Kubernetes endpoints](../network-requirements-consolidated.md#azure-arc-enabled-kubernetes-endpoints).

articles/azure-arc/data/managed-instance-features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Azure Arc-enabled SQL Managed Instance share a common code base with the latest
8484
| Contained databases | Yes |
8585
| Encryption for backups | Yes |
8686
| SQL Server Authentication | Yes |
87-
| Azure Active Directory Authentication | No |
87+
| Microsoft Entra authentication | No |
8888
| Windows Authentication | Yes |
8989

9090
## <a name="RDBMSM"></a> RDBMS Manageability

0 commit comments

Comments
 (0)