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

Use the retry function so-elasticsearch-query

Browse Source
This commit is contained in:
Wes
2023-11-07 19:56:50 +00:00
parent 0b4a246ddb
commit 1676c84f9c
2 changed files with 60 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,51 +16,15 @@ ELASTICSEARCH_INGEST_PIPELINES="/opt/so/conf/elasticsearch/ingest/"
# Wait for ElasticSearch to initialize
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..."
COUNT=0
ELASTICSEARCH_CONNECTED="no"
while [[ "$COUNT" -le 240 ]]; do
curl -K /opt/so/conf/elasticsearch/curl.config -k --output /dev/null --silent --head --fail -L https://"$ELASTICSEARCH_HOST":"$ELASTICSEARCH_PORT"
if [ $? -eq 0 ]; then
ELASTICSEARCH_CONNECTED="yes"
echo "connected!"
break
else
((COUNT+=1))
sleep 1
echo -n "."
fi
done
if [ "$ELASTICSEARCH_CONNECTED" == "no" ]; then
echo
echo -e "Connection attempt timed out. Unable to connect to ElasticSearch. \nPlease try: \n -checking log(s) in /var/log/elasticsearch/\n -running 'sudo docker ps' \n -running 'sudo so-elastic-restart'"
echo
exit 1
fi
retry 240 1 "so-elasticsearch-query / -k --output /dev/null --silent --head --fail" || fail "Connection attempt timed out. Unable to connect to ElasticSearch. \nPlease try: \n -checking log(s) in /var/log/elasticsearch/\n -running 'sudo docker ps' \n -running 'sudo so-elastic-restart'"
cd ${ELASTICSEARCH_INGEST_PIPELINES}
echo "Loading pipelines..."
for i in .[a-z]* *;
do
echo $i;
SUCCESSFUL="no"
while [[ "$TRYCOUNT" -le 4 ]]; do
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);
if [ "$RESPONSE" == '{"acknowledged":true}' ]; then
SUCCESSFUL="yes"
break
else
((TRYCOUNT+=1))
sleep 5
echo -n "Attempt $TRYCOUNT/5 unsuccessful..."
fi
done
if ! [ "$SUCCESSFUL" == "yes" ];then
echo -n "Could not load pipeline."
echo -n "$RESPONSE"
exit 1
fi
retry 5 5 "so-elasticsearch-query _ingest/pipeline/$i -d@$i -XPUT | grep '{\"acknowledged\":true}'" || fail "Could not load pipeline: $i"
done
echo

94
salt/elasticsearch/tools/sbin_jinja/so-elasticsearch-templates-load
View File

