diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 98c641b6d..e267ab55a 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.80 ]] && up_2.3.80_to_2.3.90 true } @@ -397,7 +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.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 } @@ -423,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() { @@ -664,6 +676,12 @@ up_2.3.5X_to_2.3.80() { INSTALLEDVERSION=2.3.80 } +up_2.3.80_to_2.3.90() { + + INSTALLEDVERSION=2.3.90 + +} + verify_upgradespace() { CURRENTSPACE=$(df -BG / | grep -v Avail | awk '{print $4}' | sed 's/.$//') if [ "$CURRENTSPACE" -lt "10" ]; then