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 #13675 from Security-Onion-Solutions/issue/13247

Browse Source 
resolve 13247
This commit is contained in:
Josh Patterson
2024-09-16 16:44:41 -04:00
committed by GitHub
parent 60dfa0f87e 0ab2695ceb
commit b7fd19dcfd
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -525,11 +525,17 @@ stop_salt_master() {
pkill -9 -ef "/usr/bin/python3 /bin/salt" >> $SOUP_LOG 2>&1 pkill -9 -ef "/usr/bin/python3 /bin/salt" >> $SOUP_LOG 2>&1
echo "" echo ""
echo "Storing salt-master pid." echo "Storing salt-master PID."
MASTERPID=$(pgrep -f '/opt/saltstack/salt/bin/python3.10 /usr/bin/salt-master MainProcess') MASTERPID=$(pgrep -f '/opt/saltstack/salt/bin/python3.10 /usr/bin/salt-master MainProcess')
if [ ! -z "$MASTERPID" ]; then
echo "Found salt-master PID $MASTERPID" echo "Found salt-master PID $MASTERPID"
systemctl_func "stop" "salt-master" systemctl_func "stop" "salt-master"
if ps -p "$MASTERPID" > /dev/null 2>&1; then
timeout 30 tail --pid=$MASTERPID -f /dev/null || echo "salt-master still running at $(date +"%T.%6N") after waiting 30s. We cannot kill due to systemd restart option." timeout 30 tail --pid=$MASTERPID -f /dev/null || echo "salt-master still running at $(date +"%T.%6N") after waiting 30s. We cannot kill due to systemd restart option."
fi
else
echo "The salt-master PID was not found. The process '/usr/bin/salt-master MainProcess' is not running."
fi
set -e set -e
} }
@@ -837,8 +843,10 @@ determine_elastic_agent_upgrade() {
if [[ $is_airgap -eq 0 ]]; then if [[ $is_airgap -eq 0 ]]; then
update_elastic_agent_airgap update_elastic_agent_airgap
else else
set +e
# the new elasticsearch defaults.yaml file is not yet placed in /opt/so/saltstack/default/salt/elasticsearch yet # the new elasticsearch defaults.yaml file is not yet placed in /opt/so/saltstack/default/salt/elasticsearch yet
update_elastic_agent "$UPDATE_DIR" update_elastic_agent "$UPDATE_DIR"
set -e
fi fi
} }