@@ -34,27 +34,7 @@ if [ ! -f /opt/so/state/estemplates.txt ]; then
if [ -f "$file" ]; then
# Wait for ElasticSearch to initialize
echo -n "Waiting for ElasticSearch..."
COUNT=0
ELASTICSEARCH_CONNECTED="no"
while [[ "$COUNT" -le 240 ]]; do
so-elasticsearch-query / -k --output /dev/null --silent --head --fail
if [ $? -eq 0 ]; then
ELASTICSEARCH_CONNECTED="yes"
echo "connected!"
break
else
((COUNT+=1))
sleep 1
echo -n "."
fi
done
if [ "$ELASTICSEARCH_CONNECTED" == "no" ]; then
echo
echo -e "Connection attempt timed out. Unable to connect to ElasticSearch. \nPlease try: \n -checking log(s) in /var/log/elasticsearch/\n -running 'sudo docker ps' \n -running 'sudo so-elastic-restart'"
echo
exit 1
fi
retry 240 1 "so-elasticsearch-query / -k --output /dev/null --silent --head --fail" || fail "Connection attempt timed out. Unable to connect to ElasticSearch. \nPlease try: \n -checking log(s) in /var/log/elasticsearch/\n -running 'sudo docker ps' \n -running 'sudo so-elastic-restart'"
{% if GLOBALS.role != 'so-heavynode' %}
SESSIONCOOKIE=$(curl -s -K /opt/so/conf/elasticsearch/curl.config -c - -X GET http://localhost:5601/ | grep sid | awk '{print $7}')
INSTALLED=$(elastic_fleet_package_is_installed {{ SUPPORTED_PACKAGES[0] }} )
@@ -72,23 +52,7 @@ if [ ! -f /opt/so/state/estemplates.txt ]; then
for i in *; do
TEMPLATE=$(echo $i | cut -d '.' -f1)
echo "$TEMPLATE-mappings"
SUCCESSFUL="no"
while [[ "$TRYCOUNT" -le 4 ]]; do
RESPONSE=$(so-elasticsearch-query _component_template/${TEMPLATE}-mappings -d@$i -XPUT 2>/dev/null);
if [ "$RESPONSE" == '{"acknowledged":true}' ]; then
SUCCESSFUL="yes"
break
else
((TRYCOUNT+=1))
sleep 5
echo -n "Attempt $TRYCOUNT/5 unsuccessful..."
fi
done
if ! [ "$SUCCESSFUL" == "yes" ];then
echo -n "Could not load template."
echo -n "$RESPONSE"
exit 1
fi
retry 5 5 "so-elasticsearch-query _component_template/${TEMPLATE}-mappings -d@$i -XPUT | grep '{\"acknowledged\":true}'" || fail "Could not load template: $TEMPLATE-mappings"
done
echo
@@ -103,23 +67,7 @@ if [ ! -f /opt/so/state/estemplates.txt ]; then
for i in $component_pattern; do
TEMPLATE=${i::-5}
echo "$TEMPLATE"
SUCCESSFUL="no"
while [[ "$TRYCOUNT" -le 4 ]]; do
RESPONSE=$(so-elasticsearch-query _component_template/$TEMPLATE -d@$i -XPUT 2>/dev/null);
if [ "$RESPONSE" == '{"acknowledged":true}' ]; then
SUCCESSFUL="yes"
break
else
((TRYCOUNT+=1))
sleep 5
echo -n "Attempt $TRYCOUNT/5 unsuccessful..."
fi
done
if ! [ "$SUCCESSFUL" == "yes" ];then
echo -n "Could not load template."
echo -n "$RESPONSE"
exit 1
fi
retry 5 5 "so-elasticsearch-query _component_template/$TEMPLATE -d@$i -XPUT | grep '{\"acknowledged\":true}'" || fail "Could not load template: $TEMPLATE"
done
echo
@@ -130,23 +78,7 @@ if [ ! -f /opt/so/state/estemplates.txt ]; then
for i in *; do
TEMPLATE=$(echo $i | cut -d '.' -f1);
echo "$TEMPLATE"
SUCCESSFUL="no"
while [[ "$TRYCOUNT" -le 4 ]]; do
RESPONSE=$(so-elasticsearch-query _component_template/$TEMPLATE -d@$i -XPUT 2>/dev/null);
if [ "$RESPONSE" == '{"acknowledged":true}' ]; then
SUCCESSFUL="yes"
break
else
((TRYCOUNT+=1))
sleep 5
echo -n "Attempt $TRYCOUNT/5 unsuccessful..."
fi
done
if ! [ "$SUCCESSFUL" == "yes" ];then
echo -n "Could not load template."
echo -n "$RESPONSE"
exit 1
fi
retry 5 5 "so-elasticsearch-query _component_template/$TEMPLATE -d@$i -XPUT | grep '{\"acknowledged\":true}'" || fail "Could not load template: $TEMPLATE"
done
echo
@@ -163,23 +95,7 @@ if [ ! -f /opt/so/state/estemplates.txt ]; then
for i in $pattern; do
TEMPLATE=${i::-14}
echo "$TEMPLATE"
SUCCESSFUL="no"
while [[ "$TRYCOUNT" -le 4 ]]; do
RESPONSE=$(so-elasticsearch-query _index_template/$TEMPLATE -d@$i -XPUT 2>/dev/null);
if [ "$RESPONSE" == '{"acknowledged":true}' ]; then
SUCCESSFUL="yes"
break
else
((TRYCOUNT+=1))
sleep 5
echo -n "Attempt $TRYCOUNT/5 unsuccessful..."
fi
done
if ! [ "$SUCCESSFUL" == "yes" ];then
echo -n "Could not load template."
echo -n "$RESPONSE"
exit 1
fi
retry 5 5 "so-elasticsearch-query _index_template/$TEMPLATE -d@$i -XPUT | grep '{\"acknowledged\":true}'" || fail "Could not load template: $TEMPLATE"
done
else
{% if GLOBALS.role == 'so-heavynode' %}