Skip to content

Commit 232e993

Browse files
ElazarKElazarK
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into deprecate-alerts-recommend
2 parents b955091 + 5fb3638 commit 232e993

File tree

198 files changed

+3069
-1642
lines changed

Some content is hidden

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

198 files changed

+3069
-1642
lines changed

‎.openpublishing.publish.config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,7 @@
840840
".openpublishing.redirection.media-services.json",
841841
".openpublishing.redirection.security-benchmark.json",
842842
".openpublishing.redirection.sql-database.json",
843-
".openpublishing.redirection.synapse-analytics.json",
843+
"articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
844844
".openpublishing.redirection.azure-web-pubsub.json",
845845
".openpublishing.redirection.azure-monitor.json",
846846
".openpublishing.redirection.azure-percept.json",
@@ -871,6 +871,7 @@
871871
"articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
872872
"articles/azure-video-analyzer/.openpublishing.redirection.azure-video-analyzer.json",
873873
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
874+
"articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
874875
"articles/mysql/.openpublishing.redirection.mysql.json"
875876
]
876877
}

‎.openpublishing.redirection.json

Lines changed: 0 additions & 790 deletions
Large diffs are not rendered by default.

‎.openpublishing.redirection.synapse-analytics.json

Lines changed: 0 additions & 75 deletions
This file was deleted.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.workload: identity
1111
ms.topic: how-to
1212
ms.author: kengaderdus
1313
ms.subservice: B2C
14-
ms.date: 09/15/2021
14+
ms.date: 02/09/2022
1515
---
1616

1717
# Monitor Azure AD B2C with Azure Monitor
@@ -116,7 +116,7 @@ To create the custom authorization and delegation in Azure Lighthouse, we use an
116116
| --------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
117117
| Subscription | Select the directory that contains the Azure subscription where the _azure-ad-b2c-monitor_ resource group was created. |
118118
| Region | Select the region where the resource will be deployed. |
119-
| Msp Offer Name | A name describing this definition. For example, _Azure AD B2C Monitoring_. This is the name that will be displayed in Azure Lighthouse. |
119+
| Msp Offer Name | A name describing this definition. For example, _Azure AD B2C Monitoring_. This is the name that will be displayed in Azure Lighthouse. The **MSP Offer Name** must be unique in your Azure AD. To monitor multiple Azure AD B2C tenants, use different names. |
120120
| Msp Offer Description | A brief description of your offer. For example, _Enables Azure Monitor in Azure AD B2C_. |
121121
| Managed By Tenant Id | The **Tenant ID** of your Azure AD B2C tenant (also known as the directory ID). |
122122
| Authorizations | Specify a JSON array of objects that include the Azure AD `principalId`, `principalIdDisplayName`, and Azure `roleDefinitionId`. The `principalId` is the **Object ID** of the B2C group or user that will have access to resources in this Azure subscription. For this walkthrough, specify the group's Object ID that you recorded earlier. For the `roleDefinitionId`, use the [built-in role](../role-based-access-control/built-in-roles.md) value for the _Contributor role_, `b24988ac-6180-42a0-ab88-20f7382dd24c`. |

‎articles/active-directory-b2c/subjourneys.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: CelesteDG
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: reference
11-
ms.date: 10/15/2021
11+
ms.date: 02/09/2022
1212
ms.author: kengaderdus
1313
ms.subservice: B2C
1414
---
@@ -102,8 +102,6 @@ A new orchestration step of type `InvokeSubJourney` is used to execute a sub jou
102102
</OrchestrationStep>
103103
```
104104

105-
> [!NOTE]
106-
> A sub journey should not call another sub journey.
107105

108106
## Components
109107

‎articles/active-directory/authentication/TOC.yml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,24 @@
186186
href: howto-password-smart-lockout.md
187187
- name: Certificate-based authentication
188188
items:
189-
- name: Get started with certificate auth
190-
href: active-directory-certificate-based-authentication-get-started.md
189+
- name: Cloud-native CBA (Preview)
191190
items:
191+
- name: Overview
192+
href: concept-cloud-native-certificate-based-authentication.md
193+
- name: How cloud-native CBA works
194+
href: concept-cloud-native-certificate-based-authentication-technical-deep-dive.md
195+
- name: Limitations
196+
href: concept-cloud-native-certificate-based-authentication-limitations.md
197+
- name: Configure cloud-native CBA
198+
href: how-to-certificate-based-authentication.md
199+
- name: FAQ
200+
href: cloud-native-certificate-based-authentication-faq.yml
201+
- name: Troubleshoot
202+
href: troubleshoot-cloud-native-certificate-based-authentication.md
203+
- name: CBA with federation
204+
items:
205+
- name: Configure CBA with federation
206+
href: active-directory-certificate-based-authentication-get-started.md
192207
- name: Use on Android Devices
193208
href: active-directory-certificate-based-authentication-android.md
194209
- name: Use on iOS Devices

0 commit comments

Comments
 (0)