Add tuneable to the global pillar

This commit is contained in:
Mike Reeves
2020-08-05 22:47:12 -04:00
parent d9b1127308
commit 4e40615e51
3 changed files with 14 additions and 5 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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