From 2a5ab3492d3a9e3d2aca72863025366c80e6f5c9 Mon Sep 17 00:00:00 2001 From: weslambert Date: Mon, 23 Mar 2020 15:14:42 -0400 Subject: [PATCH] Update init.sls --- salt/kibana/init.sls | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/salt/kibana/init.sls b/salt/kibana/init.sls index f086e7d33..e7cf19d74 100644 --- a/salt/kibana/init.sls +++ b/salt/kibana/init.sls @@ -1,4 +1,11 @@ -{% set master = salt['grains.get']('master') %} +{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.1.4') %} +{% set MASTER = salt['grains.get']('master') %} {% set MASTER = salt['grains.get']('master') %} +{% set FEATURES = salt['pillar.get']('elastic:features', False) %} +{% if FEATURES %} + {% set FEATURES = "-features" %} +{% else %} + {% set FEATURES = '' %} +{% endif %} # Add ES Group kibanasearchgroup: @@ -57,7 +64,7 @@ synckibanacustom: # Start the kibana docker so-kibana: docker_container.running: - - image: {{ MASTER }}:5000/soshybridhunter/so-logstash:{{ VERSION }}{{ FEATURES }} + - image: {{ MASTER }}:5000/soshybridhunter/so-kibana:{{ VERSION }}{{ FEATURES }} - hostname: kibana - user: kibana - environment: