diff --git a/templates/default/kafka.yaml.erb b/templates/default/kafka.yaml.erb
index f096e04c..971e2132 100644
--- a/templates/default/kafka.yaml.erb
+++ b/templates/default/kafka.yaml.erb
@@ -31,134 +31,135 @@ init_config:
     # Aggregate cluster stats
     #
     - include:
-      domain: '"kafka.server"'
-      bean: '"kafka.server":type="BrokerTopicMetrics",name="AllTopicsBytesOutPerSec"'
-      attribute:
-        MeanRate:
-          metric_type: counter
-          alias: kafka.net.bytes_out
+        domain: '"kafka.server"'
+        bean: '"kafka.server":type="BrokerTopicMetrics",name="AllTopicsBytesOutPerSec"'
+        attribute:
+          MeanRate:
+            metric_type: counter
+            alias: kafka.net.bytes_out
     - include:
-      domain: '"kafka.server"'
-      bean: '"kafka.server":type="BrokerTopicMetrics",name="AllTopicsBytesInPerSec"'
-      attribute:
-        MeanRate:
-          metric_type: counter
-          alias: kafka.net.bytes_in
+        domain: '"kafka.server"'
+        bean: '"kafka.server":type="BrokerTopicMetrics",name="AllTopicsBytesInPerSec"'
+        attribute:
+          MeanRate:
+            metric_type: counter
+            alias: kafka.net.bytes_in
     - include:
-      domain: '"kafka.server"'
-      bean: '"kafka.server":type="BrokerTopicMetrics",name="AllTopicsMessagesInPerSec"'
-      attribute:
-        MeanRate:
-          metric_type: gauge
-          alias: kafka.messages_in
+        domain: '"kafka.server"'
+        bean: '"kafka.server":type="BrokerTopicMetrics",name="AllTopicsMessagesInPerSec"'
+        attribute:
+          MeanRate:
+            metric_type: gauge
+            alias: kafka.messages_in
 
     #
     # Request timings
     #
     - include:
-      domain: '"kafka.server"'
-      bean: '"kafka.server":type="BrokerTopicMetrics",name="AllTopicsFailedFetchRequestsPerSec"'
-      attribute:
-        MeanRate:
-          metric_type: gauge
-          alias: kafka.request.fetch.failed
+        domain: '"kafka.server"'
+        bean: '"kafka.server":type="BrokerTopicMetrics",name="AllTopicsFailedFetchRequestsPerSec"'
+        attribute:
+          MeanRate:
+            metric_type: gauge
+            alias: kafka.request.fetch.failed
     - include:
-      domain: '"kafka.server"'
-      bean: '"kafka.server":type="BrokerTopicMetrics",name="AllTopicsFailedProduceRequestsPerSec"'
-      attribute:
-        MeanRate:
-          metric_type: gauge
-          alias: kafka.request.produce.failed
+        domain: '"kafka.server"'
+        bean: '"kafka.server":type="BrokerTopicMetrics",name="AllTopicsFailedProduceRequestsPerSec"'
+        attribute:
+          MeanRate:
+            metric_type: gauge
+            alias: kafka.request.produce.failed
     - include:
-      domain: '"kafka.network"'
-      bean: '"kafka.network":type="RequestMetrics",name="Produce-TotalTimeMs"'
-      attribute:
-        Mean:
-          metric_type: counter
-          alias: kafka.request.produce.time.avg
-        99thPercentile:
-          metric_type: counter
-          alias: kafka.request.produce.time.99percentile
+        domain: '"kafka.network"'
+        bean: '"kafka.network":type="RequestMetrics",name="Produce-TotalTimeMs"'
+        attribute:
+          Mean:
+            metric_type: counter
+            alias: kafka.request.produce.time.avg
+          99thPercentile:
+            metric_type: counter
+            alias: kafka.request.produce.time.99percentile
     - include:
-      domain: '"kafka.network"'
-      bean: '"kafka.network":type="RequestMetrics",name="Fetch-TotalTimeMs"'
-      attribute:
-        Mean:
-          metric_type: counter
-          alias: kafka.request.fetch.time.avg
-        99thPercentile:
-          metric_type: counter
-          alias: kafka.request.fetch.time.99percentile
+        domain: '"kafka.network"'
+        bean: '"kafka.network":type="RequestMetrics",name="Fetch-TotalTimeMs"'
+        attribute:
+          Mean:
+            metric_type: counter
+            alias: kafka.request.fetch.time.avg
+          99thPercentile:
+            metric_type: counter
+            alias: kafka.request.fetch.time.99percentile
     - include:
