From c00d33632aa96c3551283ad4c9f7f1a38c7f5dcc Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 6 Jul 2022 16:23:02 -0400 Subject: [PATCH 1/2] Update soup --- salt/common/tools/sbin/soup | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index c4b6308f9..79b2970e7 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -779,10 +779,13 @@ up_to_2.3.100() { echo "Adding receiver to assigned_hostgroups.local.map.yaml" grep -qxF " receiver:" /opt/so/saltstack/local/salt/firewall/assigned_hostgroups.local.map.yaml || sed -i -e '$a\ receiver:' /opt/so/saltstack/local/salt/firewall/assigned_hostgroups.local.map.yaml + + INSTALLEDVERSION=2.3.100 } up_to_2.3.110() { sed -i 's|shards|index_template:\n template:\n settings:\n index:\n number_of_shards|g' /opt/so/saltstack/local/pillar/global.sls + INSTALLEDVERSION=2.3.110 } up_to_2.3.120() { @@ -790,11 +793,13 @@ up_to_2.3.120() { so-thehive-stop so-thehive-es-stop so-cortex-stop + INSTALLEDVERSION=2.3.120 } up_to_2.3.130() { # Remove file for nav update rm -f /opt/so/conf/navigator/layers/nav_layer_playbook.json + INSTALLEDVERSION=2.3.130 } up_to_2.3.140() { @@ -826,6 +831,7 @@ up_to_2.3.140() { # Delete Elastalert indices for i in $(so-elasticsearch-query _cat/indices | grep elastalert | awk '{print $3}'); do so-elasticsearch-query $i -XDELETE; done ## + INSTALLEDVERSION=2.3.140 } verify_upgradespace() { From c819d3a558072c457b1126c8df8312e221132eac Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 6 Jul 2022 16:36:57 -0400 Subject: [PATCH 2/2] Update soup --- salt/common/tools/sbin/soup | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 79b2970e7..ce797e6f7 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -456,6 +456,7 @@ postupgrade_changes() { [[ "$POSTVERSION" == 2.3.100 ]] && post_to_2.3.110 [[ "$POSTVERSION" == 2.3.110 ]] && post_to_2.3.120 [[ "$POSTVERSION" == 2.3.120 ]] && post_to_2.3.130 + [[ "$POSTVERSION" == 2.3.130 ]] && post_to_2.3.140 true @@ -532,6 +533,11 @@ post_to_2.3.130() { POSTVERSION=2.3.130 } +post_to_2.3.140() { + echo "Post Processing for 2.3.140" + POSTVERSION=2.3.140 +} + stop_salt_master() {