Skip to content

Commit da6de77

Browse files
authored
Merge branch 'main' into US343598_execCAPs
2 parents 15ebeb0 + b44a319 commit da6de77

File tree

853 files changed

+7694
-6048
lines changed

Some content is hidden

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

853 files changed

+7694
-6048
lines changed

.github/workflows/AutoLabelMsftContributor.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,5 @@ jobs:
3131
PayloadJson: ${{ needs.download-payload.outputs.WorkflowPayload }}
3232
secrets:
3333
AccessToken: ${{ secrets.GITHUB_TOKEN }}
34-
TeamReadAccessToken: ${{ secrets.ORG_READTEAMS_TOKEN }}
34+
ClientId: ${{ secrets.M365_APP_CLIENT_ID }}
35+
PrivateKey: ${{ secrets.M365_APP_PRIVATE_KEY }}

.github/workflows/StaleBranch.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: (Scheduled) Stale branch removal
2+
3+
permissions:
4+
contents: write
5+
6+
on:
7+
schedule:
8+
- cron: "0 */12 * * *"
9+
10+
workflow_dispatch:
11+
12+
13+
jobs:
14+
15+
stale-branch:
16+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-StaleBranch.yml@workflows-prod
17+
with:
18+
PayloadJson: ${{ toJSON(github) }}
19+
RepoBranchSkipList: '[
20+
"ExampleBranch1",
21+
"ExampleBranch2"
22+
]'
23+
ReportOnly: true
24+
secrets:
25+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

.openpublishing.redirection.defender-endpoint.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "defender-endpoint/threat-analytics-analyst-reports.md",
5+
"redirect_url": "/defender-xdr/threat-analytics-analyst-reports",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "defender-endpoint/threat-analytics.md",
10+
"redirect_url": "/defender-xdr/threat-analytics",
11+
"redirect_document_id": false
12+
},
313
{
414
"source_path": "defender-endpoint/configure-microsoft-threat-experts.md",
515
"redirect_url": "/defender-xdr/defender-experts-for-hunting",

.openpublishing.redirection.defender-office-365.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,16 @@
4949
"source_path": "defender-office-365/pilot-deploy-defender-office-365.md",
5050
"redirect_url": "/defender-xdr/pilot-deploy-defender-office-365",
5151
"redirect_document_id": false
52+
},
53+
{
54+
"source_path": "defender-office-365/submissions-error-messages.md",
55+
"redirect_url": "/defender-office-365/submissions-result-definitions",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path": "defender-office-365/step-by-step-guides/deploy-and-configure-the-report-message-add-in.md",
60+
"redirect_url": "/defender-office-365/submissions-outlook-report-messages",
61+
"redirect_document_id": false
5262
}
5363
]
5464
}

.openpublishing.redirection.defender-xdr.json

