From 30fc74ac09c1631687f17870a9f135388abcaf6f Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Tue, 21 Mar 2023 12:53:35 -0400 Subject: [PATCH 1/2] Update so-minion --- salt/common/tools/sbin/so-minion | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/salt/common/tools/sbin/so-minion b/salt/common/tools/sbin/so-minion index d14955e61..f7efb56db 100755 --- a/salt/common/tools/sbin/so-minion +++ b/salt/common/tools/sbin/so-minion @@ -206,6 +206,9 @@ function add_sensor_to_minion() { echo " enabled: True" >> $PILLARFILE } +function apply_ES_state() { + salt-call state.apply elasticsearch --queue=True +} function createEVAL() { add_elastic_to_minion add_logstash_to_minion @@ -245,6 +248,7 @@ function createSENSOR() { function createSEARCHNODE() { add_elastic_to_minion add_logstash_to_minion + applyElasticState } function createSTANDALONE() { @@ -297,4 +301,4 @@ fi if [[ "$OPERATION" = 'test' ]]; then testminion -fi \ No newline at end of file +fi From aeb6d47637b016359f1fbe2963d74146a97ec210 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Tue, 21 Mar 2023 13:39:24 -0400 Subject: [PATCH 2/2] Update so-minion --- salt/common/tools/sbin/so-minion | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/salt/common/tools/sbin/so-minion b/salt/common/tools/sbin/so-minion index f7efb56db..ea605bc09 100755 --- a/salt/common/tools/sbin/so-minion +++ b/salt/common/tools/sbin/so-minion @@ -206,8 +206,11 @@ function add_sensor_to_minion() { echo " enabled: True" >> $PILLARFILE } +function updateMine() { + salt "$MINION_ID" mine.send network.ip_addrs interface="$MNIC" +} function apply_ES_state() { - salt-call state.apply elasticsearch --queue=True + salt-call state.apply elasticsearch concurrent=True } function createEVAL() { add_elastic_to_minion @@ -248,7 +251,8 @@ function createSENSOR() { function createSEARCHNODE() { add_elastic_to_minion add_logstash_to_minion - applyElasticState + updateMine + apply_ES_state } function createSTANDALONE() {