diff --git a/salt/logstash/pipelines/config/so/0899_input_minio.conf.jinja b/salt/logstash/pipelines/config/so/0899_input_minio.conf.jinja index 36a81b537..59e457115 100644 --- a/salt/logstash/pipelines/config/so/0899_input_minio.conf.jinja +++ b/salt/logstash/pipelines/config/so/0899_input_minio.conf.jinja @@ -6,6 +6,7 @@ {%- set THREADS = salt['pillar.get']('logstash_settings:ls_input_threads', '') %} {%- set access_key = salt['pillar.get']('minio:access_key', '') %} {%- set access_secret = salt['pillar.get']('minio:access_secret', '') %} +{%- set INTERVAL = salt['pillar.get']('s3_settings:interval', 5) %} input { s3 { access_key_id => "{{ access_key }}" @@ -13,7 +14,7 @@ input { endpoint => "https://{{ MANAGER }}:9595" bucket => "logstash" delete => true - interval => 5 + interval => {{ INTERVAL }} codec => json additional_settings => { "force_path_style" => true 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 08c81cee9..37f829ec0 100644 --- a/salt/logstash/pipelines/config/so/9998_output_minio.conf.jinja +++ b/salt/logstash/pipelines/config/so/9998_output_minio.conf.jinja @@ -1,16 +1,19 @@ {%- set MANAGER = salt['grains.get']('master') %} {%- set access_key = salt['pillar.get']('minio:access_key', '') %} {%- 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 ENCODING = salt['pillar.get']('s3_settings:encoding', 'gzip') %} output { s3 { access_key_id => "{{ access_key }}" secret_access_key => "{{ access_secret}}" endpoint => "https://{{ MANAGER }}:9595" bucket => "logstash" - size_file => 2048 - time_file => 1 + size_file => {{ SIZE_FILE }} + time_file => {{ TIME_FILE }} codec => json - encoding => gzip + encoding => {{ ENCODING }} temporary_directory => "/usr/share/logstash/data/tmp" additional_settings => { "force_path_style" => true diff --git a/setup/so-functions b/setup/so-functions index de14447e4..fdf667d76 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1121,7 +1121,12 @@ manager_global() { " delete: 45"\ "minio:"\ " access_key: $ACCESS_KEY"\ - " access_secret: $ACCESS_SECRET" > "$global_pillar" + " access_secret: $ACCESS_SECRET"\ + "s3_settings:"\ + " size_file: 2048"\ + " time_file: 1"\ + " encoding: gzip"\ + " interval: 5" > "$global_pillar" printf '%s\n' '----' >> "$setup_log" 2>&1 cat "$global_pillar" >> "$setup_log" 2>&1