From 6b68a39cbe87384628172a2e5bb6b04401a2c6bf Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Tue, 29 Jun 2021 07:46:25 -0400
Subject: [PATCH 1/3] handle senario where there are no measurements

---
 salt/influxdb/defaults.yaml | 8 ++++++--
 salt/influxdb/init.sls      | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/salt/influxdb/defaults.yaml b/salt/influxdb/defaults.yaml
index 651722315..bfcee7927 100644
--- a/salt/influxdb/defaults.yaml
+++ b/salt/influxdb/defaults.yaml
@@ -1,3 +1,5 @@
+{% set measurements = salt['cmd.shell']('docker exec -t so-influxdb influx -format json -ssl -unsafeSsl -database telegraf -execute "show measurements" | jq -r .results[0].series[0].values[][0]') %}
+
 influxdb:
   retention_policies:
     so_short_term:
@@ -11,7 +13,9 @@ influxdb:
   downsample:
     so_long_term:
       resolution: 5m
+{% if measurements is defined %}
       measurements:
-{% for measurement in salt['cmd.shell']('docker exec -t so-influxdb influx -format json -ssl -unsafeSsl -database telegraf -execute "show measurements" | jq -r .results[0].series[0].values[][0]').splitlines() %}
+  {% for measurement in measurements.splitlines() %}
         - {{ measurement }}
-{% endfor %}
+  {% endfor %}
+{% endif %}
diff --git a/salt/influxdb/init.sls b/salt/influxdb/init.sls
index fb84f8bc8..37ebe39a5 100644
--- a/salt/influxdb/init.sls
+++ b/salt/influxdb/init.sls
@@ -113,7 +113,7 @@ telegraf_database:
 {% endfor %}
 
 {% for dest_rp in influxdb.downsample.keys() %}
-  {% for measurement in influxdb.downsample[dest_rp].measurements %}
+  {% for measurement in influxdb.downsample[dest_rp].get('measurements', []) %}
 so_downsample_{{measurement}}_cq:
   influxdb_continuous_query.present:
     - name: so_downsample_{{measurement}}_cq

From bf8bba7b84659463aece0b668db6256382c8b09f Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Tue, 29 Jun 2021 08:57:51 -0400
Subject: [PATCH 2/3] only set measurements if conditions are met

---
 salt/influxdb/defaults.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/salt/influxdb/defaults.yaml b/salt/influxdb/defaults.yaml
index bfcee7927..dae7f1cb4 100644
--- a/salt/influxdb/defaults.yaml
+++ b/salt/influxdb/defaults.yaml
@@ -13,7 +13,7 @@ influxdb:
   downsample:
     so_long_term:
       resolution: 5m
-{% if measurements is defined %}
+{% if 'jq: error' not in measurements and 'Error response from daemon' not in measurements and 'parse error:' not in measurements and measurements|length > 0 %}
       measurements:
   {% for measurement in measurements.splitlines() %}
         - {{ measurement }}

From ca152ab04cddf3b3649d121346f2c63f27da1733 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Tue, 29 Jun 2021 09:54:17 -0400
Subject: [PATCH 3/3] redefine measurements

---
 salt/influxdb/defaults.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/salt/influxdb/defaults.yaml b/salt/influxdb/defaults.yaml
index dae7f1cb4..205c2ba67 100644
--- a/salt/influxdb/defaults.yaml
+++ b/salt/influxdb/defaults.yaml
@@ -1,4 +1,4 @@
-{% set measurements = salt['cmd.shell']('docker exec -t so-influxdb influx -format json -ssl -unsafeSsl -database telegraf -execute "show measurements" | jq -r .results[0].series[0].values[][0]') %}
+{% 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') %}
 
 influxdb:
   retention_policies:
@@ -13,7 +13,7 @@ influxdb:
   downsample:
     so_long_term:
       resolution: 5m
-{% if 'jq: error' not in measurements and 'Error response from daemon' not in measurements and 'parse error:' not in measurements and measurements|length > 0 %}
+{% if measurements|length > 0 %}
       measurements:
   {% for measurement in measurements.splitlines() %}
         - {{ measurement }}