From 341297bbaaffc48f78f0384c58b265931d722e78 Mon Sep 17 00:00:00 2001
From: Mike Reeves <luke@geekempire.com>
Date: Tue, 8 Jan 2019 13:29:24 -0500
Subject: [PATCH] Update For 1.0.6

---
 salt/elasticsearch/init.sls               | 2 +-
 salt/filebeat/init.sls                    | 4 ++--
 salt/kibana/custom/osquery-dashboard.json | 4 ++--
 salt/kibana/init.sls                      | 4 +---
 salt/logstash/init.sls                    | 2 +-
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/salt/elasticsearch/init.sls b/salt/elasticsearch/init.sls
index 27bc883f4..693cb3de0 100644
--- a/salt/elasticsearch/init.sls
+++ b/salt/elasticsearch/init.sls
@@ -92,7 +92,7 @@ eslogdir:
 
 so-elasticsearch:
   docker_container.running:
-    - image: soshybridhunter/so-elasticsearch:HH1.0.3
+    - image: soshybridhunter/so-elasticsearch:HH1.0.6
     - hostname: elasticsearch
     - name: so-elasticsearch
     - user: elasticsearch
diff --git a/salt/filebeat/init.sls b/salt/filebeat/init.sls
index 65f22a2e1..1396b34fb 100644
--- a/salt/filebeat/init.sls
+++ b/salt/filebeat/init.sls
@@ -52,7 +52,7 @@ filebeatconfsync:
 
 so-filebeat:
   docker_container.running:
-    - image: soshybridhunter/so-filebeat:HH1.0.3
+    - image: soshybridhunter/so-filebeat:HH1.0.6
     - hostname: so-filebeat
     - user: root
     - extra_hosts: {{ MASTER }}:{{ MASTERIP }}
@@ -70,7 +70,7 @@ so-filebeat:
 {%- else %}
       - /opt/so/conf/filebeat/etc/pki/filebeat.crt:/usr/share/filebeat/filebeat.crt:ro
       - /opt/so/conf/filebeat/etc/pki/filebeat.key:/usr/share/filebeat/filebeat.key:ro
-{%- endif %} 
+{%- endif %}
       - /etc/ssl/certs/intca.crt:/usr/share/filebeat/intraca.crt:ro
     - watch:
       - file: /opt/so/conf/filebeat/etc
diff --git a/salt/kibana/custom/osquery-dashboard.json b/salt/kibana/custom/osquery-dashboard.json
index 9801b2639..9d179b75b 100644
--- a/salt/kibana/custom/osquery-dashboard.json
+++ b/salt/kibana/custom/osquery-dashboard.json
@@ -1,5 +1,5 @@
 {
-  "version": "6.4.2",
+  "version": "6.5.2",
   "objects": [
     {
       "id": "b3b449d0-3429-11e7-9d52-4f090484f59e",
@@ -142,4 +142,4 @@
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/salt/kibana/init.sls b/salt/kibana/init.sls
index 4bd800297..f59844b09 100644
--- a/salt/kibana/init.sls
+++ b/salt/kibana/init.sls
@@ -51,15 +51,13 @@ synckibanacustom:
     - source: salt://kibana/custom
     - user: 932
     - group: 939
-    - template: jinja
-
 
 # File.Recurse for custom saved dashboards
 
 # Start the kibana docker
 so-kibana:
   docker_container.running:
-    - image: soshybridhunter/so-kibana:HH1.0.5
+    - image: soshybridhunter/so-kibana:HH1.0.6
     - hostname: kibana
     - user: kibana
     - environment:
diff --git a/salt/logstash/init.sls b/salt/logstash/init.sls
index e816c888e..a583338ce 100644
--- a/salt/logstash/init.sls
+++ b/salt/logstash/init.sls
@@ -149,7 +149,7 @@ lslogdir:
 
 so-logstash:
   docker_container.running:
-    - image: soshybridhunter/so-logstash:HH1.0.5
+    - image: soshybridhunter/so-logstash:HH1.0.6
     - hostname: so-logstash
     - name: so-logstash
     - user: logstash