From faeaa948c899f684e96537049c3e23a1e845beda Mon Sep 17 00:00:00 2001 From: Wes Lambert Date: Sat, 19 Mar 2022 04:31:48 +0000 Subject: [PATCH] Remove extra Salt logic and clean up output format of resultant script --- salt/common/tools/sbin/so-filebeat-module-setup | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/salt/common/tools/sbin/so-filebeat-module-setup b/salt/common/tools/sbin/so-filebeat-module-setup index c4133c217..945c3c58a 100755 --- a/salt/common/tools/sbin/so-filebeat-module-setup +++ b/salt/common/tools/sbin/so-filebeat-module-setup @@ -54,15 +54,13 @@ PIPELINES=$({{ ELASTICCURL }} -sk https://"$ELASTICSEARCH_HOST":"$ELASTICSEARCH_ if [[ "$PIPELINES" -lt 5 ]] || [ "$2" != "--force" ]; then echo "Setting up ingest pipeline(s)" {% from 'filebeat/modules.map.jinja' import MODULESMERGED with context %} -{% for module in MODULESMERGED.modules.keys() %} - {% for fileset in MODULESMERGED.modules[module] %} - {#% if MODULESMERGED.modules[module][fileset].get('enabled', False) %#} +{%- for module in MODULESMERGED.modules.keys() %} + {%- for fileset in MODULESMERGED.modules[module] %} echo "{{ module }}.{{ fileset}}" docker exec -i so-filebeat filebeat setup --pipelines --modules {{ module }} -M "{{ module }}.{{ fileset }}.enabled=true" -c $FB_MODULE_YML sleep 0.5 - {#% endif %#} {% endfor %} -{% endfor %} +{%- endfor %} else exit 0 fi