more Kibana config

salt/kibana/init.sls

@@ -1,11 +1,4 @@
-{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.1.4') %}
-{% set MASTER = salt['grains.get']('master') %}
-{% set FEATURES = salt['pillar.get']('elastic:features', False) %}
-{% if FEATURES %}
-  {% set FEATURES = "-features" %}
-{% else %}
-  {% set FEATURES = '' %}
-{% endif %}
+{% set master = salt['grains.get']('master') %}
 
 # Add ES Group
 kibanasearchgroup:
@@ -59,17 +52,25 @@ synckibanacustom:
     - user: 932
     - group: 939
 
+# File.Recurse for custom saved dashboards
+
+so-kibanaimage:
+ cmd.run:
+   - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-kibana:HH1.1.1
+
 # Start the kibana docker
 so-kibana:
   docker_container.running:
-    - image: {{ MASTER }}:5000/soshybridhunter/so-kibana:{{ VERSION }}{{ FEATURES }}
+    - require:
+      - so-kibanaimage
+    - image: docker.io/soshybridhunter/so-kibana:HH1.1.1
     - hostname: kibana
     - user: kibana
     - environment:
       - KIBANA_DEFAULTAPPID=dashboard/94b52620-342a-11e7-9d52-4f090484f59e
-      - ELASTICSEARCH_HOST={{ MASTER }}
+      - ELASTICSEARCH_HOST={{ master }}
       - ELASTICSEARCH_PORT=9200
-      - MASTER={{ MASTER }}
+      - MASTER={{ master }}
     - binds:
       - /opt/so/conf/kibana/etc:/usr/share/kibana/config:rw
       - /opt/so/log/kibana:/var/log/kibana:rw
@@ -77,3 +78,17 @@ so-kibana:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
     - port_bindings:
       - 0.0.0.0:5601:5601
+
+so-kibana-config-load:
+  cmd.script:
+    - shell: /bin/bash
+    - runas: socore
+    - source: salt://kibana/bin/so-kibana-config-load
+
+# Keep the setting correct
+#KibanaHappy:
+#  cmd.script:
+#    - shell: /bin/bash
+#    - runas: socore
+#    - source: salt://kibana/bin/keepkibanahappy.sh
+#    - template: jinja