From 22c0323bdae337f5cb4431ff6a1f54a0ddcc9f81 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 13 Sep 2023 10:57:45 -0400 Subject: [PATCH 1/2] Update so-minion --- salt/manager/tools/sbin/so-minion | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/salt/manager/tools/sbin/so-minion b/salt/manager/tools/sbin/so-minion index 0756329855..01a58585f0 100755 --- a/salt/manager/tools/sbin/so-minion +++ b/salt/manager/tools/sbin/so-minion @@ -239,6 +239,10 @@ function add_sensor_to_minion() { echo " threads: '$CORECOUNT'" >> $PILLARFILE echo "pcap:" >> $PILLARFILE echo " enabled: True" >> $PILLARFILE + if [[ $is_pcaplimit ]]; then + echo " config:" >> $PILLARFILE + echo " diskfreepercentage: 40" >> $PILLARFILE + fi echo " " >> $PILLARFILE } @@ -409,6 +413,7 @@ function apply_ES_state() { salt-call state.apply elasticsearch concurrent=True } function createEVAL() { + is_pcaplimit=true add_elasticsearch_to_minion add_sensor_to_minion add_strelka_to_minion @@ -429,6 +434,7 @@ function createEVAL() { } function createSTANDALONE() { + is_pcaplimit=true add_elasticsearch_to_minion add_logstash_to_minion add_sensor_to_minion @@ -520,8 +526,9 @@ function createIDH() { } function createHEAVYNODE() { + is_pcaplimit=true add_elasticsearch_to_minion - add_elastic_agent_to_minion + add_elastic_agent_to_minion add_logstash_to_minion add_sensor_to_minion add_strelka_to_minion From 33d68478b6678e6707061b4f8e2755f2b705b0a6 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 13 Sep 2023 11:48:16 -0400 Subject: [PATCH 2/2] Update so-minion --- salt/manager/tools/sbin/so-minion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/manager/tools/sbin/so-minion b/salt/manager/tools/sbin/so-minion index 01a58585f0..64084dbd07 100755 --- a/salt/manager/tools/sbin/so-minion +++ b/salt/manager/tools/sbin/so-minion @@ -241,7 +241,7 @@ function add_sensor_to_minion() { echo " enabled: True" >> $PILLARFILE if [[ $is_pcaplimit ]]; then echo " config:" >> $PILLARFILE - echo " diskfreepercentage: 40" >> $PILLARFILE + echo " diskfreepercentage: 60" >> $PILLARFILE fi echo " " >> $PILLARFILE }