From 9a08decadb56c76d2cec7243a5066f5ea27cdc52 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Fri, 9 Sep 2022 15:41:20 -0400
Subject: [PATCH] remove jinja from influxdb defaults.yaml

---
 salt/influxdb/defaults.yaml | 8 --------
 salt/influxdb/map.jinja     | 9 +++++++++
 2 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 salt/influxdb/map.jinja

diff --git a/salt/influxdb/defaults.yaml b/salt/influxdb/defaults.yaml
index c89257c53..177ebdfa2 100644
--- a/salt/influxdb/defaults.yaml
+++ b/salt/influxdb/defaults.yaml
@@ -1,5 +1,3 @@
-{% set measurements = salt['cmd.shell']('docker exec -t so-influxdb influx -format json -ssl -unsafeSsl -database telegraf -execute "show measurements" 2> /root/measurement_query.log | jq -r .results[0].series[0].values[]?[0] 2>> /root/measurement_query.log', shell='/bin/bash') %}
-
 influxdb:
   retention_policies:
     so_short_term:
@@ -13,9 +11,3 @@ influxdb:
   downsample:
     so_long_term:
       resolution: 5m
-{% if measurements|length > 0 %}
-      measurements:
-  {% for measurement in measurements.splitlines() %}
-        - {{ measurement }}
-  {% endfor %}
-{% endif %}
diff --git a/salt/influxdb/map.jinja b/salt/influxdb/map.jinja
new file mode 100644
index 000000000..a13d4c257
--- /dev/null
+++ b/salt/influxdb/map.jinja
@@ -0,0 +1,9 @@
+{% import_yaml 'influxdb/defaults.yaml' as INFLUXDB %}
+{% set measurements = salt['cmd.shell']('docker exec -t so-influxdb influx -format json -ssl -unsafeSsl -database telegraf -execute "show measurements" 2> /root/measurement_query.log | jq -r .results[0].series[0].values[]?[0] 2>> /root/measurement_query.log', shell='/bin/bash') %}
+
+{% if measurements|length > 0 %}
+{%   do INFLUXDB.influxdb.downsample.so_long_term.update('measurements': [])%}
+{%   for measurement in measurements.splitlines() %}
+{%     do INFLUXDB.influxdb.downsample.so_long_term.measurements.append(measurement)%}
+{%   endfor %}
+{% endif %}