mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2026-07-24 17:55:42 +02:00
Josh Patterson
da94788255
highstate_interval_hours describes the per-minion highstate schedule, not the active-push pipeline, so relocate it from salt.auto_apply to a new salt.schedule settings subtree. Repoint so-salt-minion-check at the new pillar path (it had been left on the stale global:push path) so its restart grace period tracks the schedule again. - Add salt.schedule.highstate_interval_hours to defaults.yaml/soc_salt.yaml and a side-effect-free salt/salt/schedule.map.jinja (SCHEDULEMERGED), matching the *MERGED map convention. Consumers read SCHEDULEMERGED.highstate_interval_hours. - Split salt/schedule.sls into salt/salt/highstate_schedule.sls (every minion) and salt/salt/push_drain_schedule.sls (managers); update top.sls to apply the highstate schedule via '*' and the drainer schedule via the configured-manager block. Remove the now-empty schedule.sls aggregator. - pillar_push_map.yaml and so-push-drainer: comment/doc updates only.
18 lines
477 B
YAML+Jinja
18 lines
477 B
YAML+Jinja
{% from 'vars/globals.map.jinja' import GLOBALS %}
|
|
{% from 'salt/auto_apply.map.jinja' import AUTOAPPLY %}
|
|
|
|
{% if GLOBALS.is_manager and AUTOAPPLY.enabled %}
|
|
push_drain_schedule:
|
|
schedule.present:
|
|
- function: cmd.run
|
|
- job_args:
|
|
- /usr/sbin/so-push-drainer
|
|
- seconds: {{ AUTOAPPLY.drain_interval }}
|
|
- maxrunning: 1
|
|
- return_job: False
|
|
{% elif GLOBALS.is_manager %}
|
|
push_drain_schedule:
|
|
schedule.absent:
|
|
- name: push_drain_schedule
|
|
{% endif %}
|