From adffb1180045d483df72dfb989ef05ae6ded41cc Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 20 Oct 2021 15:39:21 -0400 Subject: [PATCH] fix redis port --- salt/telegraf/etc/telegraf.conf | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/salt/telegraf/etc/telegraf.conf b/salt/telegraf/etc/telegraf.conf index b92ba9f33..59d806fe0 100644 --- a/salt/telegraf/etc/telegraf.conf +++ b/salt/telegraf/etc/telegraf.conf @@ -639,21 +639,6 @@ insecure_skip_verify = true {% endif %} -{% if grains.role in ['so-node','so-standalone','so-manager', 'so-managersearch', 'so-heavynode'] -%} -[[inputs.logstash]] - url = "http://localhost:9600" - collect = ["pipelines"] - {% if salt['pillar.get']('elasticsearch:auth:enabled') is sameas true %} - username = "{{ salt['pillar.get']('elasticsearch:auth:users:so_logstash_user:user') }}" - password = "{{ salt['pillar.get']('elasticsearch:auth:users:so_logstash_user:pass') }}" - {% endif %} -{%- endif %} - -{% if grains.role in ['so-eval','so-standalone','so-manager', 'so-managersearch', 'so-heavynode'] -%} -[[inputs.redis]] - servers = ["tcp://localhost:5000"] -{%- endif %} - # # ## Timeout for HTTP requests to the elastic search server(s) # http_timeout = "5s" @@ -688,9 +673,22 @@ # ## Use TLS but skip chain & host verification # # insecure_skip_verify = false +{% if grains.role in ['so-node','so-standalone','so-manager', 'so-managersearch', 'so-heavynode'] -%} +[[inputs.logstash]] + url = "http://localhost:9600" + collect = ["pipelines"] + {%- if salt['pillar.get']('elasticsearch:auth:enabled') is sameas true %} + username = "{{ salt['pillar.get']('elasticsearch:auth:users:so_logstash_user:user') }}" + password = "{{ salt['pillar.get']('elasticsearch:auth:users:so_logstash_user:pass') }}" + {% endif %} +{%- endif %} + +{% if grains.role in ['so-eval','so-standalone','so-manager', 'so-managersearch', 'so-heavynode'] -%} +[[inputs.redis]] + servers = ["tcp://localhost:6379"] +{%- endif %} # # Read metrics from one or more commands that can output to stdout - [[inputs.exec]] commands = [ "/scripts/sostatus.sh"