Skip to content

Commit 1e9b83f

Browse files
DulceMontemayorDulceMontemayor
authored
Merge branch 'main' into docs-editor/dex-xdr-overview-1721255716
2 parents 5f07784 + dbb9583 commit 1e9b83f

File tree

674 files changed

+6822
-4234
lines changed

Some content is hidden

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

674 files changed

+6822
-4234
lines changed

‎.github/workflows/AutoLabelAssign.yml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Assign and label PR
2+
3+
permissions:
4+
pull-requests: write
5+
contents: read
6+
actions: read
7+
8+
on:
9+
workflow_run:
10+
workflows: [Background tasks]
11+
types:
12+
- completed
13+
14+
jobs:
15+
download-payload:
16+
name: Download and extract payload artifact
17+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ExtractPayload.yml@workflows-prod
18+
with:
19+
WorkflowId: ${{ github.event.workflow_run.id }}
20+
OrgRepo: ${{ github.repository }}
21+
secrets:
22+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
23+
24+
label-assign:
25+
name: Run assign and label
26+
needs: [download-payload]
27+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoLabelAssign.yml@workflows-prod
28+
with:
29+
PayloadJson: ${{ needs.download-payload.outputs.WorkflowPayload }}
30+
AutoAssignUsers: 1
31+
AutoLabel: 1
32+
ExcludedUserList: '["user1", "user2"]'
33+
ExcludedBranchList: '["branch1", "branch2"]'
34+
secrets:
35+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/AutoLabelMsftContributor.yml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: Auto label Microsoft contributors
2+
3+
permissions:
4+
pull-requests: write
5+
contents: read
6+
actions: read
7+
8+
on:
9+
workflow_run:
10+
workflows: [Background tasks]
11+
types:
12+
- completed
13+
14+
jobs:
15+
download-payload:
16+
if: github.repository_visibility == 'public'
17+
name: Download and extract payload artifact
18+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ExtractPayload.yml@workflows-prod
19+
with:
20+
WorkflowId: ${{ github.event.workflow_run.id }}
21+
OrgRepo: ${{ github.repository }}
22+
secrets:
23+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
24+
25+
label-msft:
26+
name: Label Microsoft contributors
27+
if: github.repository_visibility == 'public'
28+
needs: [download-payload]
29+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoLabelMsftContributor.yml@workflows-prod
30+
with:
31+
PayloadJson: ${{ needs.download-payload.outputs.WorkflowPayload }}
32+
secrets:
33+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
34+
TeamReadAccessToken: ${{ secrets.ORG_READTEAMS_TOKEN }}

‎.github/workflows/BackgroundTasks.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Background tasks
2+
3+
permissions:
4+
pull-requests: write
5+
contents: read
6+
7+
on:
8+
pull_request_target:
9+
10+
jobs:
11+
upload:
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- name: Save payload data
16+
env:
17+
PayloadJson: ${{ toJSON(github) }}
18+
AccessToken: ${{ github.token }}
19+
run: |
20+
mkdir -p ./pr
21+
echo $PayloadJson > ./pr/PayloadJson.json
22+
sed -i -e "s/$AccessToken/XYZ/g" ./pr/PayloadJson.json
23+
- uses: actions/upload-artifact@v4
24+
with:
25+
name: PayloadJson
26+
path: pr/

