From 8eef574342f27c46d581331114cd2d4dbfd5d027 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Wed, 21 Apr 2021 08:28:01 -0400
Subject: [PATCH] install python3-influxdb and create requires

---
 salt/influxdb/init.sls | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/salt/influxdb/init.sls b/salt/influxdb/init.sls
index 1b21612b3..67342f826 100644
--- a/salt/influxdb/init.sls
+++ b/salt/influxdb/init.sls
@@ -13,6 +13,10 @@
 include:
   - salt.minion
 
+python3-influxdb:
+  pkg.installed:
+    - name: python3-influxdb
+
 # Influx DB
 influxconfdir:
   file.directory:
@@ -62,6 +66,7 @@ append_so-influxdb_so-status.conf:
     - name: /opt/so/conf/so-status/so-status.conf
     - text: so-influxdb
 
+
 telegraf_database:
   influxdb_database.present:
     - name: telegraf
@@ -72,6 +77,7 @@ telegraf_database:
     - influxdb_host: {{ MANAGER }}
     - require:
       - docker_container: so-influxdb
+      - pkg: python3-influxdb
 
 {% for rp in influxdb.retention_policies.keys() %}
 {{rp}}_retention_policy:
@@ -90,28 +96,9 @@ telegraf_database:
       - docker_container: so-influxdb
       - influxdb_database: telegraf_database
       - file: influxdb_retention_policy.present_patch
+      - pkg: python3-influxdb
 {% endfor %}
 
-{#
-{% for dest_rp in influxdb.downsample.keys() %}
-  {% for measurement in influxdb.downsample[dest_rp].measurements %}
-so_downsample_{{measurement}}_cq:
-  influxdb_continuous_query.present:
-    - name: so_downsample_{{measurement}}_cq
-    - database: telegraf
-    - query: SELECT mean(*) INTO "{{dest_rp}}".:MEASUREMENT FROM "{{measurement}}" GROUP BY time({{influxdb.downsample[dest_rp].resolution}}), *
-    - ssl: True
-    - verify_ssl: /etc/pki/ca.crt
-    - cert: ['/etc/pki/influxdb.crt', '/etc/pki/influxdb.key']
-    - influxdb_host: {{ MANAGER }}
-    - require:
-      - docker_container: so-influxdb
-      - influxdb_database: telegraf_database
-      - file: influxdb_continuous_query.present_patch
-  {% endfor %}
-{% endfor %}
-#}
-
 {% for dest_rp in influxdb.downsample.keys() %}
 so_downsample_cq:
   influxdb_continuous_query.present:
@@ -126,6 +113,7 @@ so_downsample_cq:
       - docker_container: so-influxdb
       - influxdb_database: telegraf_database
       - file: influxdb_continuous_query.present_patch
+      - pkg: python3-influxdb
 {% endfor %}
 
 {% endif %}