mirror of
https://github.com/fleetdm/fleet
synced 2026-04-21 21:47:20 +00:00
c4479c6a84
<!-- Add the related story/sub-task/bug number, like Resolves #123, or remove if NA --> **Related issue:** Resolves #42853 This PR simply adds the `require_all_software_windows` config option. It doesn't use it. The logic to use it will be hooked up in subsequent PRs. The fleetctl TestIntegrationsPreview test is expected to fail since it builds the server against main and doesn't know about our new config option. # Checklist for submitter If some of the following don't apply, delete the relevant line. - [x] Changes file added for user-visible changes in `changes/`, `orbit/changes/` or `ee/fleetd-chrome/changes`. ## Testing - [x] Added/updated automated tests - [x] QA'd all new/changed functionality manually ## New Fleet configuration settings - [x] Verified that the setting is exported via `fleetctl generate-gitops` - Not exported. generate-gitops does not export require_all_software_windows (or require_all_software_macos either). The generateControls function (generate_gitops.go) outputs a "TODO: update with your setup_experience configuration" placeholder when any setup experience config exists, rather than exporting individual field values. This is a pre-existing limitation that applies equally to both fields - not something introduced by our PR. - [x] Verified the setting is documented in a separate PR to [the GitOps documentation](https://github.com/fleetdm/fleet/blob/main/docs/Configuration/yaml-files.md#L485) - Yes. PR #42046 adds require_all_software_windows to both docs/REST API/rest-api.md and docs/Configuration/yaml-files.md. - [x] Verified that the setting is cleared on the server if it is not supplied in a YAML file (or that it is documented as being optional) - Yes, it gets cleared to false - both when setup_experience: is present without the field, and when setup_experience: is omitted entirely. This is the same behavior as the existing require_all_software_macos field - [x] Verified that any relevant UI is disabled when GitOps mode is enabled - Covered by #42854 (frontend subtask). The existing macOS checkbox in InstallSoftwareForm.tsx:271 already checks gitOpsModeEnabled to disable itself. The Windows checkbox to be added in #42854 will follow the same pattern. <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **New Features** * Added a Windows setup experience software requirement setting. When enabled, Windows devices will cancel the Autopilot setup if any required software installation fails. * **Tests** * Added test coverage for the new Windows software requirement configuration. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
208 lines
No EOL
5.7 KiB
JSON
208 lines
No EOL
5.7 KiB
JSON
{
|
|
"kind": "config",
|
|
"apiVersion": "v1",
|
|
"spec": {
|
|
"org_info": {
|
|
"org_name": "",
|
|
"org_logo_url": "",
|
|
"org_logo_url_light_background": "",
|
|
"contact_url": "https://fleetdm.com/company/contact"
|
|
},
|
|
"server_settings": {
|
|
"server_url": "",
|
|
"live_query_disabled": false,
|
|
"live_reporting_disabled": false,
|
|
"query_report_cap": 0,
|
|
"query_reports_disabled": false,
|
|
"report_cap": 0,
|
|
"discard_reports_data": false,
|
|
"enable_analytics": false,
|
|
"deferred_save_host": false,
|
|
"scripts_disabled": false,
|
|
"ai_features_disabled": false
|
|
},
|
|
"smtp_settings": {
|
|
"enable_smtp": false,
|
|
"configured": false,
|
|
"sender_address": "",
|
|
"server": "",
|
|
"port": 0,
|
|
"authentication_type": "",
|
|
"user_name": "",
|
|
"password": "",
|
|
"enable_ssl_tls": false,
|
|
"authentication_method": "",
|
|
"domain": "",
|
|
"verify_ssl_certs": false,
|
|
"enable_start_tls": false
|
|
},
|
|
"host_expiry_settings": {
|
|
"host_expiry_enabled": false,
|
|
"host_expiry_window": 0
|
|
},
|
|
"activity_expiry_settings": {
|
|
"activity_expiry_enabled": false,
|
|
"activity_expiry_window": 0
|
|
},
|
|
"conditional_access": {
|
|
"microsoft_entra_tenant_id": "",
|
|
"microsoft_entra_connection_configured": false,
|
|
"okta_idp_id": null,
|
|
"okta_assertion_consumer_service_url": null,
|
|
"okta_audience_uri": null,
|
|
"okta_certificate": null,
|
|
"bypass_disabled": null
|
|
},
|
|
"features": {
|
|
"enable_host_users": true,
|
|
"enable_software_inventory": false
|
|
},
|
|
"sso_settings": {
|
|
"entity_id": "",
|
|
"issuer_uri": "",
|
|
"idp_image_url": "",
|
|
"metadata": "",
|
|
"metadata_url": "",
|
|
"idp_name": "",
|
|
"enable_jit_provisioning": false,
|
|
"enable_jit_role_sync": false,
|
|
"enable_sso": false,
|
|
"enable_sso_idp_login": false,
|
|
"sso_server_url": ""
|
|
},
|
|
"fleet_desktop": {
|
|
"alternative_browser_host": "",
|
|
"transparency_url": "https://fleetdm.com/transparency"
|
|
},
|
|
"vulnerability_settings": {
|
|
"databases_path": "/some/path"
|
|
},
|
|
"webhook_settings": {
|
|
"activities_webhook": {
|
|
"enable_activities_webhook": false,
|
|
"destination_url": ""
|
|
},
|
|
"host_status_webhook": {
|
|
"enable_host_status_webhook": false,
|
|
"destination_url": "",
|
|
"host_percentage": 0,
|
|
"days_count": 0
|
|
},
|
|
"failing_policies_webhook": {
|
|
"enable_failing_policies_webhook": false,
|
|
"destination_url": "",
|
|
"policy_ids": null,
|
|
"host_batch_size": 0
|
|
},
|
|
"vulnerabilities_webhook": {
|
|
"enable_vulnerabilities_webhook": false,
|
|
"destination_url": "",
|
|
"host_batch_size": 0
|
|
},
|
|
"interval": "0s"
|
|
},
|
|
"integrations": {
|
|
"jira": null,
|
|
"zendesk": null,
|
|
"google_calendar": null,
|
|
"conditional_access_enabled": null
|
|
},
|
|
"mdm": {
|
|
"android_enabled_and_configured": false,
|
|
"apple_bm_terms_expired": false,
|
|
"apple_server_url": "",
|
|
"apple_bm_enabled_and_configured": false,
|
|
"enabled_and_configured": false,
|
|
"apple_business_manager": null,
|
|
"volume_purchasing_program": null,
|
|
"windows_enabled_and_configured": false,
|
|
"enable_disk_encryption": false,
|
|
"enable_recovery_lock_password": false,
|
|
"macos_updates": {
|
|
"minimum_version": null,
|
|
"deadline": null,
|
|
"update_new_hosts": null
|
|
},
|
|
"ios_updates": {
|
|
"minimum_version": null,
|
|
"deadline": null,
|
|
"update_new_hosts": null
|
|
},
|
|
"ipados_updates": {
|
|
"minimum_version": null,
|
|
"deadline": null,
|
|
"update_new_hosts": null
|
|
},
|
|
"windows_updates": {
|
|
"deadline_days": 7,
|
|
"grace_period_days": 3
|
|
},
|
|
"windows_migration_enabled": false,
|
|
"enable_turn_on_windows_mdm_manually": false,
|
|
"windows_entra_tenant_ids": null,
|
|
"windows_require_bitlocker_pin": null,
|
|
"apple_require_hardware_attestation": false,
|
|
"macos_migration": {
|
|
"enable": false,
|
|
"mode": "",
|
|
"webhook_url": ""
|
|
},
|
|
"apple_settings": {
|
|
"configuration_profiles": null
|
|
},
|
|
"macos_settings": {
|
|
"custom_settings": null
|
|
},
|
|
"macos_setup": {
|
|
"bootstrap_package": null,
|
|
"enable_end_user_authentication": false,
|
|
"lock_end_user_info": false,
|
|
"macos_setup_assistant": null,
|
|
"enable_release_device_manually": false,
|
|
"script": null,
|
|
"software": null,
|
|
"manual_agent_install": null,
|
|
"require_all_software_macos": false,
|
|
"require_all_software_windows": false
|
|
},
|
|
"setup_experience": {
|
|
"macos_bootstrap_package": null,
|
|
"enable_end_user_authentication": false,
|
|
"lock_end_user_info": false,
|
|
"apple_setup_assistant": null,
|
|
"apple_enable_release_device_manually": false,
|
|
"macos_script": null,
|
|
"software": null,
|
|
"macos_manual_agent_install": null,
|
|
"require_all_software_macos": false,
|
|
"require_all_software_windows": false
|
|
},
|
|
"windows_settings": {
|
|
"custom_settings": null,
|
|
"configuration_profiles": null
|
|
},
|
|
"android_settings": {
|
|
"certificates": null,
|
|
"custom_settings": null,
|
|
"configuration_profiles": null
|
|
},
|
|
"end_user_authentication": {
|
|
"entity_id": "",
|
|
"issuer_uri": "",
|
|
"metadata": "",
|
|
"metadata_url": "",
|
|
"idp_name": ""
|
|
}
|
|
},
|
|
"scripts": null,
|
|
"gitops": {
|
|
"gitops_mode_enabled": false,
|
|
"repository_url": "",
|
|
"exceptions": {
|
|
"labels": false,
|
|
"software": false,
|
|
"secrets": false
|
|
}
|
|
}
|
|
}
|
|
} |