From f154d2fa78c49b2fd52e8478dbb4613c3ff83d4c Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Sat, 8 Aug 2020 20:04:19 -0400 Subject: [PATCH] Upodate SSL --- .../pipelines/config/so/0900_input_redis.conf.jinja | 8 +++----- .../pipelines/config/so/9999_output_redis.conf.jinja | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/salt/logstash/pipelines/config/so/0900_input_redis.conf.jinja b/salt/logstash/pipelines/config/so/0900_input_redis.conf.jinja index 6e736f22f..b2b4dc864 100644 --- a/salt/logstash/pipelines/config/so/0900_input_redis.conf.jinja +++ b/salt/logstash/pipelines/config/so/0900_input_redis.conf.jinja @@ -1,13 +1,11 @@ -{%- if grains.role == 'so-heavynode' %} -{%- set MANAGER = salt['pillar.get']('elasticsearch:mainip', '') %} -{%- else %} -{%- set MANAGER = salt['pillar.get']('global:managerip', '') %} -{% endif -%} +{%- set MANAGER = salt['grains.get']('master') %} {%- set THREADS = salt['pillar.get']('logstash_settings:ls_input_threads', '') %} input { redis { host => '{{ MANAGER }}' + port => 6380 + ssl => true data_type => 'list' key => 'logstash:unparsed' type => 'redis-input' diff --git a/salt/logstash/pipelines/config/so/9999_output_redis.conf.jinja b/salt/logstash/pipelines/config/so/9999_output_redis.conf.jinja index 25620e501..4b38a684d 100644 --- a/salt/logstash/pipelines/config/so/9999_output_redis.conf.jinja +++ b/salt/logstash/pipelines/config/so/9999_output_redis.conf.jinja @@ -1,4 +1,4 @@ -{% set MANAGER = salt['pillar.get']('global:managerip', '') %} +{%- set MANAGER = salt['grains.get']('master') %} {% set BATCH = salt['pillar.get']('logstash_settings:ls_pipeline_batch_size', 125) %} output { redis {