diff --git a/salt/elasticsearch/files/ingest/common b/salt/elasticsearch/files/ingest-dynamic/common similarity index 94% rename from salt/elasticsearch/files/ingest/common rename to salt/elasticsearch/files/ingest-dynamic/common index 20a9d7f7e..bdf6513fe 100644 --- a/salt/elasticsearch/files/ingest/common +++ b/salt/elasticsearch/files/ingest-dynamic/common @@ -1,3 +1,5 @@ +{%- set HIGHLANDER = salt['pillar.get']('global:highlander', False) -%} +{%- raw -%} { "description" : "common", "processors" : [ @@ -65,5 +67,16 @@ "index_name_format": "yyyy.MM.dd" } } +{%- endraw %} +{%- if HIGHLANDER %} + , + { + "pipeline": { + "name": "ecs" + } + } +{%- endif %} +{%- raw %} ] } +{% endraw %} diff --git a/salt/elasticsearch/init.sls b/salt/elasticsearch/init.sls index 41a9f4504..3c57aa150 100644 --- a/salt/elasticsearch/init.sls +++ b/salt/elasticsearch/init.sls @@ -131,6 +131,14 @@ esrolesdir: - group: 939 - makedirs: True +esingestdynamicconf: + file.recurse: + - name: /opt/so/conf/elasticsearch/ingest + - source: salt://elasticsearch/files/ingest-dynamic + - user: 930 + - group: 939 + - template: jinja + esingestconf: file.recurse: - name: /opt/so/conf/elasticsearch/ingest @@ -321,6 +329,7 @@ so-elasticsearch-pipelines: - name: /opt/so/conf/elasticsearch/so-elasticsearch-pipelines {{ esclustername }} - onchanges: - file: esingestconf + - file: esingestdynamicconf - file: esyml - file: so-elasticsearch-pipelines-file