mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2026-07-07 17:41:22 +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.
252 lines
11 KiB
YAML
252 lines
11 KiB
YAML
# One pillar directory can map to multiple (state, tgt) actions.
|
|
# tgt is a raw salt compound expression. tgt_type is always "compound".
|
|
# Per-action `batch` / `batch_wait` override the orch defaults (25% / 15s).
|
|
# An action with `highstate: True` triggers state.highstate instead of
|
|
# state.apply -- see salt/orch/push_batch.sls.
|
|
#
|
|
# Notes:
|
|
# - `bpf` is a pillar-only dir (no state of its own) consumed by both
|
|
# zeek and suricata via macros, so a bpf pillar change re-applies both.
|
|
# - suricata/strelka/zeek/elasticsearch/redis/kafka/logstash etc. have
|
|
# their own pillar dirs AND their own state, so they map 1:1 (or 1:2
|
|
# in strelka's case, because of the split init.sls / manager.sls).
|
|
#
|
|
# Intentional omissions (these will log a "not in pillar_push_map.yaml"
|
|
# warning in push_pillar.sls and wait for the next scheduled highstate):
|
|
# - `data` and `node_data`: pillar-only data consumed by many states;
|
|
# handling them generically would amount to a fleetwide highstate.
|
|
# - `host`: soc_host describes mainint/mainip; a change is a re-IP and
|
|
# needs a coordinated procedure, not an immediate state push.
|
|
# - `hypervisor`: state changes touch libvirt and are disruptive; leave
|
|
# to the next scheduled highstate.
|
|
# - `sensor`: every field in soc_sensor.yaml is `readonly: True` or
|
|
# per-minion (`node: True`). Per-minion edits are persisted under
|
|
# pillar/minions/<id>.sls and are handled by Branch A of push_pillar.sls
|
|
# (per-minion highstate intent), not by this app-pillar map.
|
|
#
|
|
# The role sets here were verified line-by-line against salt/top.sls. If
|
|
# salt/top.sls changes how an app is targeted, update the corresponding
|
|
# compound here.
|
|
|
|
# firewall: the one pillar everyone touches. Applied everywhere intentionally
|
|
# because every host's iptables needs to know about every other host in the
|
|
# grid. Salt's firewall state is idempotent (file.managed + iptables-restore
|
|
# onchanges in salt/firewall/init.sls), so hosts whose rendered firewall is
|
|
# unchanged do a file comparison and no-op without touching iptables -- actual
|
|
# reload happens only on the hosts whose rules actually changed. Fleetwide
|
|
# blast radius is intentional and matches the pre-plan behavior via highstate.
|
|
# Adding N sensors in a burst coalesces into one dispatch via the drainer.
|
|
firewall:
|
|
- state: firewall
|
|
tgt: '*'
|
|
|
|
# backup: backup.config_backup runs on eval, standalone, manager, managerhype,
|
|
# managersearch (NOT import -- the backup pillar is included on import per
|
|
# pillar/top.sls but the backup state is not run there per salt/top.sls).
|
|
backup:
|
|
- state: backup.config_backup
|
|
tgt: 'G@role:so-eval or G@role:so-manager or G@role:so-managerhype or G@role:so-managersearch or G@role:so-standalone'
|
|
|
|
# bpf is pillar-only (no state); consumed by both zeek and suricata as macros.
|
|
# Both states run on sensor_roles + so-import per salt/top.sls.
|
|
bpf:
|
|
- state: zeek
|
|
tgt: 'G@role:so-eval or G@role:so-heavynode or G@role:so-import or G@role:so-sensor or G@role:so-standalone'
|
|
- state: suricata
|
|
tgt: 'G@role:so-eval or G@role:so-heavynode or G@role:so-import or G@role:so-sensor or G@role:so-standalone'
|
|
|
|
# ca is applied universally.
|
|
ca:
|
|
- state: ca
|
|
tgt: '*'
|
|
|
|
# docker: universal. The docker state is in both the all-non-managers and
|
|
# all-managers branches of salt/top.sls.
|
|
docker:
|
|
- state: docker
|
|
tgt: '*'
|
|
|
|
# elastalert: eval, standalone, manager, managerhype, managersearch (NOT import).
|
|
elastalert:
|
|
- state: elastalert
|
|
tgt: 'G@role:so-eval or G@role:so-manager or G@role:so-managerhype or G@role:so-managersearch or G@role:so-standalone'
|
|
|
|
# elastic-fleet-package-registry: manager_roles exactly.
|
|
elastic-fleet-package-registry:
|
|
- state: elastic-fleet-package-registry
|
|
tgt: 'G@role:so-eval or G@role:so-import or G@role:so-manager or G@role:so-managerhype or G@role:so-managersearch or G@role:so-standalone'
|
|
|
|
# elasticsearch: 8 roles.
|
|
elasticsearch:
|
|
- state: elasticsearch
|
|
tgt: 'G@role:so-eval or G@role:so-heavynode or G@role:so-import or G@role:so-manager or G@role:so-managerhype or G@role:so-managersearch or G@role:so-searchnode or G@role:so-standalone'
|
|
|
|
# elasticagent: so-heavynode only.
|
|
elasticagent:
|
|
- state: elasticagent
|
|
tgt: 'G@role:so-heavynode'
|
|
|
|
# elasticfleet: base state only on pillar change. elasticfleet.install_agent_grid
|
|
# is a deploy/enrollment step, not a config reload; leave it to the next highstate.
|
|
elasticfleet:
|
|
- state: elasticfleet
|
|
tgt: 'G@role:so-eval or G@role:so-fleet or G@role:so-import or G@role:so-manager or G@role:so-managerhype or G@role:so-managersearch or G@role:so-standalone'
|
|
|
|
# global: fanout to a fleetwide highstate. The global pillar (soc_global.sls)
|
|
# carries cross-cutting settings (pipeline, url_base, imagerepo, mdengine, ...)
|
|
# that are consumed by virtually every state, so a targeted re-apply isn't
|
|
# meaningful. The drainer's batch/batch_wait throttling controls blast radius.
|
|
global:
|
|
- highstate: True
|
|
tgt: '*'
|
|
|
|
# healthcheck: eval, sensor, standalone only.
|
|
healthcheck:
|
|
- state: healthcheck
|
|
tgt: 'G@role:so-eval or G@role:so-sensor or G@role:so-standalone'
|
|
|
|
# hydra: manager_roles exactly.
|
|
hydra:
|
|
- state: hydra
|
|
tgt: 'G@role:so-eval or G@role:so-import or G@role:so-manager or G@role:so-managerhype or G@role:so-managersearch or G@role:so-standalone'
|
|
|
|
# idh: so-idh only.
|
|
idh:
|
|
- state: idh
|
|
tgt: 'G@role:so-idh'
|
|
|
|
# influxdb: manager_roles exactly.
|
|
influxdb:
|
|
- state: influxdb
|
|
tgt: 'G@role:so-eval or G@role:so-import or G@role:so-manager or G@role:so-managerhype or G@role:so-managersearch or G@role:so-standalone'
|
|
|
|
# kafka: standalone, manager, managerhype, managersearch, searchnode, receiver.
|
|
kafka:
|
|
- state: kafka
|
|
tgt: 'G@role:so-manager or G@role:so-managerhype or G@role:so-managersearch or G@role:so-receiver or G@role:so-searchnode or G@role:so-standalone'
|
|
|
|
# kibana: manager_roles exactly.
|
|
kibana:
|
|
- state: kibana
|
|
tgt: 'G@role:so-eval or G@role:so-import or G@role:so-manager or G@role:so-managerhype or G@role:so-managersearch or G@role:so-standalone'
|
|
|
|
# kratos: manager_roles exactly.
|
|
kratos:
|
|
- state: kratos
|
|
tgt: 'G@role:so-eval or G@role:so-import or G@role:so-manager or G@role:so-managerhype or G@role:so-managersearch or G@role:so-standalone'
|
|
|
|
# logrotate: universal (top-of-file '*' branch in salt/top.sls).
|
|
logrotate:
|
|
- state: logrotate
|
|
tgt: '*'
|
|
|
|
# logstash: 8 roles, no eval/import.
|
|
logstash:
|
|
- state: logstash
|
|
tgt: 'G@role:so-fleet or G@role:so-heavynode or G@role:so-manager or G@role:so-managerhype or G@role:so-managersearch or G@role:so-receiver or G@role:so-searchnode or G@role:so-standalone'
|
|
|
|
# manager: manager_roles exactly. The manager state is also referenced under
|
|
# *_sensor / *_heavynode top.sls blocks via `sensor`, but the standalone
|
|
# `manager` state itself runs only on manager_roles.
|
|
manager:
|
|
- state: manager
|
|
tgt: 'G@role:so-eval or G@role:so-import or G@role:so-manager or G@role:so-managerhype or G@role:so-managersearch or G@role:so-standalone'
|
|
|
|
# nginx: 10 specific roles. NOT receiver, idh, hypervisor, desktop.
|
|
nginx:
|
|
- state: nginx
|
|
tgt: 'G@role:so-eval or G@role:so-fleet or G@role:so-heavynode or G@role:so-import or G@role:so-manager or G@role:so-managerhype or G@role:so-managersearch or G@role:so-searchnode or G@role:so-sensor or G@role:so-standalone'
|
|
|
|
# ntp: universal (top-of-file '*' branch in salt/top.sls).
|
|
ntp:
|
|
- state: ntp
|
|
tgt: '*'
|
|
|
|
# patch: universal. soc_patch carries the OS update schedule, applied via
|
|
# patch.os.schedule on every node (it's in both the all-non-managers and
|
|
# all-managers branches of salt/top.sls).
|
|
patch:
|
|
- state: patch.os.schedule
|
|
tgt: '*'
|
|
|
|
# postgres: manager_roles exactly.
|
|
postgres:
|
|
- state: postgres
|
|
tgt: 'G@role:so-eval or G@role:so-import or G@role:so-manager or G@role:so-managerhype or G@role:so-managersearch or G@role:so-standalone'
|
|
|
|
# redis: 6 roles. standalone, manager, managerhype, managersearch, heavynode, receiver.
|
|
# (NOT eval, NOT import, NOT searchnode.)
|
|
redis:
|
|
- state: redis
|
|
tgt: 'G@role:so-heavynode or G@role:so-manager or G@role:so-managerhype or G@role:so-managersearch or G@role:so-receiver or G@role:so-standalone'
|
|
|
|
# registry: manager_roles exactly.
|
|
registry:
|
|
- state: registry
|
|
tgt: 'G@role:so-eval or G@role:so-import or G@role:so-manager or G@role:so-managerhype or G@role:so-managersearch or G@role:so-standalone'
|
|
|
|
# salt: fanout to a fleetwide highstate. The salt.auto_apply settings tune the
|
|
# push pipeline itself (enabled, debounce/drain intervals, batch sizing) and
|
|
# salt.schedule sets the per-minion highstate interval; they are consumed by the
|
|
# manager's schedule, beacons, and master reactor config as well as every
|
|
# minion's highstate schedule, so a targeted re-apply isn't meaningful. A salt
|
|
# audit row only fires for SOC-driven salt.auto_apply / salt.schedule edits --
|
|
# salt version bumps go through soup, not SOC, so they never reach this map.
|
|
salt:
|
|
- highstate: True
|
|
tgt: '*'
|
|
|
|
# sensoroni: universal.
|
|
sensoroni:
|
|
- state: sensoroni
|
|
tgt: '*'
|
|
|
|
# soc: manager_roles exactly.
|
|
soc:
|
|
- state: soc
|
|
tgt: 'G@role:so-eval or G@role:so-import or G@role:so-manager or G@role:so-managerhype or G@role:so-managersearch or G@role:so-standalone'
|
|
|
|
# stig: broad. Runs on standalone, manager, managerhype, managersearch,
|
|
# searchnode, sensor, receiver, fleet, hypervisor, desktop.
|
|
# NOT eval, NOT import, NOT heavynode, NOT idh (the *_idh block in
|
|
# salt/top.sls intentionally omits stig).
|
|
stig:
|
|
- state: stig
|
|
tgt: 'G@role:so-desktop or G@role:so-fleet or G@role:so-hypervisor or G@role:so-manager or G@role:so-managerhype or G@role:so-managersearch or G@role:so-receiver or G@role:so-searchnode or G@role:so-sensor or G@role:so-standalone'
|
|
|
|
# strelka: sensor-side only on pillar change (sensor_roles). strelka.manager is
|
|
# intentionally NOT fired on pillar changes -- YARA rule and strelka config
|
|
# pillar changes are consumed by the sensor-side strelka backend, and re-running
|
|
# strelka.manager on managers is both unnecessary and disruptive. strelka.manager
|
|
# is left to the 2-hour highstate.
|
|
strelka:
|
|
- state: strelka
|
|
tgt: 'G@role:so-eval or G@role:so-heavynode or G@role:so-sensor or G@role:so-standalone'
|
|
|
|
# suricata: sensor_roles + so-import (5 roles).
|
|
suricata:
|
|
- state: suricata
|
|
tgt: 'G@role:so-eval or G@role:so-heavynode or G@role:so-import or G@role:so-sensor or G@role:so-standalone'
|
|
|
|
# telegraf: universal.
|
|
telegraf:
|
|
- state: telegraf
|
|
tgt: '*'
|
|
|
|
# versionlock: universal (top-of-file '*' branch in salt/top.sls).
|
|
versionlock:
|
|
- state: versionlock
|
|
tgt: '*'
|
|
|
|
# vm: libvirt-driver hypervisors only. Matched by the salt-cloud:driver:libvirt
|
|
# grain (compound supports nested grain matching via G@<key>:<subkey>:<value>).
|
|
# pillar/vm/soc_vm.sls write path is referenced at salt/_runners/setup_hypervisor.py:856.
|
|
vm:
|
|
- state: vm
|
|
tgt: 'G@salt-cloud:driver:libvirt'
|
|
|
|
# zeek: sensor_roles + so-import (5 roles).
|
|
zeek:
|
|
- state: zeek
|
|
tgt: 'G@role:so-eval or G@role:so-heavynode or G@role:so-import or G@role:so-sensor or G@role:so-standalone'
|