influx upgrade

salt/soc/defaults.map.jinja

@@ -1,6 +1,7 @@
 {% import_yaml 'soc/defaults.yaml' as SOCDEFAULTS %}
 {% from 'vars/globals.map.jinja' import GLOBALS %}
 {% from 'docker/docker.map.jinja' import DOCKER -%}
+{%- set INFLUXDB_TOKEN = salt['pillar.get']('secrets:influx_token') %}
 
 {% for module, application_url in GLOBALS.application_urls.items() %}
 {%   do SOCDEFAULTS.soc.server.modules[module].update({'hostUrl': application_url}) %}
@@ -15,9 +16,8 @@
 
 {% do SOCDEFAULTS.soc.server.modules.elastic.update({'username': GLOBALS.elasticsearch.auth.users.so_elastic_user.user, 'password': GLOBALS.elasticsearch.auth.users.so_elastic_user.pass}) %}
 
-{% if GLOBALS.role != 'so-import' %}
-{%   do SOCDEFAULTS.soc.server.modules.influxdb.update({'hostUrl': 'https://' ~ GLOBALS.influxdb_host ~ ':8086'}) %}
-{% endif %}
+{% do SOCDEFAULTS.soc.server.modules.influxdb.update({'hostUrl': 'https://' ~ GLOBALS.influxdb_host ~ ':8086'}) %}
+{% do SOCDEFAULTS.soc.server.modules.influxdb.update({'token': INFLUXDB_TOKEN}) %}
 
 {% do SOCDEFAULTS.soc.server.modules.statickeyauth.update({'anonymousCidr': DOCKER.sorange, 'apiKey': pillar.sensoroni.sensoronikey}) %}
 

salt/soc/defaults.yaml

@@ -1031,9 +1031,9 @@ soc:
         asyncThreshold: 10
       influxdb:
         hostUrl:
-        token: ''
-        org: ''
-        bucket: telegraf
+        token: 
+        org: Security Onion
+        bucket: telegraf/so_short_term
         verifyCert: false
       salt:
         saltPipe: /opt/sensoroni/salt/pipe