-      domain: '"kafka.network"'
-      bean: '"kafka.network":type="RequestMetrics",name="UpdateMetadata-TotalTimeMs"'
-      attribute:
-        Mean:
-          metric_type: counter
-          alias: kafka.request.update_metadata.time.avg
-        99thPercentile:
-          metric_type: counter
-          alias: kafka.request.update_metadata.time.99percentile
+        domain: '"kafka.network"'
+        bean: '"kafka.network":type="RequestMetrics",name="UpdateMetadata-TotalTimeMs"'
+        attribute:
+          Mean:
+            metric_type: counter
+            alias: kafka.request.update_metadata.time.avg
+          99thPercentile:
+            metric_type: counter
+            alias: kafka.request.update_metadata.time.99percentile
     - include:
-      domain: '"kafka.network"'
-      bean: '"kafka.network":type="RequestMetrics",name="Metadata-TotalTimeMs"'
-      attribute:
-        Mean:
-          metric_type: counter
-          alias: kafka.request.metadata.time.avg
-        99thPercentile:
-          metric_type: counter
-          alias: kafka.request.metadata.time.99percentile
+        domain: '"kafka.network"'
+        bean: '"kafka.network":type="RequestMetrics",name="Metadata-TotalTimeMs"'
+        attribute:
+          Mean:
+            metric_type: counter
+            alias: kafka.request.metadata.time.avg
+          99thPercentile:
+            metric_type: counter
+            alias: kafka.request.metadata.time.99percentile
     - include:
-      domain: '"kafka.network"'
-      bean: '"kafka.network":type="RequestMetrics",name="Offsets-TotalTimeMs"'
-      attribute:
-        Mean:
-          metric_type: counter
-          alias: kafka.request.offsets.time.avg
-        99thPercentile:
-          metric_type: counter
-          alias: kafka.request.offsets.time.99percentile
+        domain: '"kafka.network"'
+        bean: '"kafka.network":type="RequestMetrics",name="Offsets-TotalTimeMs"'
+        attribute:
+          Mean:
+            metric_type: counter
+            alias: kafka.request.offsets.time.avg
+          99thPercentile:
+            metric_type: counter
+            alias: kafka.request.offsets.time.99percentile
 
     #
     # Replication stats
     #
     - include:
-      domain: '"kafka.server"'
-      bean: '"kafka.server":type="ReplicaManager",name="ISRShrinksPerSec"'
-      attribute:
-        MeanRate:
-          metric_type: counter
-          alias: kafka.replication.isr_shrinks
+        domain: '"kafka.server"'
+        bean: '"kafka.server":type="ReplicaManager",name="ISRShrinksPerSec"'
+        attribute:
+          MeanRate:
+            metric_type: counter
+            alias: kafka.replication.isr_shrinks
     - include:
-      domain: '"kafka.server"'
-      bean: '"kafka.server":type="ReplicaManager",name="ISRExpandsPerSec"'
-      attribute:
-        MeanRate:
-          metric_type: counter
-          alias: kafka.replication.isr_expands
+        domain: '"kafka.server"'
+        bean: '"kafka.server":type="ReplicaManager",name="ISRExpandsPerSec"'
+        attribute:
+          MeanRate:
+            metric_type: counter
+            alias: kafka.replication.isr_expands
     - include:
-      domain: '"kafka.server"'
-      bean: '"kafka.server":type="ControllerStats",name="LeaderElectionRateAndTimeMs"'
-      attribute:
-        MeanRate:
-          metric_type: counter
-          alias: kafka.replication.leader_elections
+        domain: '"kafka.server"'
+        bean: '"kafka.server":type="ControllerStats",name="LeaderElectionRateAndTimeMs"'
+        attribute:
+          MeanRate:
+            metric_type: counter
+            alias: kafka.replication.leader_elections
     - include:
-      domain: '"kafka.server"'
-      bean: '"kafka.server":type="ControllerStats",name="UncleanLeaderElectionsPerSec"'
-      attribute:
-        MeanRate:
-          metric_type: counter
-          alias: kafka.replication.unclean_leader_elections
+        domain: '"kafka.server"'
+        bean: '"kafka.server":type="ControllerStats",name="UncleanLeaderElectionsPerSec"'
+        attribute:
+          MeanRate:
+            metric_type: counter
+            alias: kafka.replication.unclean_leader_elections
 
     #
     # Log flush stats
     #
     - include:
-      domain: '"kafka.log"'
-      bean: '"kafka.log":type="LogFlushStats",name="LogFlushRateAndTimeMs"'
-      attribute:
-        MeanRate:
-          metric_type: counter
-          alias: kafka.log.flush_rate
+        domain: '"kafka.log"'
+        bean: '"kafka.log":type="LogFlushStats",name="LogFlushRateAndTimeMs"'
+        attribute:
+          MeanRate:
+            metric_type: counter
+            alias: kafka.log.flush_rate
+