diff --git a/salt/telegraf/etc/telegraf.conf b/salt/telegraf/etc/telegraf.conf
index f5d331209..e3a286fe4 100644
--- a/salt/telegraf/etc/telegraf.conf
+++ b/salt/telegraf/etc/telegraf.conf
@@ -241,18 +241,28 @@
 #   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
 
-{% if grains.role in ['so-searchnode','so-standalone','so-manager', 'so-managersearch', 'so-heavynode', 'so-receiver'] -%}
+{%- if GLOBALS.pipeline == "KAFKA" %}
+{%-   if grains.role in ['so-searchnode','so-standalone', 'so-managersearch', 'so-heavynode'] -%}
 [[inputs.logstash]]
   url = "http://localhost:9600"
   collect = ["pipelines"]
   username = "{{ salt['pillar.get']('elasticsearch:auth:users:so_logstash_user:user') }}"
   password = "{{ salt['pillar.get']('elasticsearch:auth:users:so_logstash_user:pass') }}"
+{%-   endif %}
+{%- else %}
+{%-   if grains.role in ['so-searchnode','so-standalone','so-manager', 'so-managersearch', 'so-heavynode', 'so-receiver'] -%}
+[[inputs.logstash]]
+  url = "http://localhost:9600"
+  collect = ["pipelines"]
+  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-manager','so-managersearch','so-standalone','so-receiver'] and GLOBALS.pipeline == "KAFKA" -%}
 [[inputs.jolokia2_agent]]
   name_prefix= "kafka_"
-  urls = ["http://localhost:8778/jolokia"]
+  urls = ["http://{{ NODEIP }}:8778/jolokia"]
 
 [[inputs.jolokia2_agent.metric]]
   name         = "topics"