-
Notifications
You must be signed in to change notification settings - Fork 260
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
Update Front Matter across SCBs and specific language in the Defender SCB to match OCC approved language #1398
Conversation
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! |
There was a problem hiding this 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.
@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. |
Co-authored-by: Addam Schroll <[email protected]>
There was a problem hiding this 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
There was a problem hiding this 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!
current status: routed back to CB Comms to go through final approvals on 11/7 |
@nanda-katikaneni & @schrolla Just got word from Chad that the SCBs have been approved! good to merge and add to 1.4.0 release! |
… 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]>
🗣 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
✅ 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