From a22e4700383fc8b5e400d6fb39537f2e8057f89c Mon Sep 17 00:00:00 2001 From: weslambert Date: Thu, 24 Feb 2022 09:20:44 -0500 Subject: [PATCH 1/5] Add Kibana dashboard updates for 2.3.110 --- 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 b036c4cc6..1d73fbc2a 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -471,6 +471,12 @@ post_to_2.3.100() { salt-call state.apply kibana.so_savedobjects_defaults queue=True } +post_to_2.3.110() { + echo "Post Processing for 2.3.110" + echo "Updating Kibana dashboards" + salt-call state.apply kibana.so_savedobjects_defaults queue=True +} + stop_salt_master() { # kill all salt jobs across the grid because the hang indefinitely if they are queued and salt-master restarts set +e From 7f08ecdcbeb86da66ee442e466c7462ed9e375d2 Mon Sep 17 00:00:00 2001 From: weslambert Date: Thu, 24 Feb 2022 09:25:15 -0500 Subject: [PATCH 2/5] Add function reference for .110 post changes --- salt/common/tools/sbin/soup | 1 + 1 file changed, 1 insertion(+) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 1d73fbc2a..6e31c206f 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -416,6 +416,7 @@ postupgrade_changes() { [[ "$POSTVERSION" == 2.3.40 || "$POSTVERSION" == 2.3.50 || "$POSTVERSION" == 2.3.51 || "$POSTVERSION" == 2.3.52 ]] && post_to_2.3.60 [[ "$POSTVERSION" == 2.3.60 || "$POSTVERSION" == 2.3.61 || "$POSTVERSION" == 2.3.70 || "$POSTVERSION" == 2.3.80 ]] && post_to_2.3.90 [[ "$POSTVERSION" == 2.3.90 || "$POSTVERSION" == 2.3.91 ]] && post_to_2.3.100 + || "$POSTVERSION" == 2.3.100 ]] && post_to_2.3.110 true } From 582bf4c64c1e43e47015aefd525e226a9e42dd3a Mon Sep 17 00:00:00 2001 From: weslambert Date: Thu, 24 Feb 2022 09:25:59 -0500 Subject: [PATCH 3/5] Remove dashboard updates for .100 so we don't run twice --- salt/common/tools/sbin/soup | 6 ------ 1 file changed, 6 deletions(-) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 6e31c206f..964b573af 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -466,12 +466,6 @@ post_to_2.3.90() { POSTVERSION=2.3.90 } -post_to_2.3.100() { - echo "Post Processing for 2.3.100" - echo "Updating Kibana dashboards" - salt-call state.apply kibana.so_savedobjects_defaults queue=True -} - post_to_2.3.110() { echo "Post Processing for 2.3.110" echo "Updating Kibana dashboards" From 45ccfc5ad436482cb590d08f9e03447faebe15dd Mon Sep 17 00:00:00 2001 From: weslambert Date: Thu, 24 Feb 2022 09:35:43 -0500 Subject: [PATCH 4/5] Add back post to .100 and call for .110 --- salt/common/tools/sbin/soup | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 964b573af..d713c5b04 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -416,7 +416,7 @@ postupgrade_changes() { [[ "$POSTVERSION" == 2.3.40 || "$POSTVERSION" == 2.3.50 || "$POSTVERSION" == 2.3.51 || "$POSTVERSION" == 2.3.52 ]] && post_to_2.3.60 [[ "$POSTVERSION" == 2.3.60 || "$POSTVERSION" == 2.3.61 || "$POSTVERSION" == 2.3.70 || "$POSTVERSION" == 2.3.80 ]] && post_to_2.3.90 [[ "$POSTVERSION" == 2.3.90 || "$POSTVERSION" == 2.3.91 ]] && post_to_2.3.100 - || "$POSTVERSION" == 2.3.100 ]] && post_to_2.3.110 + [[ "$POSTVERSION" == 2.3.100 ]] && post_to_2.3.110 true } @@ -466,6 +466,10 @@ post_to_2.3.90() { POSTVERSION=2.3.90 } +post_to_2.3.110() { + echo "Post Processing for 2.3.100" +} + post_to_2.3.110() { echo "Post Processing for 2.3.110" echo "Updating Kibana dashboards" From bc1794e4373e12e207dd6695e29e2aecc311a457 Mon Sep 17 00:00:00 2001 From: weslambert Date: Thu, 24 Feb 2022 09:42:14 -0500 Subject: [PATCH 5/5] Fix function name --- 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 d713c5b04..33649ab63 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -466,7 +466,7 @@ post_to_2.3.90() { POSTVERSION=2.3.90 } -post_to_2.3.110() { +post_to_2.3.100() { echo "Post Processing for 2.3.100" }