CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9459 from Security-Onion-Solutions/2.4/fix-influxdb-telegraf

Browse Source 
Make influxdb and telegraf consistent across import and eval modes
This commit is contained in:
Doug Burks
2022-12-22 10:26:36 -05:00
committed by GitHub
parent ba13ad7151 e95034886e
commit f1d31a0c41
4 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
salt/allowed_states.map.jinja
View File

@@ -97,6 +97,8 @@
'nginx', 'nginx',
'soc', 'soc',
'kratos', 'kratos',
'influxdb',
'telegraf',
'firewall', 'firewall',
'idstools', 'idstools',
'suricata.manager', 'suricata.manager',

2
salt/common/tools/sbin/so-image-common
View File

@@ -27,6 +27,7 @@ container_list() {
"so-elasticsearch" "so-elasticsearch"
"so-filebeat" "so-filebeat"
"so-idstools" "so-idstools"
"so-influxdb"
"so-kibana" "so-kibana"
"so-kratos" "so-kratos"
"so-nginx" "so-nginx"
@@ -34,6 +35,7 @@ container_list() {
"so-soc" "so-soc"
"so-steno" "so-steno"
"so-suricata" "so-suricata"
"so-telegraf"
"so-zeek" "so-zeek"
) )
elif [ $MANAGERCHECK != 'so-helix' ]; then elif [ $MANAGERCHECK != 'so-helix' ]; then

2
salt/influxdb/init.sls
View File

@@ -4,7 +4,7 @@
{% set GRAFANA = salt['pillar.get']('manager:grafana', '0') %} {% set GRAFANA = salt['pillar.get']('manager:grafana', '0') %}
{% if grains['role'] in ['so-manager', 'so-managersearch', 'so-standalone'] or (grains.role == 'so-eval' and GRAFANA == 1) %} {% if grains['role'] in ['so-manager', 'so-managersearch', 'so-standalone', 'so-eval', 'so-import'] %}
{% import_yaml 'influxdb/defaults.yaml' as default_settings %} {% import_yaml 'influxdb/defaults.yaml' as default_settings %}
{% set influxdb = salt['grains.filter_by'](default_settings, default='influxdb', merge=salt['pillar.get']('influxdb', {})) %} {% set influxdb = salt['grains.filter_by'](default_settings, default='influxdb', merge=salt['pillar.get']('influxdb', {})) %}
{% from 'salt/map.jinja' import PYTHON3INFLUX with context %} {% from 'salt/map.jinja' import PYTHON3INFLUX with context %}

2
salt/top.sls
View File

@@ -328,6 +328,8 @@ base:
- manager - manager
- nginx - nginx
- soc - soc
- influxdb
- telegraf
- kratos - kratos
- firewall - firewall
- idstools - idstools