Skip to content

Commit 4460d14

Browse files
authored
Merge pull request #210145 from MicrosoftDocs/main
merge main to live 4 PM Sunday
2 parents d92ceef + b6a095b commit 4460d14

File tree

5 files changed

+17
-11
lines changed

5 files changed

+17
-11
lines changed

articles/active-directory-domain-services/alert-service-principal.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.service: active-directory
1010
ms.subservice: domain-services
1111
ms.workload: identity
1212
ms.topic: troubleshooting
13-
ms.date: 07/09/2020
13+
ms.date: 09/04/2022
1414
ms.author: justinha
1515

1616
---
@@ -34,7 +34,7 @@ To check which service principal is missing and must be recreated, complete the
3434

3535
1. In the Azure portal, select **Azure Active Directory** from the left-hand navigation menu.
3636
1. Select **Enterprise applications**. Choose *All applications* from the **Application Type** drop-down menu, then select **Apply**.
37-
1. Search for each of the following application IDs. If no existing application is found, follow the *Resolution* steps to create the service principal or re-register the namespace.
37+
1. Search for each of the following application IDs. For Azure Global, search for AppId value *2565bd9d-da50-47d4-8b85-4c97f669dc36*. For other Azure clouds, search for AppId value *6ba9a5d4-8456-4118-b521-9c5ca10cdf84*. If no existing application is found, follow the *Resolution* steps to create the service principal or re-register the namespace.
3838

3939
| Application ID | Resolution |
4040
| :--- | :--- |
@@ -45,7 +45,7 @@ To check which service principal is missing and must be recreated, complete the
4545

4646
### Recreate a missing Service Principal
4747

48-
If application ID *2565bd9d-da50-47d4-8b85-4c97f669dc36* is missing from your Azure AD directory, use Azure AD PowerShell to complete the following steps. For more information, see [Azure AD PowerShell](/powershell/azure/active-directory/install-adv2).
48+
If application ID *2565bd9d-da50-47d4-8b85-4c97f669dc36* is missing from your Azure AD directory in Azure Global, use Azure AD PowerShell to complete the following steps. For other Azure clouds, use AppId value *6ba9a5d4-8456-4118-b521-9c5ca10cdf84*. For more information, see [Azure AD PowerShell](/powershell/azure/active-directory/install-adv2).
4949

5050
1. If needed, install the Azure AD PowerShell module and import it as follows:
5151

articles/azure-resource-manager/management/azure-subscription-service-limits.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -402,18 +402,22 @@ This section lists the most common service limits you might encounter as you use
402402

403403
[!INCLUDE [sentinel-service-limits](../../../includes/sentinel-limits-notebooks.md)]
404404

405-
### Threat intelligence limits
405+
### Repositories limits
406406

407-
[!INCLUDE [sentinel-service-limits](../../../includes/sentinel-limits-threat-intelligence.md)]
407+
[!INCLUDE [sentinel-service-limits](../../../includes/sentinel-limits-repositories.md)]
408408

409-
### Watchlist limits
409+
### Threat intelligence limits
410410

411-
[!INCLUDE [sentinel-service-limits](../../../includes/sentinel-limits-watchlists.md)]
411+
[!INCLUDE [sentinel-service-limits](../../../includes/sentinel-limits-threat-intelligence.md)]
412412

413413
### User and Entity Behavior Analytics (UEBA) limits
414414

415415
[!INCLUDE [sentinel-service-limits](../../../includes/sentinel-limits-ueba.md)]
416416

417+
### Watchlist limits
418+
419+
[!INCLUDE [sentinel-service-limits](../../../includes/sentinel-limits-watchlists.md)]
420+
417421
## Service Bus limits
418422

419423
[!INCLUDE [azure-servicebus-limits](../../../includes/service-bus-quotas-table.md)]

articles/defender-for-cloud/defender-for-containers-enable.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Defender for Containers protects your clusters whether they're running in:
2323
Learn about this plan in [Overview of Microsoft Defender for Containers](defender-for-containers-introduction.md).
2424

2525
You can learn more by watching these videos from the Defender for Cloud in the Field video series:
26+
2627
- [Microsoft Defender for Containers in a multi-cloud environment](episode-nine.md)
2728
- [Protect Containers in GCP with Defender for Containers](episode-ten.md)
2829

@@ -102,7 +103,7 @@ You can check out the following blogs:
102103
- [Protect your Google Cloud workloads with Microsoft Defender for Cloud](https://techcommunity.microsoft.com/t5/microsoft-defender-for-cloud/protect-your-google-cloud-workloads-with-microsoft-defender-for/ba-p/3073360)
103104
- [Introducing Microsoft Defender for Containers](https://techcommunity.microsoft.com/t5/microsoft-defender-for-cloud/introducing-microsoft-defender-for-containers/ba-p/2952317)
104105
- [A new name for multicloud security: Microsoft Defender for Cloud](https://techcommunity.microsoft.com/t5/microsoft-defender-for-cloud/a-new-name-for-multi-cloud-security-microsoft-defender-for-cloud/ba-p/2943020)
105-
106+
106107
## Next steps
107108

108109
[Use Defender for Containers to scan your ACR images for vulnerabilities](defender-for-container-registries-usage.md).

articles/defender-for-cloud/includes/defender-for-containers-enable-plan-eks.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,9 @@ To protect your EKS clusters, enable the Containers plan on the relevant account
3030
3131
1. Continue through the remaining pages of the connector wizard.
3232

33-
1. Azure Arc-enabled Kubernetes, the Defender extension, and the Azure Policy extension should be installed and running on your EKS clusters. There are two dedicated Defender for Cloud recommendations to install these extensions (and Azure Arc if necessary):
33+
1. Azure Arc-enabled Kubernetes, the Defender extension, and the Azure Policy extension should be installed and running on your EKS clusters. There is a dedicated Defender for Cloud recommendations to install these extensions (and Azure Arc if necessary):
3434
- `EKS clusters should have Microsoft Defender's extension for Azure Arc installed`
35-
- `EKS clusters should have the Azure Policy extension installed`
36-
35+
3736
For each of the recommendations, follow the steps below to install the required extensions.
3837

3938
**To install the required extensions**:

articles/sentinel/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@
7171
href: sentinel-solutions.md
7272
- name: Content hub catalog
7373
href: sentinel-solutions-catalog.md
74+
- name: Manage custom content with repositories
75+
href: ci-cd-custom-content.md
7476
- name: Collect data
7577
items:
7678
- name: Data collection methods

0 commit comments

Comments
 (0)