Skip to content

Commit 34aa3c5

Browse files
authored
Merge branch 'main' into patch-80
2 parents 213e874 + 47e9f6f commit 34aa3c5

File tree

293 files changed

+3141
-1792
lines changed

Some content is hidden

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

293 files changed

+3141
-1792
lines changed

.acrolinx-config.edn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{:changed-files-limit 60
22
:allowed-branchname-matches ["main" "release-.*"]
3-
:allowed-filename-matches ["ATADocs/" "ATPDocs/" "CloudAppSecurityDocs/" "defender/" "defender-business/" "defender-endpoint/" "defender-for-cloud/" "defender-for-iot/" "defender-office-365/" "defender-vulnerability-management/" "defender-xdr/" "exposure-management/" "unified-secops-platform/"] ;; Can be overridden in repo-specific edn file. This is an allow list that identifies which folders contain the files Acrolinx will check. Separate multiple folders as follows ["folder/" "folder2"]
3+
:allowed-filename-matches ["advanced-threat-analytics/" "defender/" "defender-business/" "defender-endpoint/" "defender-for-cloud-apps/" "defender-for-cloud/" "defender-for-identity/" "defender-for-iot/" "defender-office-365/" "defender-vulnerability-management/" "defender-xdr/" "exposure-management/" "unified-secops-platform/"] ;; Can be overridden in repo-specific edn file. This is an allow list that identifies which folders contain the files Acrolinx will check. Separate multiple folders as follows ["folder/" "folder2"]
44

55
:use-gh-statuses true
66

.github/workflows/AutoLabelAssign.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,11 @@ jobs:
3030
with:
3131
PayloadJson: ${{ needs.download-payload.outputs.WorkflowPayload }}
3232
AutoAssignUsers: 1
33+
AutoAssignReviewers: 1
3334
AutoLabel: 1
3435
ExcludedUserList: '["user1", "user2"]'
3536
ExcludedBranchList: '["branch1", "branch2"]'
3637
secrets:
37-
AccessToken: ${{ secrets.GITHUB_TOKEN }}
38+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
39+
PrivateKey: ${{ secrets.M365_APP_PRIVATE_KEY }}
40+
ClientId: ${{ secrets.M365_APP_CLIENT_ID }}

.github/workflows/BackgroundTasks.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ permissions:
66

77
on:
88
pull_request_target:
9+
types: [opened, synchronize, reopened, ready_for_review]
910

1011
jobs:
1112
upload:

.openpublishing.redirection.defender-cloud-apps.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,5 +1015,10 @@
10151015
"redirect_url": "/defender-cloud-apps/enable-instant-visibility-protection-and-governance-actions-for-your-apps",
10161016
"redirect_document_id": true
10171017
},
1018+
{
1019+
"source_path": "defender-for-cloud-apps/cloud-discovery-anomaly-detection-policy.md",
1020+
"redirect_url": "/defender-cloud-apps/cloud-discovery-policies",
1021+
"redirect_document_id": false
1022+
}
10181023
]
10191024
}

.openpublishing.redirection.defender-identity.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -859,6 +859,11 @@
859859
"source_path": "defender-for-identity/manage-security-alerts.md",
860860
"redirect_url": "/defender-for-identity/understanding-security-alerts",
861861
"redirect_document_id": false
862-
},
862+
},
863+
{
864+
"source_path": "defender-for-identity/automated-response-exclusions.md",
865+
"redirect_url": "/defender-xdr/automatic-attack-disruption-exclusions",
866+
"redirect_document_id": false
867+
}
863868
]
864869
}

defender-business/mdb-faq.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,9 @@ sections:
163163
164164
- question: Can I have a mix of Microsoft endpoint security subscriptions?
165165
answer: |
166-
Microsoft Defender for Business does not support mixed licensing, so a tenant with Defender for Business (which is included in Microsoft 365 Business Premium) along with Defender for Endpoint Plan 2 (which is included in Microsoft 365 E5 Security) defaults to the Defender for Business experience.
166+
Microsoft Defender for Business does not support mixed licensing, so a tenant with Defender for Business (which is included in Microsoft 365 Business Premium) along with Defender for Endpoint Plan 2 (which is included in the Microsoft Defender Suite) defaults to the Defender for Business experience.
167167
168-
For example, if you have 80 users licensed for Defender for Business (as part of a Microsoft 365 Business Premium subscription), and you add Microsoft 365 E5 Security for 30 of those users, the experience for all users defaults to Defender for Business. If you want to change that to the Defender for Endpoint Plan 2 experience, you should license all users for Defender for Endpoint Plan 2 (either through the standalone version of Defender for Endpoint Plan 2 or Microsoft 365 E5 Security), and then contact Microsoft Support to request the switch for your tenant.
168+
For example, if you have 80 users licensed for Defender for Business (as part of a Microsoft 365 Business Premium subscription), and you add the Microsoft Defender Suite for 30 of those users, the experience for all users defaults to Defender for Business. If you want to change that to the Defender for Endpoint Plan 2 experience, you should license all users for Defender for Endpoint Plan 2 (either through the standalone version of Defender for Endpoint Plan 2 or the Microsoft Defender Suite), and then contact Microsoft Support to request the switch for your tenant.
169169
170170
For more information, see [Manage your subscription settings](mdb-manage-subscription.md).
171171

