From 9137454a25bd1688d555093ce0ef275e27352437 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 10 Nov 2021 16:08:07 -0500 Subject: [PATCH 1/4] Add soup placeholders --- salt/common/tools/sbin/soup | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 98c641b6d..706122a54 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -387,6 +387,7 @@ preupgrade_changes() { [[ "$INSTALLEDVERSION" == 2.3.20 || "$INSTALLEDVERSION" == 2.3.21 ]] && up_2.3.2X_to_2.3.30 [[ "$INSTALLEDVERSION" == 2.3.30 || "$INSTALLEDVERSION" == 2.3.40 ]] && up_2.3.3X_to_2.3.50 [[ "$INSTALLEDVERSION" == 2.3.50 || "$INSTALLEDVERSION" == 2.3.51 || "$INSTALLEDVERSION" == 2.3.52 || "$INSTALLEDVERSION" == 2.3.60 || "$INSTALLEDVERSION" == 2.3.61 || "$INSTALLEDVERSION" == 2.3.70 ]] && up_2.3.5X_to_2.3.80 + [[ "$INSTALLEDVERSION" == 2.3.70 ]] && up_2.3.80_to_2.3.90 true } @@ -664,6 +665,10 @@ up_2.3.5X_to_2.3.80() { INSTALLEDVERSION=2.3.80 } +up_2.3.80_to_2.3.90() { + # Fix Zeek so that it a bool vs a string + +} verify_upgradespace() { CURRENTSPACE=$(df -BG / | grep -v Avail | awk '{print $4}' | sed 's/.$//') if [ "$CURRENTSPACE" -lt "10" ]; then From ba553d971c3b69a3b0fa7ce7b5492ec79b3179c4 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 10 Nov 2021 16:31:44 -0500 Subject: [PATCH 2/4] Add soup to 2.3.90 --- salt/common/tools/sbin/soup | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 706122a54..ac01f4ffa 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -399,6 +399,7 @@ postupgrade_changes() { [[ "$POSTVERSION" == 2.3.20 || "$POSTVERSION" == 2.3.21 ]] && post_2.3.2X_to_2.3.30 [[ "$POSTVERSION" == 2.3.30 ]] && post_2.3.30_to_2.3.40 [[ "$POSTVERSION" == 2.3.50 ]] && post_2.3.5X_to_2.3.60 + [[ "$POSTVERSION" == 2.3.60 ]] && post_2.3.60_to_2.3.90 true } @@ -424,6 +425,16 @@ post_2.3.5X_to_2.3.60() { POSTVERSION=2.3.60 } +post_2.3.60_to_2.3.90() { + # Do Kibana dashboard things + salt-call state.apply kibana.so_savedobjects_defaults queue=True + + # Create Endgame Hostgroup + so-firewall addhostgroup endgame + + POSTVERSION=2.3.90 +} + rc1_to_rc2() { @@ -666,9 +677,11 @@ up_2.3.5X_to_2.3.80() { } up_2.3.80_to_2.3.90() { - # Fix Zeek so that it a bool vs a string - + + INSTALLEDVERSION=2.3.90 + } + verify_upgradespace() { CURRENTSPACE=$(df -BG / | grep -v Avail | awk '{print $4}' | sed 's/.$//') if [ "$CURRENTSPACE" -lt "10" ]; then From 8168f19b3107228dacb562008715b900df9dfd63 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 10 Nov 2021 16:37:54 -0500 Subject: [PATCH 3/4] Add soup to 2.3.90 --- salt/common/tools/sbin/soup | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index ac01f4ffa..5e63fadcb 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -387,7 +387,7 @@ preupgrade_changes() { [[ "$INSTALLEDVERSION" == 2.3.20 || "$INSTALLEDVERSION" == 2.3.21 ]] && up_2.3.2X_to_2.3.30 [[ "$INSTALLEDVERSION" == 2.3.30 || "$INSTALLEDVERSION" == 2.3.40 ]] && up_2.3.3X_to_2.3.50 [[ "$INSTALLEDVERSION" == 2.3.50 || "$INSTALLEDVERSION" == 2.3.51 || "$INSTALLEDVERSION" == 2.3.52 || "$INSTALLEDVERSION" == 2.3.60 || "$INSTALLEDVERSION" == 2.3.61 || "$INSTALLEDVERSION" == 2.3.70 ]] && up_2.3.5X_to_2.3.80 - [[ "$INSTALLEDVERSION" == 2.3.70 ]] && up_2.3.80_to_2.3.90 + [[ "$INSTALLEDVERSION" == 2.3.70 || "$INSTALLEDVERSION" == 2.3.80 ]] && up_2.3.80_to_2.3.90 true } @@ -398,8 +398,8 @@ postupgrade_changes() { [[ "$POSTVERSION" =~ rc.1 ]] && post_rc1_to_rc2 [[ "$POSTVERSION" == 2.3.20 || "$POSTVERSION" == 2.3.21 ]] && post_2.3.2X_to_2.3.30 [[ "$POSTVERSION" == 2.3.30 ]] && post_2.3.30_to_2.3.40 - [[ "$POSTVERSION" == 2.3.50 ]] && post_2.3.5X_to_2.3.60 - [[ "$POSTVERSION" == 2.3.60 ]] && post_2.3.60_to_2.3.90 + [[ "$POSTVERSION" == 2.3.50 || "$POSTVERSION" == 2.3.51 || "$POSTVERSION" == 2.3.52 ]] && post_2.3.5X_to_2.3.60 + [[ "$POSTVERSION" == 2.3.60 || "$POSTVERSION" == 2.3.70 || "$POSTVERSION" == 2.3.80 ]] && post_2.3.60_to_2.3.90 true } From fcf889be2fd91199bfb9d32f0611493297cc41e6 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 10 Nov 2021 16:46:24 -0500 Subject: [PATCH 4/4] Add soup to 2.3.90 --- salt/common/tools/sbin/soup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 5e63fadcb..e267ab55a 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -387,7 +387,7 @@ preupgrade_changes() { [[ "$INSTALLEDVERSION" == 2.3.20 || "$INSTALLEDVERSION" == 2.3.21 ]] && up_2.3.2X_to_2.3.30 [[ "$INSTALLEDVERSION" == 2.3.30 || "$INSTALLEDVERSION" == 2.3.40 ]] && up_2.3.3X_to_2.3.50 [[ "$INSTALLEDVERSION" == 2.3.50 || "$INSTALLEDVERSION" == 2.3.51 || "$INSTALLEDVERSION" == 2.3.52 || "$INSTALLEDVERSION" == 2.3.60 || "$INSTALLEDVERSION" == 2.3.61 || "$INSTALLEDVERSION" == 2.3.70 ]] && up_2.3.5X_to_2.3.80 - [[ "$INSTALLEDVERSION" == 2.3.70 || "$INSTALLEDVERSION" == 2.3.80 ]] && up_2.3.80_to_2.3.90 + [[ "$INSTALLEDVERSION" == 2.3.80 ]] && up_2.3.80_to_2.3.90 true }