diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 280f02983..fc501084a 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -699,6 +699,14 @@ up_2.3.80_to_2.3.90() { mv /etc/pki/influxdb.crt /etc/pki/influxdb.crt.2390upgrade mv /etc/pki/influxdb.key /etc/pki/influxdb.key.2390upgrade + # remove old common ingest pipeline in default + rm -vf /opt/so/saltstack/default/salt/elasticsearch/files/ingest/common + # if custom common, move from local ingest to local ingest-dynamic + mkdir -vp /opt/so/saltstack/local/salt/elasticsearch/files/ingest-dynamic + if [[ -f "/opt/so/saltstack/local/salt/elasticsearch/files/ingest/common" ]]; then + mv -v /opt/so/saltstack/local/salt/elasticsearch/files/ingest/common /opt/so/saltstack/local/salt/elasticsearch/files/ingest-dynamic/common + fi + INSTALLEDVERSION=2.3.90 } diff --git a/salt/elasticsearch/init.sls b/salt/elasticsearch/init.sls index 3c57aa150..f31e224a3 100644 --- a/salt/elasticsearch/init.sls +++ b/salt/elasticsearch/init.sls @@ -288,6 +288,7 @@ so-elasticsearch: - file: cacertz - file: esyml - file: esingestconf + - file: esingestdynamicconf - file: so-elasticsearch-pipelines-file - require: - file: esyml