mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2026-05-09 12:52:38 +02:00
Mike Reeves
3ecd19d085
The Telegraf backend selector lived at global.telegraf_output but it is
a Telegraf-scoped setting, not a cross-cutting grid global. Move both
the value and the UI annotation under the telegraf pillar so it shows
up alongside the other Telegraf tuning knobs in the Configuration UI.
- salt/telegraf/defaults.yaml: add telegraf.output: BOTH
- salt/telegraf/soc_telegraf.yaml: add telegraf.output annotation
- salt/global/defaults.yaml: remove global.telegraf_output
- salt/global/soc_global.yaml: remove global.telegraf_output annotation
- salt/vars/globals.map.jinja: drop telegraf_output from GLOBALS
- salt/firewall/map.jinja: read via pillar.get('telegraf:output')
- salt/postgres/telegraf_users.sls: read via pillar.get('telegraf:output')
- salt/telegraf/etc/telegraf.conf: read via TELEGRAFMERGED.output
- salt/postgres/tools/sbin/so-stats-show: update user-facing docs
No behavioral change — default stays BOTH.
74 lines
2.3 KiB
Django/Jinja
74 lines
2.3 KiB
Django/Jinja
{% import 'vars/init.map.jinja' as INIT %}
|
|
{% from 'docker/docker.map.jinja' import DOCKERMERGED %}
|
|
{% from 'global/map.jinja' import GLOBALMERGED %}
|
|
|
|
{% from 'vars/' ~ INIT.GRAINS.role.split('-')[1] ~ '.map.jinja' import ROLE_GLOBALS %} {# role is so-role so we have to split off the 'so' #}
|
|
|
|
{%
|
|
set GLOBALS = {
|
|
'hostname': INIT.GRAINS.nodename,
|
|
'is_manager': false,
|
|
'is_sensor': false,
|
|
'manager': INIT.GRAINS.master,
|
|
'minion_id': INIT.GRAINS.id,
|
|
'main_interface': INIT.PILLAR.host.mainint,
|
|
'node_ip': INIT.GRAINS.ip_interfaces.get(INIT.PILLAR.host.mainint)[0],
|
|
'role': INIT.GRAINS.role,
|
|
'airgap': INIT.PILLAR.global.airgap,
|
|
'ids': INIT.PILLAR.global.ids,
|
|
'image_repo': INIT.PILLAR.global.imagerepo,
|
|
'repo_host': INIT.PILLAR.global.repo_host,
|
|
'registry_host': INIT.PILLAR.global.registry_host,
|
|
'influxdb_host': INIT.PILLAR.global.influxdb_host,
|
|
'manager_ip': INIT.PILLAR.global.managerip,
|
|
'md_engine': INIT.PILLAR.global.mdengine,
|
|
'pcap_engine': GLOBALMERGED.pcapengine,
|
|
'pipeline': GLOBALMERGED.pipeline,
|
|
'so_version': INIT.PILLAR.global.soversion,
|
|
'so_docker_gateway': DOCKERMERGED.gateway,
|
|
'so_docker_range': DOCKERMERGED.range,
|
|
'url_base': INIT.PILLAR.global.url_base,
|
|
'so_model': INIT.GRAINS.get('sosmodel',''),
|
|
'sensoroni_key': INIT.PILLAR.sensoroni.config.sensoronikey,
|
|
'os': INIT.GRAINS.os,
|
|
'os_family': INIT.GRAINS.os_family,
|
|
'application_urls': {},
|
|
'manager_roles': [
|
|
'so-eval',
|
|
'so-import',
|
|
'so-manager',
|
|
'so-managersearch',
|
|
'so-managerhype',
|
|
'so-standalone'
|
|
],
|
|
'sensor_roles': [
|
|
'so-eval',
|
|
'so-heavynode',
|
|
'so-sensor',
|
|
'so-standalone'
|
|
|
|
]
|
|
}
|
|
%}
|
|
|
|
{%
|
|
do GLOBALS.update({
|
|
'application_urls': {
|
|
'hydra': 'http://' ~ GLOBALS.manager ~ ':4445/',
|
|
'kratos': 'http://' ~ GLOBALS.manager ~ ':4434/',
|
|
'elastic': 'https://' ~ GLOBALS.manager ~ ':9200/',
|
|
'influxdb': 'https://' ~ GLOBALS.manager ~ ':8086/'
|
|
}
|
|
})
|
|
%}
|
|
|
|
{% if GLOBALS.role in GLOBALS.manager_roles %}
|
|
{% do GLOBALS.update({'is_manager': true}) %}
|
|
{% endif %}
|
|
|
|
{% if GLOBALS.role in GLOBALS.sensor_roles %}
|
|
{% do GLOBALS.update({'is_sensor': true}) %}
|
|
{% endif %}
|
|
|
|
{% do salt['defaults.merge'](GLOBALS, ROLE_GLOBALS, merge_lists=False, in_place=True) %}
|