From 9ba5f6782811e4767cfd559cc4f9fe544f994d6f Mon Sep 17 00:00:00 2001
From: Mike Reeves <luke@geekempire.com>
Date: Wed, 26 Jun 2019 13:16:49 -0400
Subject: [PATCH] Update all containers to alpha except so-core

---
 salt/common/init.sls   | 14 +++++++++-----
 salt/hive/init.sls     |  8 ++++----
 salt/redis/init.sls    |  4 ++--
 salt/soctopus/init.sls |  4 ++--
 salt/suricata/init.sls |  4 ++--
 salt/wazuh/init.sls    |  4 ++--
 6 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/salt/common/init.sls b/salt/common/init.sls
index 998d4bce0..49008c9e7 100644
--- a/salt/common/init.sls
+++ b/salt/common/init.sls
@@ -164,13 +164,13 @@ tgrafconf:
 
 so-telegrafimage:
  cmd.run:
-   - name: docker pull --disable-content-trust=false soshybridhunter/so-telegraf:HH1.0.7
+   - name: docker pull --disable-content-trust=false soshybridhunter/so-telegraf:HH1.1.0
 
 so-telegraf:
   docker_container.running:
     - require:
       - so-telegrafimage
-    - image: soshybridhunter/so-telegraf:HH1.0.7
+    - image: soshybridhunter/so-telegraf:HH1.1.0
     - environment:
       - HOST_PROC=/host/proc
       - HOST_ETC=/host/etc
@@ -225,13 +225,13 @@ influxdbconf:
 
 so-influximage:
  cmd.run:
-   - name: docker pull --disable-content-trust=false soshybridhunter/so-influxdb:HH1.0.7
+   - name: docker pull --disable-content-trust=false soshybridhunter/so-influxdb:HH1.1.0
 
 so-influxdb:
   docker_container.running:
     - require:
       - so-influximage
-    - image: soshybridhunter/so-influxdb:HH1.0.7
+    - image: soshybridhunter/so-influxdb:HH1.1.0
     - hostname: influxdb
     - environment:
       - INFLUXDB_HTTP_LOG_ENABLED=false
@@ -388,9 +388,13 @@ dashboard-{{ SN }}:
 {% endif %}
 
 # Install the docker. This needs to be behind nginx at some point
+so-grafanaimage:
+ cmd.run:
+   - name: docker pull --disable-content-trust=false soshybridhunter/so-grafana:HH1.1.0
+
 so-grafana:
   docker_container.running:
-    - image: soshybridhunter/so-grafana:HH1.0.8
+    - image: soshybridhunter/so-grafana:HH1.1.0
     - hostname: grafana
     - user: socore
     - binds:
diff --git a/salt/hive/init.sls b/salt/hive/init.sls
index 81032b401..7d3862782 100644
--- a/salt/hive/init.sls
+++ b/salt/hive/init.sls
@@ -33,13 +33,13 @@ hiveesdata:
 
 so-thehive-esimage:
  cmd.run:
-   - name: docker pull --disable-content-trust=false soshybridhunter/so-thehive-es:HH1.0.7
+   - name: docker pull --disable-content-trust=false soshybridhunter/so-thehive-es:HH1.1.0
 
 so-thehive-es:
   docker_container.running:
     - require:
       - so-thehive-esimage
-    - image: soshybridhunter/so-thehive-es:HH1.0.7
+    - image: soshybridhunter/so-thehive-es:HH1.1.0
     - hostname: so-thehive-es
     - name: so-thehive-es
     - user: 939
@@ -81,13 +81,13 @@ so-thehive-es:
 
 so-thehiveimage:
  cmd.run:
-   - name: docker pull --disable-content-trust=false soshybridhunter/so-thehive:HH1.0.8
+   - name: docker pull --disable-content-trust=false soshybridhunter/so-thehive:HH1.1.0
 
 so-thehive:
   docker_container.running:
     - require:
       - so-thehiveimage
-    - image: soshybridhunter/so-thehive:HH1.0.8
+    - image: soshybridhunter/so-thehive:HH1.1.0
     - environment:
       - ELASTICSEARCH_HOST={{ MASTERIP }}
     - hostname: so-thehive
diff --git a/salt/redis/init.sls b/salt/redis/init.sls
index d13a51a23..174c1725b 100644
--- a/salt/redis/init.sls
+++ b/salt/redis/init.sls
@@ -46,13 +46,13 @@ redisconfsync:
 
 so-redisimage:
  cmd.run:
-   - name: docker pull --disable-content-trust=false soshybridhunter/so-redis:HH1.0.7
+   - name: docker pull --disable-content-trust=false soshybridhunter/so-redis:HH1.1.0
 
 so-redis:
   docker_container.running:
     - require:
       - so-redisimage
-    - image: soshybridhunter/so-redis:HH1.0.7
+    - image: soshybridhunter/so-redis:HH1.1.0
     - hostname: so-redis
     - user: socore
     - port_bindings:
diff --git a/salt/soctopus/init.sls b/salt/soctopus/init.sls
index ed2ce8900..22b21eb8f 100644
--- a/salt/soctopus/init.sls
+++ b/salt/soctopus/init.sls
@@ -15,13 +15,13 @@ soctopussync:
 
 so-soctopusimage:
   cmd.run:
-    - name: docker pull --disable-content-trust=false soshybridhunter/so-soctopus:HH1.0.8
+    - name: docker pull --disable-content-trust=false soshybridhunter/so-soctopus:HH1.1.0
 
 so-soctopus:
   docker_container.running:
     - require:
       - so-soctopusimage
-    - image: soshybridhunter/so-soctopus:HH1.0.8
+    - image: soshybridhunter/so-soctopus:HH1.1.0
     - hostname: soctopus
     - name: so-soctopus
     - binds:
diff --git a/salt/suricata/init.sls b/salt/suricata/init.sls
index 0453988f0..2739f4318 100644
--- a/salt/suricata/init.sls
+++ b/salt/suricata/init.sls
@@ -72,13 +72,13 @@ suriconfigsync:
 
 so-suricataimage:
  cmd.run:
-   - name: docker pull --disable-content-trust=false soshybridhunter/so-suricata:HH1.0.8
+   - name: docker pull --disable-content-trust=false soshybridhunter/so-suricata:HH1.1.0
 
 so-suricata:
   docker_container.running:
     - require:
       - so-suricataimage
-    - image: soshybridhunter/so-suricata:HH1.0.8
+    - image: soshybridhunter/so-suricata:HH1.1.0
     - privileged: True
     - environment:
       - INTERFACE={{ interface }}
diff --git a/salt/wazuh/init.sls b/salt/wazuh/init.sls
index eb0fa5cb9..4ff937c08 100644
--- a/salt/wazuh/init.sls
+++ b/salt/wazuh/init.sls
@@ -58,13 +58,13 @@ wazuhagentregister:
 
 so-wazuhimage:
  cmd.run:
-   - name: docker pull --disable-content-trust=false soshybridhunter/so-wazuh:HH1.0.7
+   - name: docker pull --disable-content-trust=false soshybridhunter/so-wazuh:HH1.1.0
 
 so-wazuh:
   docker_container.running:
     - require:
       - so-wazuhimage
-    - image: soshybridhunter/so-wazuh:HH1.0.7
+    - image: soshybridhunter/so-wazuh:HH1.1.0
     - hostname: {{HOSTNAME}}-wazuh-manager
     - name: so-wazuh
     - detach: True