mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2026-07-17 22:33:16 +02:00
Josh Patterson
dfdb1fbaeb
The active-push tunables (enabled, highstate_interval_hours, debounce_seconds,
drain_interval, batch, batch_wait) described how Salt auto-applies changes, not
general grid config, so relocate them from the global namespace to a new
salt.auto_apply settings module.
- Add salt/salt/{defaults.yaml,auto_apply.map.jinja,soc_salt.yaml,adv_salt.yaml}.
auto_apply.map.jinja is a dedicated, side-effect-free merge map (the existing
salt/salt/map.jinja dereferences pillar.host.mainint at import time).
- Remove the push blocks from salt/global/{defaults,soc_global}.yaml.
- Register salt.soc_salt/salt.adv_salt in pillar/top.sls; seed the local pillar
stubs for fresh installs (make_some_dirs) and upgrades (ensure_salt_local_pillar
in soup, wired into up_to_3.2.0).
- Repoint all consumers: GLOBALMERGED.push.* -> AUTOAPPLY.* (schedule, salt
master, manager beacons, beacons_pushstate, orch.push_batch) and
pillar.get('global:push...') -> 'salt:auto_apply...' (push reactors,
so-push-drainer).
- Add a salt: fleetwide-highstate entry to pillar_push_map.yaml so edits keep
applying immediately, matching the prior global-namespace behavior.
107 lines
3.0 KiB
YAML+Jinja
107 lines
3.0 KiB
YAML+Jinja
# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
|
|
# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at
|
|
# https://securityonion.net/license; you may not use this file except in compliance with the
|
|
# Elastic License 2.0.
|
|
#
|
|
# Note: Per the Elastic License 2.0, the second limitation states:
|
|
#
|
|
# "You may not move, change, disable, or circumvent the license key functionality
|
|
# in the software, and you may not remove or obscure any functionality in the
|
|
# software that is protected by the license key."
|
|
|
|
{% from 'allowed_states.map.jinja' import allowed_states %}
|
|
{% from 'salt/auto_apply.map.jinja' import AUTOAPPLY %}
|
|
{% if sls in allowed_states %}
|
|
|
|
include:
|
|
- salt.minion
|
|
- salt.master.pyinotify
|
|
- salt.master.boot_mine_update
|
|
{% if 'vrt' in salt['pillar.get']('features', []) %}
|
|
- salt.cloud
|
|
- salt.cloud.reactor_config_hypervisor
|
|
|
|
sync_runners:
|
|
salt.runner:
|
|
- name: saltutil.sync_runners
|
|
{% endif %}
|
|
|
|
checkmine_engine:
|
|
file.managed:
|
|
- name: /etc/salt/engines/checkmine.py
|
|
- source: salt://salt/engines/master/checkmine.py
|
|
- makedirs: True
|
|
|
|
pillarWatch_engine:
|
|
file.managed:
|
|
- name: /etc/salt/engines/pillarWatch.py
|
|
- source: salt://salt/engines/master/pillarWatch.py
|
|
|
|
{% if 'vrt' in salt['pillar.get']('features', []) %}
|
|
vrt_engine_config:
|
|
file.managed:
|
|
- name: /etc/salt/master.d/vrt_engine.conf
|
|
- source: salt://salt/files/vrt_engine.conf
|
|
- watch_in:
|
|
- service: salt_master_service
|
|
|
|
virtual_node_manager_engine:
|
|
file.managed:
|
|
- name: /etc/salt/engines/virtual_node_manager.py
|
|
- source: salt://salt/engines/master/virtual_node_manager.py
|
|
- watch_in:
|
|
- service: salt_master_service
|
|
|
|
virtual_power_manager_engine:
|
|
file.managed:
|
|
- name: /etc/salt/engines/virtual_power_manager.py
|
|
- source: salt://salt/engines/master/virtual_power_manager.py
|
|
- watch_in:
|
|
- service: salt_master_service
|
|
{% endif %}
|
|
|
|
engines_config:
|
|
file.managed:
|
|
- name: /etc/salt/master.d/engines.conf
|
|
- source: salt://salt/files/engines.conf
|
|
|
|
{% if AUTOAPPLY.enabled %}
|
|
reactor_pushstate_config:
|
|
file.managed:
|
|
- name: /etc/salt/master.d/reactor_pushstate.conf
|
|
- source: salt://salt/files/reactor_pushstate.conf
|
|
- watch_in:
|
|
- service: salt_master_service
|
|
{% else %}
|
|
reactor_pushstate_config:
|
|
file.absent:
|
|
- name: /etc/salt/master.d/reactor_pushstate.conf
|
|
- watch_in:
|
|
- service: salt_master_service
|
|
{% endif %}
|
|
|
|
# update the bootstrap script when used for salt-cloud
|
|
salt_bootstrap_cloud:
|
|
file.managed:
|
|
- name: /opt/saltstack/salt/lib/python3.10/site-packages/salt/cloud/deploy/bootstrap-salt.sh
|
|
- source: salt://salt/scripts/bootstrap-salt.sh
|
|
- show_changes: False
|
|
|
|
salt_master_service:
|
|
service.running:
|
|
- name: salt-master
|
|
- enable: True
|
|
- watch:
|
|
- file: checkmine_engine
|
|
- file: pillarWatch_engine
|
|
- file: engines_config
|
|
- order: 9002
|
|
|
|
{% else %}
|
|
|
|
{{sls}}_state_not_allowed:
|
|
test.fail_without_changes:
|
|
- name: {{sls}}_state_not_allowed
|
|
|
|
{% endif %}
|