diff --git a/site-modules/profile/files/kafka/jmx_exporter.yml b/site-modules/profile/files/kafka/jmx_exporter.yml
index b1e75b5c..ab3213e0 100644
--- a/site-modules/profile/files/kafka/jmx_exporter.yml
+++ b/site-modules/profile/files/kafka/jmx_exporter.yml
@@ -1,88 +1,120 @@
 # Fetched from https://github.com/prometheus/jmx_exporter example_configs/kafka-2_0_0.yml
-# at commit 96d8a72e2bc71575b2fed576a9e8b194ffa9777d
+# at commit 8eeb3ea61cc7a6089799c6ce454ff6867f75bc28
 
 lowercaseOutputName: true
 
 rules:
 # Special cases and very specific rules
 - pattern : kafka.server<type=(.+), name=(.+), clientId=(.+), topic=(.+), partition=(.*)><>Value
   name: kafka_server_$1_$2
   type: GAUGE
   labels:
     clientId: "$3"
     topic: "$4"
     partition: "$5"
 - pattern : kafka.server<type=(.+), name=(.+), clientId=(.+), brokerHost=(.+), brokerPort=(.+)><>Value
   name: kafka_server_$1_$2
   type: GAUGE
   labels:
     clientId: "$3"
     broker: "$4:$5"
+- pattern : kafka.coordinator.(\w+)<type=(.+), name=(.+)><>Value
+  name: kafka_coordinator_$1_$2_$3
+  type: GAUGE
 
 # Generic per-second counters with 0-2 key/value pairs
 - pattern: kafka.(\w+)<type=(.+), name=(.+)PerSec\w*, (.+)=(.+), (.+)=(.+)><>Count
   name: kafka_$1_$2_$3_total
   type: COUNTER
   labels:
     "$4": "$5"
     "$6": "$7"
 - pattern: kafka.(\w+)<type=(.+), name=(.+)PerSec\w*, (.+)=(.+)><>Count
   name: kafka_$1_$2_$3_total
   type: COUNTER
   labels:
     "$4": "$5"
 - pattern: kafka.(\w+)<type=(.+), name=(.+)PerSec\w*><>Count
   name: kafka_$1_$2_$3_total
   type: COUNTER
 
+- pattern: kafka.server<type=(.+), client-id=(.+)><>([a-z-]+)
+  name: kafka_server_quota_$3
+  type: GAUGE
+  labels:
+    resource: "$1"
+    clientId: "$2"
+
+- pattern: kafka.server<type=(.+), user=(.+), client-id=(.+)><>([a-z-]+)
+  name: kafka_server_quota_$4
+  type: GAUGE
+  labels:
+    resource: "$1"
+    user: "$2"
+    clientId: "$3"
+
 # Generic gauges with 0-2 key/value pairs
 - pattern: kafka.(\w+)<type=(.+), name=(.+), (.+)=(.+), (.+)=(.+)><>Value
   name: kafka_$1_$2_$3
   type: GAUGE
   labels:
     "$4": "$5"
     "$6": "$7"
 - pattern: kafka.(\w+)<type=(.+), name=(.+), (.+)=(.+)><>Value
   name: kafka_$1_$2_$3
   type: GAUGE
   labels:
     "$4": "$5"
 - pattern: kafka.(\w+)<type=(.+), name=(.+)><>Value
   name: kafka_$1_$2_$3
   type: GAUGE
 
 # Emulate Prometheus 'Summary' metrics for the exported 'Histogram's.
 #
 # Note that these are missing the '_sum' metric!
 - pattern: kafka.(\w+)<type=(.+), name=(.+), (.+)=(.+), (.+)=(.+)><>Count
   name: kafka_$1_$2_$3_count
   type: COUNTER
   labels:
     "$4": "$5"
     "$6": "$7"
 - pattern: kafka.(\w+)<type=(.+), name=(.+), (.+)=(.*), (.+)=(.+)><>(\d+)thPercentile
   name: kafka_$1_$2_$3
   type: GAUGE
   labels:
     "$4": "$5"
     "$6": "$7"
     quantile: "0.$8"
 - pattern: kafka.(\w+)<type=(.+), name=(.+), (.+)=(.+)><>Count
   name: kafka_$1_$2_$3_count
   type: COUNTER
   labels:
     "$4": "$5"
 - pattern: kafka.(\w+)<type=(.+), name=(.+), (.+)=(.*)><>(\d+)thPercentile
   name: kafka_$1_$2_$3
   type: GAUGE
   labels:
     "$4": "$5"
     quantile: "0.$6"
 - pattern: kafka.(\w+)<type=(.+), name=(.+)><>Count
   name: kafka_$1_$2_$3_count
   type: COUNTER
 - pattern: kafka.(\w+)<type=(.+), name=(.+)><>(\d+)thPercentile
   name: kafka_$1_$2_$3
   type: GAUGE
   labels:
     quantile: "0.$4"
+
+# Generic gauges for MeanRate Percent
+# Ex) kafka.server<type=KafkaRequestHandlerPool, name=RequestHandlerAvgIdlePercent><>MeanRate
+- pattern: kafka.(\w+)<type=(.+), name=(.+)Percent\w*><>MeanRate
+  name: kafka_$1_$2_$3_percent
+  type: GAUGE
+- pattern: kafka.(\w+)<type=(.+), name=(.+)Percent\w*><>Value
+  name: kafka_$1_$2_$3_percent
+  type: GAUGE
+- pattern: kafka.(\w+)<type=(.+), name=(.+)Percent\w*, (.+)=(.+)><>Value
+  name: kafka_$1_$2_$3_percent
+  type: GAUGE
+  labels:
+    "$4": "$5"