Draft
Conversation
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## main #41582 +/- ##
==========================================
- Coverage 66.35% 66.31% -0.05%
==========================================
Files 2491 2495 +4
Lines 199310 199658 +348
Branches 8827 8949 +122
==========================================
+ Hits 132262 132401 +139
- Misses 55089 55278 +189
- Partials 11959 11979 +20
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Member
|
Thanks @thomastysong! I think this is a great starting point for use our pair programming call on Tues. I set this to draft in the meantime... Also, I think we can close the other PR? I think we're rolling with this new PR as the latest and greatest. |
13 tasks
Add configuration profiles, verification policies, and remediation scripts for CIS Microsoft Windows 11 Enterprise Benchmark v4.0.0 controls that can be deployed through Fleet's existing MDM profile, policy, and script systems. Configuration profiles (SyncML XML): - User Rights Assignment (39 controls, section 2.2) - BitLocker fixed/OS/removable drive settings (sections 18.10.10.x) - Windows Update CSP and operational settings - Enhanced anti-spoofing, DMA protection, encrypted file indexing - Endpoint security: app isolation, application control, web protection Verification policies (osquery SQL): - Local Security Policy checks (53 controls, section 2.3) - Service configuration checks (42 services, section 5) - Windows Update registry verification - Endpoint security compliance (password, OS version, BitLocker, TPM, AV) Remediation scripts (PowerShell): - Local security policy enforcement via registry and secedit - Service disable/stop for CIS-required service hardening - Windows Update registry configuration
c882ee8 to
b3978ff
Compare
fleet-release
approved these changes
Mar 31, 2026
kilo-code-bot bot
added a commit
that referenced
this pull request
Mar 31, 2026
Remove macOS configuration profiles (firewall, gatekeeper, disk encryption, screen saver, login window, software update, date/time, etc.), macOS policies (latest-macos, all-software-updates-installed, disk-encryption-check, disk-space-check), and Linux policy additions (disk-encryption-check, disk-space-check) from the Testing & QA fleet. Only Windows configurations from PR #41582 are retained: - Windows configuration profiles (Defender, BitLocker, firewall, etc.) - Windows update settings - Windows scripts (turn-off-mdm, enable-ms-defender) - Windows policies
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Adds CIS Microsoft Windows 11 Enterprise Benchmark v4.0.0 solution artifacts — configuration profiles, verification policies, and remediation scripts — to
docs/solutions/windows/for use with Fleet's existing MDM, policy, and script systems.These artifacts cover ~225 CIS benchmark controls across User Rights, Local Security Policy, Service Configuration, BitLocker, Windows Update, and Endpoint Security categories. Each setting is mapped to the appropriate Fleet primitive:
No Go code changes, no new database tables, no orbit modifications — just deployable content artifacts.
What's included
Configuration profiles (12 SyncML XML files)
Verification policies (4 YAML files, ~106 individual policies)
Each SCRIPT & POLICY policy includes a
run_scriptreference to its corresponding remediation script.Remediation scripts (3 PowerShell files)
configure-local-security-policy.ps1configure-services.ps1configure-windows-update-registry.ps1CIS Benchmark mapping
Settings are categorized by the Fleet primitive they require:
How to use
These are standalone solution artifacts deployable through Fleet today:
POST /api/v1/fleet/mdm/profilesorfleetctl applyfleetctl applyor the Fleet UIPOST /api/v1/fleet/scriptsorfleetctl apply, then link to policies viarun_scriptTest plan
ValidateUserProvided()on uploadfleetctl apply --dry-run