From dfd5947051d105cb60333f830e737542c0736a7d Mon Sep 17 00:00:00 2001 From: Doug Burks Date: Thu, 22 Dec 2022 09:46:27 -0500 Subject: [PATCH 1/4] add influxdb and telegraf to import mode --- salt/allowed_states.map.jinja | 2 ++ 1 file changed, 2 insertions(+) diff --git a/salt/allowed_states.map.jinja b/salt/allowed_states.map.jinja index 899a56b23..192a52dd3 100644 --- a/salt/allowed_states.map.jinja +++ b/salt/allowed_states.map.jinja @@ -97,6 +97,8 @@ 'nginx', 'soc', 'kratos', + 'influxdb', + 'telegraf', 'firewall', 'idstools', 'suricata.manager', From 75e16963c8309350ea763f371337eefa11207529 Mon Sep 17 00:00:00 2001 From: Doug Burks Date: Thu, 22 Dec 2022 09:47:47 -0500 Subject: [PATCH 2/4] add influxdb and telegraf to import mode --- salt/top.sls | 2 ++ 1 file changed, 2 insertions(+) diff --git a/salt/top.sls b/salt/top.sls index d9653fca1..3997f9725 100644 --- a/salt/top.sls +++ b/salt/top.sls @@ -328,6 +328,8 @@ base: - manager - nginx - soc + - influxdb + - telegraf - kratos - firewall - idstools From 9352854fe4075ddd20a09a0c93059d5c2b8917e3 Mon Sep 17 00:00:00 2001 From: Doug Burks Date: Thu, 22 Dec 2022 09:48:38 -0500 Subject: [PATCH 3/4] enable influxdb for eval and import modes --- salt/influxdb/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/influxdb/init.sls b/salt/influxdb/init.sls index ddcf36195..aa81ece6e 100644 --- a/salt/influxdb/init.sls +++ b/salt/influxdb/init.sls @@ -4,7 +4,7 @@ {% 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 %} {% set influxdb = salt['grains.filter_by'](default_settings, default='influxdb', merge=salt['pillar.get']('influxdb', {})) %} {% from 'salt/map.jinja' import PYTHON3INFLUX with context %} From e95034886e9aa251e82c2200f38c2b6531377dd8 Mon Sep 17 00:00:00 2001 From: Doug Burks Date: Thu, 22 Dec 2022 09:49:57 -0500 Subject: [PATCH 4/4] add influxdb and telegraf to import mode --- salt/common/tools/sbin/so-image-common | 2 ++ 1 file changed, 2 insertions(+) diff --git a/salt/common/tools/sbin/so-image-common b/salt/common/tools/sbin/so-image-common index cfc4ff4ab..9ba66ced8 100755 --- a/salt/common/tools/sbin/so-image-common +++ b/salt/common/tools/sbin/so-image-common @@ -27,6 +27,7 @@ container_list() { "so-elasticsearch" "so-filebeat" "so-idstools" + "so-influxdb" "so-kibana" "so-kratos" "so-nginx" @@ -34,6 +35,7 @@ container_list() { "so-soc" "so-steno" "so-suricata" + "so-telegraf" "so-zeek" ) elif [ $MANAGERCHECK != 'so-helix' ]; then