mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2026-05-10 13:20:30 +02:00
Mike Reeves
3d11694d51
Two coupled changes that together let so_pillar.* be the canonical config store, with config edits driving service reloads automatically: so-yaml PG-canonical mode - Adds /opt/so/conf/so-yaml/mode (and SO_YAML_BACKEND env override) with three values: dual (legacy), postgres (PG-only for managed paths), disk (emergency rollback). Bootstrap files (secrets.sls, ca/init.sls, *.nodes.sls, top.sls, ...) stay disk-only regardless via the existing SkipPath allowlist in so_yaml_postgres.locate. - loadYaml/writeYaml/purgeFile now route to so_pillar.* in postgres mode: replace/add/get all read+write the database with no disk file ever appearing. PG failure is fatal in postgres mode (no silent fallback); dual mode preserves the prior best-effort mirror. - so_yaml_postgres gains read_yaml(path), is_pg_managed(path), and is_enabled() so so-yaml can answer "is this path PG-managed and is PG up" without reaching into private helpers. - schema_pillar.sls writes /opt/so/conf/so-yaml/mode = postgres after the importer succeeds, so flipping postgres:so_pillar:enabled flips so-yaml's behavior in lockstep with the schema being live. pg_notify-driven change fan-out - 008_change_notify.sql adds so_pillar.change_queue + an AFTER trigger on pillar_entry that enqueues the locator and pg_notifies 'so_pillar_change'. Queue is drained at-least-once so engine restarts don't lose events; pg_notify is just the wakeup signal. - New salt-master engine pg_notify_pillar.py LISTENs on the channel, drains the queue with FOR UPDATE SKIP LOCKED, debounces bursts, and fires 'so/pillar/changed' events grouped by (scope, role, minion). - Reactor so_pillar_changed.sls catches the tag and dispatches to orch.so_pillar_reload, which carries a DISPATCH map of pillar-path prefix -> (state sls, role grain set) so adding a new service to the auto-reload list is a one-line edit instead of a new reactor. - Engine + reactor wiring is gated on the same postgres:so_pillar:enabled flag as the schema and ext_pillar config so the whole stack flips on/off together. Tests: 21 new cases (112 total, all passing) covering mode resolution, PG-managed detection, and PG-canonical read/write/purge routing with the PG client stubbed.
28 lines
1.2 KiB
Plaintext
28 lines
1.2 KiB
Plaintext
# 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.
|
|
|
|
# Fires for every event tagged 'so/pillar/changed'. Source of those events
|
|
# is the pg_notify_pillar engine on the salt-master, which in turn drains
|
|
# so_pillar.change_queue (populated by the AFTER trigger on
|
|
# so_pillar.pillar_entry — see 008_change_notify.sql).
|
|
#
|
|
# All routing logic — which pillar paths reload which services on which
|
|
# targets — lives in orch.so_pillar_reload so it stays editable as one
|
|
# YAML table without touching reactor wiring.
|
|
|
|
{% set payload = data.get('data', {}) %}
|
|
{% do salt.log.info('so_pillar_changed reactor: %s' % payload) %}
|
|
|
|
so_pillar_dispatch_reload:
|
|
runner.state.orchestrate:
|
|
- args:
|
|
- mods: orch.so_pillar_reload
|
|
- pillar:
|
|
so_pillar_change:
|
|
scope: {{ payload.get('scope') | json }}
|
|
role_name: {{ payload.get('role_name') | json }}
|
|
minion_id: {{ payload.get('minion_id') | json }}
|
|
changes: {{ payload.get('changes', []) | json }}
|