defender-business/mdb-get-started.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ ms.collection:
1919
- tier1
2020
- essentials-get-started
2121
ms.custom: intro-get-started
22+
#customer intent: As a Defender for Business admin, I need quick guidance to navigate the Microsoft Defender portal and find first steps so I can get started securing devices and email.
2223
---
2324

2425
# Visit the Microsoft Defender portal

defender-business/mdb-manage-subscription.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ms.collection:
2222

2323
[Microsoft Defender for Business](mdb-overview.md) and [Microsoft Defender for Endpoint](/defender-endpoint/microsoft-defender-endpoint) are endpoint security subscriptions that your organization can use to protect devices, such as computers, tablets, and phones.
2424

25-
As your organization grows, you might be thinking about changing from Defender for Business to Defender for Endpoint. For example, if you have Defender for Business as part of a [Microsoft 365 Business Premium](/microsoft-365/business-premium/m365bp-overview) subscription, and you add Microsoft 365 E5 Security to your subscription, you now have Defender for Endpoint Plan 2 capabilities while retaining the Defender for Business experience.
25+
As your organization grows, you might be thinking about changing from Defender for Business to Defender for Endpoint. For example, if you have Defender for Business as part of a [Microsoft 365 Business Premium](/microsoft-365/business-premium/m365bp-overview) subscription, and you add the Microsoft Defender Suite to your subscription, you now have Defender for Endpoint Plan 2 capabilities while retaining the Defender for Business experience.
2626

2727
This article describes how to view your current license state and, if needed, change your experience from Defender for Business to Defender for Endpoint.
2828

defender-endpoint/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,8 @@
285285
href: linux-deploy-defender-for-endpoint-using-golden-images.md
286286
- name: Direct onboarding with Defender for Cloud
287287
href: /azure/defender-for-cloud/onboard-machines-with-defender-for-endpoint?toc=/defender-endpoint/toc.json&bc=/defender-endpoint/breadcrumb/toc.json
288+
- name: Deployment guidance for Defender for Endpoint on Linux for SAP
289+
href: mde-linux-deployment-on-sap.md
288290
- name: Configure Defender for Endpoint on Linux
289291
items:
290292
- name: Configure security policies and settings

defender-endpoint/aggregated-reporting.md

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.collection:
1212
- tier3
1313
ms.topic: article
1414
search.appverid: met150
15-
ms.date: 03/04/2025
15+
ms.date: 10/20/2025
1616
appliesto:
1717
- Microsoft Defender for Endpoint Plan 2
1818
---
@@ -33,13 +33,16 @@ When aggregated reporting is turned on, you can query for a summary of all suppo
3333

3434
The following requirements must be met before turning on aggregated reporting:
3535

36-
- Defender for Endpoint Plan 2 license
3736
- Permissions to enable advanced features
3837

39-
Aggregated reporting supports the following:
4038

41-
- Client version: Windows version 24H and later
42-
- Operating systems: Windows 11 (22H2, Enterprise), Windows 10 (20H2, 21H1, 21H2), Windows Server 2019 and later, Windows Server version 20H2 or Azure Stack HCI OS, version 23H2 and later
39+
### Supported operating systems:
40+
41+
- Windows 10 (20H2, 21H1, 21H2)
42+
- Windows 11 (22H2, Enterprise)
43+
- Windows Server 2019 and later
44+
- Windows Server version 20H2 or Azure Stack HCI OS, version 23H2 and later
45+
- Client version: Windows version 24H and later
4346

4447
## Turn on aggregated reporting
4548

@@ -77,9 +80,9 @@ To query new data with aggregated reports:
7780
3. When necessary, create new custom rules to incorporate new action types.
7881
4. Go to the **Advanced Hunting** page and query the new data.
7982

80-
Here is an example of advanced hunting query results with aggregated reports.
83+
Here is an example of advanced hunting query results with aggregated reports.
8184

82-
:::image type="content" source="/defender-endpoint/media/reports/aggregated-reporting/sample-results-aggregated-reports-small.png" alt-text="Screenshot of advanced hunting query results with aggregated reports." lightbox="/defender-endpoint/media/reports/aggregated-reporting/sample-results-aggregated-reports.png":::
85+
:::image type="content" source="/defender-endpoint/media/reports/aggregated-reporting/sample-results-aggregated-reports-small.png" alt-text="Screenshot of advanced hunting query results with aggregated reports." lightbox="/defender-endpoint/media/reports/aggregated-reporting/sample-results-aggregated-reports.png":::
8386

8487
## Sample advanced hunting queries
8588

@@ -125,4 +128,4 @@ DeviceNetworkEvents
125128
| where uniqueEventsAggregated > 10
126129
| project-reorder ActionType, Timestamp, uniqueEventsAggregated
127130
| sort by uniqueEventsAggregated desc
128-
```
131+
```

0 commit comments

Comments
 (0)