From 3de4e56db9beb154b93a55a640aacede83a33975 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Sat, 10 Sep 2022 19:25:01 -0400 Subject: [PATCH] Fix ES merge --- salt/elastalert/elastalert_config.map.jinja | 4 +++- salt/elasticsearch/config.map.jinja | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/salt/elastalert/elastalert_config.map.jinja b/salt/elastalert/elastalert_config.map.jinja index 2b9895e1b..4408111d3 100644 --- a/salt/elastalert/elastalert_config.map.jinja +++ b/salt/elastalert/elastalert_config.map.jinja @@ -1,8 +1,10 @@ {% import_yaml 'elastalert/defaults.yaml' as ELASTALERT with context %} {% set elastalert_pillar = salt['pillar.get']('elastalert:config', {}) %} -{% do salt['defaults.merge'](ELASTALERT.elastalert.config, elastalert_pillar, in_place=True) %} {% do ELASTALERT.elastalert.config.update({'es_host': pillar.global.managerip}) %} {% do ELASTALERT.elastalert.config.update({'es_username': pillar.elasticsearch.auth.users.so_elastic_user.user}) %} {% do ELASTALERT.elastalert.config.update({'es_password': pillar.elasticsearch.auth.users.so_elastic_user.pass}) %} + +{% do salt['defaults.merge'](ELASTALERT.elastalert.config, elastalert_pillar, in_place=True) %} + diff --git a/salt/elasticsearch/config.map.jinja b/salt/elasticsearch/config.map.jinja index 7cd79e7b9..cec4887c8 100644 --- a/salt/elasticsearch/config.map.jinja +++ b/salt/elasticsearch/config.map.jinja @@ -29,12 +29,13 @@ {% do ESCONFIG.elasticsearch.config.xpack.ml.update({'enabled': true}) %} {% endif %} -{# merge with the elasticsearch pillar #} -{% set ESCONFIG = salt['pillar.get']('elasticsearch:config', default=ESCONFIG.elasticsearch.config, merge=True) %} {% do ESCONFIG.elasticsearch.config.node.update({'name': grains.host}) %} {% do ESCONFIG.elasticsearch.config.cluster.update({'name': grains.host}) %} {% do ESCONFIG.elasticsearch.config.transport.update({'publish_host': grains.host}) %} +{# merge with the elasticsearch pillar #} +{% set ESCONFIG = salt['pillar.get']('elasticsearch:config', default=ESCONFIG.elasticsearch.config, merge=True) %} + {% if salt['pillar.get']('elasticsearch:config:path:repo', False) %} {% for repo in pillar.elasticsearch.config.path.repo %} {# remove elasticsearch.config.path.repo value if the directory doesn't exist on the node #}