Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix circular reference between MS.EXO.16.1v1 and MS.DEFENDER.5.1v1 implementation instructions #1198

Conversation

schrolla
Copy link
Collaborator

@schrolla schrolla commented Jul 3, 2024

🗣 Description

Replicates list of activities from MS.EXO.16.1v1 to include when configuring M365 Defender alert policies as per MS.DEFENDER.5.1v1 implementation instructions.

💭 Motivation and context

Previously, readers would have to 'flip' between the two SCBs to follow Defender SCB implementation instructions while referencing Exchange Online alert policy activities list, then back to Defender to finish. Replicating the list from EXO in the Defender SCB eases the reader burden, makes the implementation instructions more standalone, while retaining the references between the two policy items for awareness.

Closes #565

🧪 Testing

This update only includes implementation instruction changes and does not change the contents or meaning of the policies themselves. Please review both MS.DEFENDER.5.1v1 and MS.EXO.16.1v1 SCBs (prior and proposed) to ensure the changes improve clarity and readability. Also recommend running through the MS.DEFENDER.5.1v1 implementation directly to validate usability.

✅ Pre-approval checklist

  • This PR has an informative and human-readable title.
  • PR targets the correct parent branch (e.g., main or release-name) for merge.
  • Changes are limited to a single goal - eschew scope creep!
  • Changes are sized such that they do not touch excessive number of files.
  • All future TODOs are captured in issues, which are referenced in code comments.
  • These code changes follow the ScubaGear content style guide.
  • Related issues these changes resolve are linked preferably via closing keywords.
  • All relevant type-of-change labels added.
  • All relevant project fields are set.
  • All relevant repo and/or project documentation updated to reflect these changes. (No doc updates required)
  • Unit tests added/updated to cover PowerShell and Rego changes. (No code changes)
  • Functional tests added/updated to cover PowerShell and Rego changes. (No code changes)
  • All relevant functional tests passed.
  • All automated checks (e.g., linting, static analysis, unit/smoke tests) passed.

✅ Pre-merge checklist

  • PR passed smoke test check.

  • Feature branch has been rebased against changes from parent branch, as needed

    Use Rebase branch button below or use this reference to rebase from the command line.

  • Resolved all merge conflicts on branch

  • Notified merge coordinator that PR is ready for merge via comment mention

✅ Post-merge checklist

  • Feature branch deleted after merge to clean up repository.
  • Verified that all checks pass on parent branch (e.g., main or release-name) after merge.

@schrolla schrolla added enhancement This issue or pull request will add new or improve existing functionality baseline-document Issues relating to the text in the baseline documents themselves labels Jul 3, 2024
@schrolla schrolla added this to the Iceberg milestone Jul 3, 2024
@schrolla schrolla self-assigned this Jul 3, 2024
@schrolla schrolla linked an issue Jul 3, 2024 that may be closed by this pull request
3 tasks
@schrolla schrolla marked this pull request as ready for review July 3, 2024 15:03
Copy link
Collaborator

@mitchelbaker-cisa mitchelbaker-cisa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, requested a couple minor changes.

Unrelated to the changes in this PR, should we consider linking directly to respective admin consoles? i.e.

  1. Sign in to Microsoft 365 Defender.

PowerShell/ScubaGear/baselines/defender.md Show resolved Hide resolved
PowerShell/ScubaGear/baselines/defender.md Outdated Show resolved Hide resolved
PowerShell/ScubaGear/baselines/defender.md Outdated Show resolved Hide resolved
@buidav
Copy link
Collaborator

buidav commented Jul 3, 2024

Unrelated to the changes in this PR, should we consider linking directly to respective admin consoles? i.e.

  1. Sign in to Microsoft 365 Defender.

#423
We don't want to have to maintain a list of the different admin portals for commercial vs gcc vs gcchigh vs dod vs International domains.
There also isn't any good documentation we can point to that lists all of the admin centers with their correct domain names.

@schrolla schrolla force-pushed the 565-msexo161v1-instructions-contain-a-circular-reference-with-the-defender-baseline branch from 7705cf6 to 55ea497 Compare July 11, 2024 17:26
schrolla and others added 2 commits July 11, 2024 12:27
Co-authored-by: mitchelbaker-cisa <149098823+mitchelbaker-cisa@users.noreply.github.com>
@schrolla
Copy link
Collaborator Author

@nanda-katikaneni This PR is ready for merge.

@nanda-katikaneni nanda-katikaneni merged commit eaacdd9 into main Jul 15, 2024
21 checks passed
@nanda-katikaneni nanda-katikaneni deleted the 565-msexo161v1-instructions-contain-a-circular-reference-with-the-defender-baseline branch July 15, 2024 16:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
baseline-document Issues relating to the text in the baseline documents themselves enhancement This issue or pull request will add new or improve existing functionality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

MS.EXO.16.1v1 instructions contain a circular reference with the Defender baseline
5 participants