Only load pipelines on change

This commit is contained in:
Mike Reeves
2022-03-07 14:25:46 -05:00
parent eac120f4c2
commit d33db6fb23
2 changed files with 35 additions and 24 deletions

View File

@@ -268,6 +268,15 @@ es_repo_dir:
- require:
- file: nsmesdir
so-pipelines-reload:
cmd.run:
- name: rm -r /opt/so/state/espipelines.txt
- onchanges:
- file: esingestconf
- file: esingestdynamicconf
- file: esyml
- file: so-elasticsearch-pipelines-script
auth_users:
file.managed:
- name: /opt/so/conf/elasticsearch/users.tmp
@@ -397,11 +406,6 @@ so-elasticsearch-templates:
so-elasticsearch-pipelines:
cmd.run:
- name: /usr/sbin/so-elasticsearch-pipelines {{ grains.host }}
- onchanges:
- file: esingestconf
- file: esingestdynamicconf
- file: esyml
- file: so-elasticsearch-pipelines-script
- require:
- docker_container: so-elasticsearch
- file: so-elasticsearch-pipelines-script

View File

@@ -23,6 +23,9 @@ ELASTICSEARCH_PORT=9200
ELASTICSEARCH_INGEST_PIPELINES="/opt/so/conf/elasticsearch/ingest/"
# Wait for ElasticSearch to initialize
if [ ! -f /opt/so/state/espipelines.txt ]; then
echo -n "Waiting for ElasticSearch..."
COUNT=0
ELASTICSEARCH_CONNECTED="no"
@@ -51,5 +54,9 @@ for i in *; do echo $i; RESPONSE=$({{ ELASTICCURL }} -k -XPUT -L https://${ELAST
echo
cd - >/dev/null
if [[ "$RETURN_CODE" != "1" ]]; then
touch /opt/so/state/espipelines.txt
fi
else
exit $RETURN_CODE
fi