From 63e31bd6b9e875eb202c393c238b015aa7d18ee7 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 6 Aug 2020 15:33:48 -0400 Subject: [PATCH 1/3] Add upload queue thread --- setup/so-functions | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup/so-functions b/setup/so-functions index 002ed8d81..b3dc5b060 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -27,7 +27,7 @@ accept_salt_key_remote() { echo "Accept the key remotely on the manager" >> "$setup_log" 2>&1 # Delete the key just in case. ssh -i /root/.ssh/so.key soremote@"$MSRV" sudo salt-key -d "$MINION_ID" -y - salt-call state.apply ca >> /dev/null 2>&1 + salt-call state.apply ca ssh -i /root/.ssh/so.key soremote@"$MSRV" sudo salt-key -a "$MINION_ID" -y } @@ -1126,6 +1126,7 @@ manager_global() { "s3_settings:"\ " size_file: 2048"\ " time_file: 1"\ + " upload_queue_size: 4" " encoding: gzip"\ " interval: 5" > "$global_pillar" From 16d0c02113162aa8244738d58d79722a3bbe5094 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 6 Aug 2020 15:39:02 -0400 Subject: [PATCH 2/3] Fix cert dev null --- setup/so-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/so-functions b/setup/so-functions index b3dc5b060..d4218a10c 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -27,7 +27,7 @@ accept_salt_key_remote() { echo "Accept the key remotely on the manager" >> "$setup_log" 2>&1 # Delete the key just in case. ssh -i /root/.ssh/so.key soremote@"$MSRV" sudo salt-key -d "$MINION_ID" -y - salt-call state.apply ca + salt-call state.apply ca >> /dev/null 2>&1 ssh -i /root/.ssh/so.key soremote@"$MSRV" sudo salt-key -a "$MINION_ID" -y } From bbdaee28ed56cc813f44eec5a91382f025869cea Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 6 Aug 2020 15:41:10 -0400 Subject: [PATCH 3/3] Add upload queue thread --- salt/logstash/pipelines/config/so/9998_output_minio.conf.jinja | 2 ++ 1 file changed, 2 insertions(+) diff --git a/salt/logstash/pipelines/config/so/9998_output_minio.conf.jinja b/salt/logstash/pipelines/config/so/9998_output_minio.conf.jinja index 37f829ec0..e953c3521 100644 --- a/salt/logstash/pipelines/config/so/9998_output_minio.conf.jinja +++ b/salt/logstash/pipelines/config/so/9998_output_minio.conf.jinja @@ -3,6 +3,7 @@ {%- set access_secret = salt['pillar.get']('minio:access_secret', '') %} {%- set SIZE_FILE = salt['pillar.get']('s3_settings:size_file', 2048) %} {%- set TIME_FILE = salt['pillar.get']('s3_settings:time_file', 1) %} +{%- set UPLOAD_QUEUE_SIZE = salt['pillar.get']('s3_settings:upload_queue_size', 4) %} {%- set ENCODING = salt['pillar.get']('s3_settings:encoding', 'gzip') %} output { s3 { @@ -14,6 +15,7 @@ output { time_file => {{ TIME_FILE }} codec => json encoding => {{ ENCODING }} + upload_queue_size => {{ UPLOAD_QUEUE_SIZE }} temporary_directory => "/usr/share/logstash/data/tmp" additional_settings => { "force_path_style" => true