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 #7794 from Security-Onion-Solutions/soup_salt_influx

Browse Source 
remove influxdb module patched state files when salt is upgraded
This commit is contained in:
Josh Patterson
2022-04-14 16:08:10 -04:00
committed by GitHub
parent 2d094a3bfc 02c19da3c4
commit be2573bb7d
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -744,9 +744,6 @@ up_to_2.3.90() {
up_to_2.3.100() { up_to_2.3.100() {
fix_wazuh fix_wazuh
echo "Removing /opt/so/state files for patched Salt InfluxDB module and state. This is due to Salt being upgraded and needing to patch the files again."
rm -vrf /opt/so/state/influxdb_continuous_query.py.patched /opt/so/state/influxdb_retention_policy.py.patched /opt/so/state/influxdbmod.py.patched
echo "Adding receiver hostgroup with so-firewall" echo "Adding receiver hostgroup with so-firewall"
if so-firewall addhostgroup receiver 2>&1 | grep -q 'Already exists'; then if so-firewall addhostgroup receiver 2>&1 | grep -q 'Already exists'; then
echo 'receiver hostgroup already exists' echo 'receiver hostgroup already exists'
@@ -906,6 +903,8 @@ upgrade_salt() {
else else
echo "Salt upgrade success." echo "Salt upgrade success."
echo "" echo ""
echo "Removing /opt/so/state files for patched Salt InfluxDB module and state. This is due to Salt being upgraded and needing to patch the files again."
rm -vrf /opt/so/state/influxdb_continuous_query.py.patched /opt/so/state/influxdb_retention_policy.py.patched /opt/so/state/influxdbmod.py.patched
fi fi
} }