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