‎.github/workflows/LiveMergeCheck.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: PR can merge into branch
2+
3+
permissions:
4+
pull-requests: write
5+
statuses: write
6+
contents: read
7+
8+
on:
9+
pull_request_target:
10+
types: [opened, reopened, synchronize, edited]
11+
12+
jobs:
13+
14+
live-merge:
15+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-LiveMergeCheck.yml@workflows-prod
16+
with:
17+
PayloadJson: ${{ toJSON(github) }}
18+
secrets:
19+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/PrFileCount.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: PR file count less than limit
2+
3+
permissions:
4+
pull-requests: write
5+
statuses: write
6+
contents: read
7+
8+
on:
9+
pull_request_target:
10+
types: [opened, reopened, synchronize, labeled, unlabeled, edited]
11+
12+
jobs:
13+
14+
file-count:
15+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-PrFileCount.yml@workflows-prod
16+
with:
17+
PayloadJson: ${{ toJSON(github) }}
18+
secrets:
19+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/ProtectedFiles.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: PR has no protected files
2+
3+
permissions:
4+
pull-requests: write
5+
statuses: write
6+
contents: read
7+
8+
on: [pull_request_target]
9+
10+
jobs:
11+
12+
protected-files:
13+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ProtectedFiles.yml@workflows-prod
14+
with:
15+
PayloadJson: ${{ toJSON(github) }}
16+
secrets:
17+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/TierManagement.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Tier management
2+
3+
permissions:
4+
pull-requests: write
5+
contents: read
6+
7+
on:
8+
issue_comment:
9+
types: [created, edited]
10+
11+
jobs:
12+
13+
tier-mgmt:
14+
if: github.repository_visibility == 'private'
15+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-TierManagement.yml@workflows-prod
16+
with:
17+
PayloadJson: ${{ toJSON(github) }}
18+
EnableWriteSignOff: 1
19+
EnableReadOnlySignoff: 0
20+
secrets:
21+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

‎.openpublishing.redirection.defender.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,16 @@
199199
"source_path": "defender-endpoint/attack-simulations.md",
200200
"redirect_url": "/defender-endpoint/defender-endpoint-demonstrations",
201201
"redirect_document_id": true
202+
},
203+
{
204+
"source_path": "defender-endpoint/mssp-support.md",
205+
"redirect_url": "/defender-endpoint/configure-mssp-support",
206+
"redirect_document_id": true
207+
},
208+
{
209+
"source_path": "defender-endpoint/evaluate-mde.md",
210+
"redirect_url": "/defender-endpoint/evaluate-microsoft-defender-antivirus",
211+
"redirect_document_id": false
202212
}
203213
]
204214
}

‎defender-business/TOC.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
- name: Microsoft Defender for Business
22
href: index.yml
3-
items:
3+
items:
44
- name: Overview
55
items:
66
- name: What is Microsoft Defender for Business?
@@ -42,7 +42,7 @@
4242
- name: Step 5 - Onboard devices
4343
href: mdb-onboard-devices.md
4444
- name: Step 6 - Set up and review your security policies
45-
items:
45+
items:
4646
- name: Security policies and settings
4747
href: mdb-configure-security-settings.md
4848
- name: Next-generation protection
@@ -60,7 +60,7 @@
6060
- name: Change your endpoint security subscription
6161
href: mdb-manage-subscription.md
6262
- name: Monitor or manage devices
63-
items:
63+
items:
6464
- name: Get an overview of mobile threat defense
6565
href: mdb-mtd.md
6666
- name: View and manage devices
@@ -70,7 +70,7 @@
7070
- name: Offboard devices
7171
href: mdb-offboard-devices.md
7272
- name: View and respond to detected threats
73-
items:
73+
items:
7474
- name: Use your vulnerability management dashboard
7575
href: mdb-view-tvm-dashboard.md
7676
- name: View and manage incidents
@@ -92,7 +92,7 @@
9292
- name: Maintain your environment
9393
href: /Microsoft-365/business-premium/m365bp-mdb-maintain-environment?bc=%2defender-business%2Fbreadcrumb%2Ftoc.json&toc=%2Fdefender-business%2Ftoc.json
9494
- name: Reference information
95-
items:
95+
items:
9696
- name: Security, privacy, and compliance
9797
href: mdb-security-privacy-compliance.md
9898
- name: Top 10 ways to secure your business data
@@ -108,4 +108,4 @@
108108
- name: Microsoft 365 Business Premium
109109
href: /microsoft-365/business-premium/
110110
- name: Microsoft 365 Lighthouse
111-
href: /microsoft-365/lighthouse/m365-lighthouse-overview
111+
href: /microsoft-365/lighthouse/m365-lighthouse-overview

‎defender-business/index.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
ms.service: defender-business
99
ms.topic: landing-page
1010
ms.date: 09/07/2023
11-
ms.collection:
11+
ms.collection:
1212
- SMB
1313
- m365-security
1414
- m365-initiative-defender-business
@@ -92,5 +92,3 @@ landingContent:
9292
url: mdb-faq.yml
9393
- text: Microsoft Security Intelligence
9494
url: https://www.microsoft.com/wdsi/threats
95-
96-

0 commit comments

Comments
 (0)