Lines changed: 132 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"redirect_url": "/defender-for-identity/microsoft-365-security-center-mdi",
1111
"redirect_document_id": false
1212
},
13-
1413
{
1514
"source_path": "defender-xdr/eval-create-eval-environment.md",
1615
"redirect_url": "/defender-xdr/pilot-deploy-overview",
@@ -171,6 +170,31 @@
171170
"redirect_url": "/defender-xdr/",
172171
"redirect_document_id": false
173172
},
173+
{
174+
"source_path": "defender-xdr/microsoft-threat-actor-naming.md",
175+
"redirect_url": "/unified-secops-platform/microsoft-threat-actor-naming",
176+
"redirect_document_id": false
177+
},
178+
{
179+
"source_path": "defender-xdr/malware-naming.md",
180+
"redirect_url": "/unified-secops-platform/malware-naming",
181+
"redirect_document_id": false
182+
},
183+
{
184+
"source_path": "defender-xdr/criteria.md",
185+
"redirect_url": "/unified-secops-platform/criteria",
186+
"redirect_document_id": false
187+
},
188+
{
189+
"source_path": "defender-xdr/submission-guide.md",
190+
"redirect_url": "/unified-secops-platform/submission-guide",
191+
"redirect_document_id": false
192+
},
193+
{
194+
"source_path": "defender-xdr/virus-initiative-criteria.md",
195+
"redirect_url": "/unified-secops-platform/virus-initiative-criteria",
196+
"redirect_document_id": false
197+
},
174198
{
175199
"source_path": "defender-xdr/tickets.md",
176200
"redirect_url": "/defender-xdr/troubleshoot",
@@ -181,10 +205,115 @@
181205
"redirect_url": "/defender-xdr/troubleshoot",
182206
"redirect_document_id": false
183207
},
208+
{
209+
"source_path": "defender-xdr/mto-advanced-hunting.md",
210+
"redirect_url": "/unified-secops-platform/mto-advanced-hunting",
211+
"redirect_document_id": false
212+
},
213+
{
214+
"source_path": "defender-xdr/mto-dashboard.md",
215+
"redirect_url": "/unified-secops-platform/mto-dashboard",
216+
"redirect_document_id": false
217+
},
218+
{
219+
"source_path": "defender-xdr/mto-endpoint-security-policy.md",
220+
"redirect_url": "/unified-secops-platform/mto-endpoint-security-policy",
221+
"redirect_document_id": false
222+
},
223+
{
224+
"source_path": "defender-xdr/mto-incidents-alerts.md",
225+
"redirect_url": "/unified-secops-platform/mto-incidents-alerts",
226+
"redirect_document_id": false
227+
},
228+
{
229+
"source_path": "defender-xdr/mto-overview.md",
230+
"redirect_url": "/unified-secops-platform/mto-overview",
231+
"redirect_document_id": false
232+
},
233+
{
234+
"source_path": "defender-xdr/mto-requirements.md",
235+
"redirect_url": "/unified-secops-platform/mto-requirements",
236+
"redirect_document_id": false
237+
},
238+
{
239+
"source_path": "defender-xdr/mto-tenant-devices.md",
240+
"redirect_url": "/unified-secops-platform/mto-tenant-devices",
241+
"redirect_document_id": false
242+
},
243+
{
244+
"source_path": "defender-xdr/mto-tenantgroups.md",
245+
"redirect_url": "/unified-secops-platform/mto-tenantgroups",
246+
"redirect_document_id": false
247+
},
248+
{
249+
"source_path": "defender-xdr/mto-tenants.md",
250+
"redirect_url": "/unified-secops-platform/mto-tenants",
251+
"redirect_document_id": false
252+
},
253+
{
254+
"source_path": "defender-xdr/portals.md",
255+
"redirect_url": "/unified-secops-platform/overview-plan#understand-microsoft-security-portals-and-admin-centers",
256+
"redirect_document_id": false
257+
},
184258
{
185259
"source_path": "defender-xdr/microsoft-sentinel-onboard.md",
186260
"redirect_url": "/unified-secops-platform/microsoft-sentinel-onboard",
187261
"redirect_document_id": false
188-
}
262+
},
263+
{
264+
"source_path": "defender-xdr/first-incident-path-phishing.md",
265+
"redirect_url": "/security/operations/incident-response-playbook-phishing",
266+
"redirect_document_id": false
267+
},
268+
{
269+
"source_path": "defender-xdr/first-incident-path-identity.md",
270+
"redirect_url": "/defender-for-identity/manage-security-alerts",
271+
"redirect_document_id": false
272+
},
273+
{
274+
"source_path": "defender-xdr/incident-response-overview.md",
275+
"redirect_url": "/defender-xdr/incidents-overview",
276+
"redirect_document_id": true
277+
},
278+
{
279+
"source_path": "defender-xdr/respond-first-incident-analyze.md",
280+
"redirect_url": "/defender-xdr/investigate-incidents",
281+
"redirect_document_id": true
282+
},
283+
{
284+
"source_path": "defender-xdr/respond-first-incident-365-defender.md",
285+
"redirect_url": "/defender-xdr/manage-incidents",
286+
"redirect_document_id": true
287+
},
288+
{
289+
"source_path": "defender-xdr/export-incidents-queue.md",
290+
"redirect_url": "/defender-xdr/incident-queue",
291+
"redirect_document_id": true
292+
},
293+
{
294+
"source_path": "defender-xdr/respond-first-incident-remediate.md",
295+
"redirect_url": "/defender-xdr/incidents-overview",
296+
"redirect_document_id": false
297+
},
298+
{
299+
"source_path": "defender-xdr/m365d-time-zone.md",
300+
"redirect_url": "/defender-xdr/m365d-enable-faq",
301+
"redirect_document_id": true
302+
},
303+
{
304+
"source_path": "defender-xdr/feedback.md",
305+
"redirect_url": "/defender-xdr/m365d-enable-faq",
306+
"redirect_document_id": false
307+
},
308+
{
309+
"source_path": "defender-xdr/microsoft-365-defender-integration-with-azure-sentinel.md",
310+
"redirect_url": "/azure/sentinel/microsoft-365-defender-sentinel-integration",
311+
"redirect_document_id": false
312+
},
313+
{
314+
"source_path": "defender-xdr/microsoft-365-security-center-defender-cloud.md",
315+
"redirect_url": "/azure/defender-for-cloud/concept-integration-365",
316+
"redirect_document_id": false
317+
}
189318
]
190-
}
319+
}
-43.2 KB
Binary file not shown.

0 commit comments

Comments
 (0)