From 970ee195a1e274de7b74cbe0c44a9736a6e0c527 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Tue, 4 Aug 2020 23:08:33 -0400 Subject: [PATCH] use hostname so TLS will work --- salt/logstash/pipelines/config/so/0899_input_minio.conf.jinja | 4 ++-- .../logstash/pipelines/config/so/9998_output_minio.conf.jinja | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 7358cf6e3..27b287532 100644 --- a/salt/logstash/pipelines/config/so/0899_input_minio.conf.jinja +++ b/salt/logstash/pipelines/config/so/0899_input_minio.conf.jinja @@ -1,7 +1,7 @@ {%- if grains.role == 'so-heavynode' %} -{%- set MANAGER = salt['pillar.get']('elasticsearch:mainip', '') %} +{%- set MANAGER = salt['grains.get']('host') %} {%- else %} -{%- set MANAGER = salt['pillar.get']('global:managerip', '') %} +{%- set MANAGER = salt['grains.get']('master') %} {% endif -%} {%- set THREADS = salt['pillar.get']('logstash_settings:ls_input_threads', '') %} {%- set access_key = salt['pillar.get']('minio:access_key', '') %} 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 4092b6edd..34a044f34 100644 --- a/salt/logstash/pipelines/config/so/9998_output_minio.conf.jinja +++ b/salt/logstash/pipelines/config/so/9998_output_minio.conf.jinja @@ -1,4 +1,4 @@ -{%- set MANAGER = salt['pillar.get']('global:managerip', '') -%} +{%- set MANAGER = salt['grains.get']('master') %} {%- set access_key = salt['pillar.get']('minio:access_key', '') %} {%- set access_secret = salt['pillar.get']('minio:access_secret', '') %} output {