From 313260a0c567fee01cb7b87d3b6e9e673d175340 Mon Sep 17 00:00:00 2001 From: Josh Patterson Date: Wed, 7 Jul 2021 14:22:45 -0400 Subject: [PATCH 1/7] add heavy action in soup for ssl redis, es, ls, fb --- 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 cb560b0d7..2c09f681d 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -352,6 +352,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.60-HEAVYNODE_SSL_LOGSTASH_REDIS_PIPELINES true } @@ -378,6 +379,10 @@ post_2.3.5X_to_2.3.60() { POSTVERSION=2.3.60 } +post_2.3.60_to_2.3.60-HEAVYNODE_SSL_LOGSTASH_REDIS_PIPELINES() { + salt G@role:so-heavynode -b 5% cmd.run 'salt-call state.apply ssl queue=True && so-redis-restart && so-elasticsearch-restart && so-filebeat-restart && so-logstash-restart' +} + rc1_to_rc2() { # Move the static file to global.sls From cfc5c2aef6797039615b853dc4f424d73fd074f8 Mon Sep 17 00:00:00 2001 From: Josh Patterson Date: Wed, 7 Jul 2021 14:32:57 -0400 Subject: [PATCH 2/7] do ; instead of && --- 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 2c09f681d..cef0b834c 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -380,7 +380,7 @@ post_2.3.5X_to_2.3.60() { } post_2.3.60_to_2.3.60-HEAVYNODE_SSL_LOGSTASH_REDIS_PIPELINES() { - salt G@role:so-heavynode -b 5% cmd.run 'salt-call state.apply ssl queue=True && so-redis-restart && so-elasticsearch-restart && so-filebeat-restart && so-logstash-restart' + salt G@role:so-heavynode -b 5% cmd.run 'salt-call state.apply ssl queue=True ; so-redis-restart ; so-elasticsearch-restart ; so-filebeat-restart ; so-logstash-restart' } rc1_to_rc2() { From a3c58d8445f43e56c814b84ce7ccf5008d8943ae Mon Sep 17 00:00:00 2001 From: Josh Patterson Date: Wed, 7 Jul 2021 14:42:38 -0400 Subject: [PATCH 3/7] remove heavy soup --- salt/common/tools/sbin/soup | 5 ----- 1 file changed, 5 deletions(-) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index cef0b834c..bc95c5428 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -352,8 +352,6 @@ 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.60-HEAVYNODE_SSL_LOGSTASH_REDIS_PIPELINES - true } @@ -379,9 +377,6 @@ post_2.3.5X_to_2.3.60() { POSTVERSION=2.3.60 } -post_2.3.60_to_2.3.60-HEAVYNODE_SSL_LOGSTASH_REDIS_PIPELINES() { - salt G@role:so-heavynode -b 5% cmd.run 'salt-call state.apply ssl queue=True ; so-redis-restart ; so-elasticsearch-restart ; so-filebeat-restart ; so-logstash-restart' -} rc1_to_rc2() { From c1d7d8c55a94c55deecd3c1fb60e6a05ff778e6d Mon Sep 17 00:00:00 2001 From: Josh Patterson Date: Wed, 7 Jul 2021 14:43:20 -0400 Subject: [PATCH 4/7] add new line --- 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 bc95c5428..5ed312b8f 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -378,6 +378,7 @@ post_2.3.5X_to_2.3.60() { } + rc1_to_rc2() { # Move the static file to global.sls From ea2a748dba663a5de5b389f40f17b5cfc54d7d7b Mon Sep 17 00:00:00 2001 From: Josh Patterson Date: Wed, 7 Jul 2021 14:44:44 -0400 Subject: [PATCH 5/7] whitespace --- salt/common/tools/sbin/soup | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 5ed312b8f..510ff2c2e 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -352,6 +352,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 + true } @@ -377,8 +378,6 @@ post_2.3.5X_to_2.3.60() { POSTVERSION=2.3.60 } - - rc1_to_rc2() { # Move the static file to global.sls From c32b5b54298cf21d71c57c1833938ed60d0360c4 Mon Sep 17 00:00:00 2001 From: Josh Patterson Date: Wed, 7 Jul 2021 14:47:16 -0400 Subject: [PATCH 6/7] whitespace --- salt/common/tools/sbin/soup | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 510ff2c2e..cb92a3ec3 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -352,10 +352,10 @@ 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 - true } + post_rc1_to_2.3.21() { salt-call state.apply playbook.OLD_db_init rm -f /opt/so/rules/elastalert/playbook/*.yaml @@ -378,6 +378,7 @@ post_2.3.5X_to_2.3.60() { POSTVERSION=2.3.60 } + rc1_to_rc2() { # Move the static file to global.sls From 12b7fd3ab49d1945ee13bddb262f0c9db9ca6501 Mon Sep 17 00:00:00 2001 From: Josh Patterson Date: Wed, 7 Jul 2021 14:48:07 -0400 Subject: [PATCH 7/7] whitespace --- salt/common/tools/sbin/soup | 1 - 1 file changed, 1 deletion(-) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index cb92a3ec3..bc95c5428 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -355,7 +355,6 @@ postupgrade_changes() { true } - post_rc1_to_2.3.21() { salt-call state.apply playbook.OLD_db_init rm -f /opt/so/rules/elastalert/playbook/*.yaml