From 2cec72b970bd83e8e65268c83acce270df9b9e3a Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Fri, 18 May 2018 13:44:23 -0400 Subject: [PATCH] Logstash Module - Saltify some inputs --- salt/logstash/conf/conf.enabled.txt.parser | 1 + salt/logstash/files/dynamic/9999_output_redis.conf | 7 ++++++- salt/top.sls | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/salt/logstash/conf/conf.enabled.txt.parser b/salt/logstash/conf/conf.enabled.txt.parser index 4534d8cbf..d71f4d651 100644 --- a/salt/logstash/conf/conf.enabled.txt.parser +++ b/salt/logstash/conf/conf.enabled.txt.parser @@ -7,6 +7,7 @@ # /usr/share/logstash/pipeline.custom/1234_input_custom.conf ## # All of the defaults are loaded. +/usr/share/logstash/pipeline.dynamic/0900_input_redis.conf /usr/share/logstash/pipeline.so/1000_preprocess_log_elapsed.conf /usr/share/logstash/pipeline.so/1001_preprocess_syslogng.conf /usr/share/logstash/pipeline.so/1002_preprocess_json.conf diff --git a/salt/logstash/files/dynamic/9999_output_redis.conf b/salt/logstash/files/dynamic/9999_output_redis.conf index 9ce774c01..051a86ea9 100644 --- a/salt/logstash/files/dynamic/9999_output_redis.conf +++ b/salt/logstash/files/dynamic/9999_output_redis.conf @@ -1,8 +1,13 @@ +{%- set nodetype = salt['pillar_get']('node:node_type', 'storage') %} output { redis { host => 'so-redis' data_type => 'list' - key => 'logstash:redis' + {%- if nodetype == 'parser' %} + key => 'logstash:parsed' + {%- else %} + key => 'logstash:unparsed' + {%- endif %) congestion_interval => 1 congestion_threshold => 50000000 # batch_events => 500 diff --git a/salt/top.sls b/salt/top.sls index 7a734d97d..a4cfc201c 100644 --- a/salt/top.sls +++ b/salt/top.sls @@ -23,7 +23,7 @@ base: - logstash 'G@role:so-node': - {% if nodetype == 'parsing' %} + {%- if nodetype == 'parsing' %} - common - logstash {% elsif nodetype == 'hot' %}