CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Better error handling and state file management

Browse Source
This commit is contained in:
Wes
2023-11-06 14:29:01 +00:00
parent 74eda68d84
commit c30a0d5b5b
1 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
salt/elasticsearch/tools/sbin/so-elasticsearch-pipelines
View File

@@ -6,7 +6,6 @@
. /usr/sbin/so-common . /usr/sbin/so-common
RETURN_CODE=0 RETURN_CODE=0
ELASTICSEARCH_HOST=$1 ELASTICSEARCH_HOST=$1
ELASTICSEARCH_PORT=9200 ELASTICSEARCH_PORT=9200
@@ -15,8 +14,8 @@ ELASTICSEARCH_PORT=9200
ELASTICSEARCH_INGEST_PIPELINES="/opt/so/conf/elasticsearch/ingest/" ELASTICSEARCH_INGEST_PIPELINES="/opt/so/conf/elasticsearch/ingest/"
# Wait for ElasticSearch to initialize # Wait for ElasticSearch to initialize
if [ ! -f /opt/so/state/espipelines.txt ]; then if [ ! -f /opt/so/state/espipelines.txt ]; then
echo "State file /opt/so/state/espipelines.txt not found. Running so-elasticsearch-pipelines."
echo -n "Waiting for ElasticSearch..." echo -n "Waiting for ElasticSearch..."
COUNT=0 COUNT=0
@@ -41,14 +40,24 @@ if [ ! -f /opt/so/state/espipelines.txt ]; then
fi fi
cd ${ELASTICSEARCH_INGEST_PIPELINES} cd ${ELASTICSEARCH_INGEST_PIPELINES}
echo "Loading pipelines..." echo "Loading pipelines..."
for i in .[a-z]* *; do echo $i; RESPONSE=$(curl -K /opt/so/conf/elasticsearch/curl.config -k -XPUT -L https://${ELASTICSEARCH_HOST}:${ELASTICSEARCH_PORT}/_ingest/pipeline/$i -H 'Content-Type: application/json' -d@$i 2>/dev/null); echo $RESPONSE; if [[ "$RESPONSE" == *"error"* ]]; then RETURN_CODE=1; fi; done for i in .[a-z]* *;
do echo $i;
RESPONSE=$(curl -K /opt/so/conf/elasticsearch/curl.config -k -XPUT -L https://${ELASTICSEARCH_HOST}:${ELASTICSEARCH_PORT}/_ingest/pipeline/$i -H 'Content-Type: application/json' -d@$i 2>/dev/null);
ERRORS=$(echo $RESPONSE | grep -E "Connection attempt timed out|error");
if ! [ -z "$ERRORS" ]; then
echo $ERRORS;
RETURN_CODE=1;
fi;
done
echo echo
cd - >/dev/null cd - >/dev/null
if [[ "$RETURN_CODE" != "1" ]]; then if [[ "$RETURN_CODE" != "1" ]]; then
touch /opt/so/state/espipelines.txt touch /opt/so/state/espipelines.txt
else
echo "Errors were detected. This script will run again during the next application of the state."
fi fi
else else
exit $RETURN_CODE exit $RETURN_CODE