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

Update Front Matter across SCBs and specific language in the Defender SCB to match OCC approved language #1398

Conversation

ahuynhMITRE
Copy link
Collaborator

@ahuynhMITRE ahuynhMITRE commented Nov 4, 2024

🗣 Description

OCC originally disapproved the consolidated baseline update document and SCBs for the Iceberg / Jellyfish release due to concerns that the SCBs may imply that CISA is telling the audience to upgrade their licenses to higher tier. The updates found in this PR include SCB changes to the front matter to address this concern.

💭 Motivation and context

Change is required for the consolidated change document and the SCBs to be approved for the version 1.4.0 release.
Closes #1393

🧪 Testing

N/A

✅ 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.
  • 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.
  • 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.

@ahuynhMITRE ahuynhMITRE added the baseline-document Issues relating to the text in the baseline documents themselves label Nov 4, 2024
@ahuynhMITRE ahuynhMITRE added this to the Kraken milestone Nov 4, 2024
@ahuynhMITRE ahuynhMITRE self-assigned this Nov 4, 2024
@ahuynhMITRE ahuynhMITRE linked an issue Nov 4, 2024 that may be closed by this pull request
9 tasks
@ahuynhMITRE
Copy link
Collaborator Author

Note: The SCBs language changes are expected to be reviewed by the lead lawyer at OCC on November 4th then routed to EAD (front office) for final review. This SCB update cannot be merged into MAIN until all parties above approve the updates!

Copy link
Collaborator

@schrolla schrolla left a comment

Choose a reason for hiding this comment

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

The changes look good to me, but I did notice that the introductions include the non-basic ASCII apostrophe's and double quotes around "as is". This doesn't hurt anything right now, but has caused issues with our automation for actual policy sections in the past. So might want to "flatten" these back to their basic ASCII equivalents in a future update.

@ahuynhMITRE
Copy link
Collaborator Author

@mitchelbaker-cisa added in @adhilto's additional links and resources, updated the implementation steps for DEFENDER.6.3v1, and added his note on log retention in the license requirements sections for Defender and EXO. Please take a look at all of the above and make any changes. Once approved will add to the consolidated change document to get routed up to EAD.

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.

  • AAD front matter looks good, left one comment for policy group 7 to verify license requirements language
  • Exo looks good
  • Teams front matter looks good, left one comment for policy group 6 to verify license requirements language
  • Defender front matter looks good, left a couple comments for policy group 1 and 4 to verify license requirements language

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, thanks for addressing those comments Andrew!

@ahuynhMITRE
Copy link
Collaborator Author

current status: routed back to CB Comms to go through final approvals on 11/7

@ahuynhMITRE
Copy link
Collaborator Author

@nanda-katikaneni & @schrolla Just got word from Chad that the SCBs have been approved! good to merge and add to 1.4.0 release!

@nanda-katikaneni nanda-katikaneni merged commit 63b0dec into main Nov 13, 2024
27 checks passed
@nanda-katikaneni nanda-katikaneni deleted the 1393-update-scbs-with-new-front-matter-text-approved-by-occ branch November 13, 2024 16:57
schrolla added a commit that referenced this pull request Nov 13, 2024
… SCB to match OCC approved language (#1398)

* Update defender.md

* Update aad.md

* Update exo.md

* Update aad.md

* Update defender.md

* Update powerbi.md

* Update powerplatform.md

* Update sharepoint.md

* Update teams.md

* Update removedpolicies.md

* added note to 6.3v1 on how to view and export logs that do not require G5 or E5

* added resources and note for audit retention.

* added note into the license requirement section

* formatting

* formatting

* Update PowerShell/ScubaGear/baselines/defender.md

Co-authored-by: Addam Schroll <[email protected]>

* Update section 7 license requirements

* Update group 6 license requirement section

* Update defender section 4 license requirements section.

---------

Co-authored-by: Addam Schroll <[email protected]>
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update SCBs with new front matter text approved by OCC
4 participants