diff --git a/salt/telegraf/etc/telegraf.conf b/salt/telegraf/etc/telegraf.conf index c9cbe70e5..0c3957a89 100644 --- a/salt/telegraf/etc/telegraf.conf +++ b/salt/telegraf/etc/telegraf.conf @@ -239,19 +239,6 @@ password = "{{ salt['pillar.get']('elasticsearch:auth:users:so_logstash_user:pass') }}" {%- endif %} -{# if grains.role in ['so-eval','so-standalone','so-manager', 'so-managersearch', 'so-heavynode', 'so-receiver'] -%} -[[inputs.redis]] - servers = ["tcp://localhost:6379"] -{%- endif #} - -{%- if grains.role in ['so-searchnode', 'so-sensor', 'so-eval', 'so-manager', 'so-standalone', 'so-managersearch', 'so-heavynode'] %} -[[inputs.beat]] - url = "http://127.0.0.1:5066" - include = ["filebeat", "libbeat"] - username = "{{ salt['pillar.get']('elasticsearch:auth:users:so_beats_user:user') }}" - password = "{{ salt['pillar.get']('elasticsearch:auth:users:so_beats_user:pass') }}" -{%- endif %} - # # Read metrics from one or more commands that can output to stdout [[inputs.exec]] commands = [