diff --git a/salt/telegraf/etc/telegraf.conf b/salt/telegraf/etc/telegraf.conf
index 42a8d43bf..1e8d9d3fe 100644
--- a/salt/telegraf/etc/telegraf.conf
+++ b/salt/telegraf/etc/telegraf.conf
@@ -259,6 +259,23 @@
   field_prefix = "$1."
   tag_keys     = ["topic"]
 
+[[inputs.jolokia2_agent.metric]]
+  name         = "controller"
+  mbean        = "kafka.controller:name=*,type=*"
+  field_prefix = "$1."
+
+[[inputs.jolokia2_agent.metric]]
+  name       = "partition"
+  mbean      = "kafka.log:name=*,partition=*,topic=*,type=Log"
+  field_name = "$1"
+  tag_keys   = ["topic", "partition"]
+
+[[inputs.jolokia2_agent.metric]]
+  name       = "partition"
+  mbean      = "kafka.cluster:name=UnderReplicated,partition=*,topic=*,type=Partition"
+  field_name = "UnderReplicatedPartitions"
+  tag_keys   = ["topic", "partition"]
+
 {%- endif %}
 # # Read metrics from one or more commands that can output to stdout
 {%- if 'sostatus.sh' in TELEGRAFMERGED.scripts[GLOBALS.role.split('-')[1]] %}