From b6d55bedc8cddae905736ac3cfa1eb11e6da321d Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Mon, 6 Mar 2023 13:50:17 -0500
Subject: [PATCH] make influxdb token accessible to all nodes

---
 pillar/top.sls                  | 1 +
 salt/influxdb/curl.config.jinja | 2 +-
 salt/influxdb/init.sls          | 2 +-
 salt/soc/defaults.map.jinja     | 2 +-
 salt/telegraf/etc/telegraf.conf | 2 +-
 setup/so-functions              | 7 +++++--
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pillar/top.sls b/pillar/top.sls
index 2f7894769..60cface84 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -10,6 +10,7 @@ base:
     - sensoroni.adv_sensoroni
     - telegraf.soc_telegraf
     - telegraf.adv_telegraf
+    - influxdb.token
     - node_data.ips
 
   '* and not *_eval and not *_import':
diff --git a/salt/influxdb/curl.config.jinja b/salt/influxdb/curl.config.jinja
index 9f636e851..d994b05d9 100644
--- a/salt/influxdb/curl.config.jinja
+++ b/salt/influxdb/curl.config.jinja
@@ -1 +1 @@
-header = "Authorization: Token {{ salt['pillar.get']('secrets:influx_token') }}"
\ No newline at end of file
+header = "Authorization: Token {{ salt['pillar.get']('influxdb:token') }}"
diff --git a/salt/influxdb/init.sls b/salt/influxdb/init.sls
index bd894a6d4..b6190fdfd 100644
--- a/salt/influxdb/init.sls
+++ b/salt/influxdb/init.sls
@@ -6,7 +6,7 @@
 
 {% if grains['role'] in ['so-manager', 'so-managersearch', 'so-standalone', 'so-eval', 'so-import'] %}
 {% set PASSWORD = salt['pillar.get']('secrets:influx_pass') %}
-{% set TOKEN = salt['pillar.get']('secrets:influx_token') %}
+{% set TOKEN = salt['pillar.get']('influxdb:token') %}
 
 include:
   - salt.minion
diff --git a/salt/soc/defaults.map.jinja b/salt/soc/defaults.map.jinja
index e16f047e4..85db938cc 100644
--- a/salt/soc/defaults.map.jinja
+++ b/salt/soc/defaults.map.jinja
@@ -1,7 +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') %}
+{% set INFLUXDB_TOKEN = salt['pillar.get']('influxdb:token') %}
 {% import_text 'influxdb/metrics_link.txt' as METRICS_LINK %}
 
 {% for module, application_url in GLOBALS.application_urls.items() %}
diff --git a/salt/telegraf/etc/telegraf.conf b/salt/telegraf/etc/telegraf.conf
index 61843da5f..f2a89baf4 100644
--- a/salt/telegraf/etc/telegraf.conf
+++ b/salt/telegraf/etc/telegraf.conf
@@ -2,7 +2,7 @@
 {%- set INFLUXDBHOST = GLOBALS.influxdb_host %}
 {%- set ES_USER = salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:user', '') %}
 {%- set ES_PASS = salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:pass', '') %}
-{%- set TOKEN = salt['pillar.get']('secrets:influx_token', '') %}
+{%- set TOKEN = salt['pillar.get']('influxdb:token', '') %}
 {%- set NODEIP = GLOBALS.node_ip %}
 {%- set UNIQUEID = salt['pillar.get']('sensor:uniqueid', '') %}
 {%- set ZEEK_ENABLED = salt['pillar.get']('zeek:enabled', True) %}
diff --git a/setup/so-functions b/setup/so-functions
index 639657416..78033bda5 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -899,6 +899,7 @@ create_manager_pillars() {
 	kratos_pillar
 	soc_pillar
 	idh_pillar
+	influxdb_pillar
 
 }
 
@@ -1538,6 +1539,9 @@ influxdb_pillar() {
 	title "Create the influxdb pillar file"
 	touch $adv_influxdb_pillar_file
 	touch $influxdb_pillar_file
+	printf '%s\n'\
+		"influxdb:"\
+		"  token: $INFLUXTOKEN" > $local_salt_dir/pillar/influxdb/token.sls
 }
 
 make_some_dirs() {
@@ -2066,8 +2070,7 @@ secrets_pillar(){
 		"  playbook_admin: $PLAYBOOKADMINPASS"\
 		"  playbook_automation: $PLAYBOOKAUTOMATIONPASS"\
 		"  playbook_automation_api_key: "\
-		"  influx_pass: $INFLUXPASS"\
-		"  influx_token: $INFLUXTOKEN" > $local_salt_dir/pillar/secrets.sls
+		"  influx_pass: $INFLUXPASS" > $local_salt_dir/pillar/secrets.sls
   fi
 }