Merge pull request #7446 from Security-Onion-Solutions/fixpipelineload

Only load pipelines on change

salt/elasticsearch/init.sls

@@ -268,6 +268,15 @@ es_repo_dir:
     - require:
       - file: nsmesdir
 
+so-pipelines-reload:
+  file.absent:
+    - name: /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
@@ -358,9 +367,6 @@ so-elasticsearch:
     - watch:
       - file: cacertz
       - file: esyml
-      - file: esingestconf
-      - file: esingestdynamicconf
-      - file: so-elasticsearch-pipelines-script
     - require:
       - file: esyml
       - file: eslog4jfile
@@ -397,11 +403,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

salt/elasticsearch/tools/sbin/so-elasticsearch-pipelines

@@ -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