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

Merge pull request #8332 from Security-Onion-Solutions/dev

Browse Source 
Merge Hotfix
This commit is contained in:
Mike Reeves
2022-07-19 13:30:20 -04:00
committed by GitHub
parent 52a5e743e9 c795a70e9c
commit 440f4e75c1
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
salt/common/tools/sbin/soup
View File

@@ -374,10 +374,9 @@ clone_to_tmp() {
elastalert_indices_check() { elastalert_indices_check() {
# Stop Elastalert to prevent Elastalert indices from being re-created # Stop Elastalert to prevent Elastalert indices from being re-created
so-elastalert-stop if grep -q "^so-elastalert$" /opt/so/conf/so-status/so-status.conf ; then
so-elastalert-stop || true
# Deleting Elastalert indices to prevent issues with upgrade to Elastic 8 ## fi
echo "Deleting Elastalert indices to prevent issues with upgrade to Elastic 8..."
# Wait for ElasticSearch to initialize # Wait for ElasticSearch to initialize
echo -n "Waiting for ElasticSearch..." echo -n "Waiting for ElasticSearch..."
@@ -403,8 +402,9 @@ elastalert_indices_check() {
echo echo
exit 1 exit 1
fi fi
# Check Elastalert indices # Check Elastalert indices
echo "Deleting Elastalert indices to prevent issues with upgrade to Elastic 8..."
CHECK_COUNT=0 CHECK_COUNT=0
while [[ "$CHECK_COUNT" -le 2 ]]; do while [[ "$CHECK_COUNT" -le 2 ]]; do
# Delete Elastalert indices # Delete Elastalert indices