From 07df8bff7ea76316de9cdf830666798c508dc7f1 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 29 Jan 2020 17:00:39 -0500 Subject: [PATCH] add filebeat features back --- salt/filebeat/init.sls | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/salt/filebeat/init.sls b/salt/filebeat/init.sls index 95736ca8b..8528ecc38 100644 --- a/salt/filebeat/init.sls +++ b/salt/filebeat/init.sls @@ -11,9 +11,15 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . -{% set VERSION = salt['pillar.get']('static:soversion', '1.1.4') %} +{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.1.4') %} {% set MASTER = salt['grains.get']('master') %} {%- set MASTERIP = salt['pillar.get']('static:masterip', '') %} +{% set FEATURES = salt['pillar.get']('elastic:features', False) %} +{% if FEATURES %} + {% set FEATURES = "-features" %} +{% else %} + {% set FEATURES = '' %} +{% endif %} # Filebeat Setup filebeatetcdir: file.directory: @@ -43,7 +49,7 @@ filebeatconfsync: - template: jinja so-filebeat: docker_container.running: - - image: {{ MASTER }}:5000/soshybridhunter/so-filebeat:HH{{ VERSION }} + - image: {{ MASTER }}:5000/soshybridhunter/so-filebeat:{{ VERSION }}{{ FEATURES }} - hostname: so-filebeat - user: root - extra_hosts: {{ MASTER }}:{{ MASTERIP }}