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

Make influxdb and telegraf consistent across import and eval modes

salt/allowed_states.map.jinja

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

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

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 %}

salt/top.sls

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