fix: Fix the JMX whitespace regression (confluentinc#433)

webgismd · May 18, 2020 · 596dd55 · 596dd55
1 parent 3da8462
commit 596dd55
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/charts/cp-kafka-connect/templates/jmx-configmap.yaml b/charts/cp-kafka-connect/templates/jmx-configmap.yaml
@@ -16,8 +16,8 @@ data:
     ssl: false
     whitelistObjectNames:
     - kafka.connect:type=connect-worker-metrics
-    - kafka.connect:type=connect-metrics, client-id=*
-    - kafka.connect:type=connector-task-metrics, connector=*, task=*
+    - kafka.connect:type=connect-metrics,client-id=*
+    - kafka.connect:type=connector-task-metrics,connector=*,task=*
     rules:
     - pattern : "kafka.connect<type=connect-worker-metrics>([^:]+):"
       name: "cp_kafka_connect_connect_worker_metrics_$1"

diff --git a/charts/cp-kafka/templates/jmx-configmap.yaml b/charts/cp-kafka/templates/jmx-configmap.yaml
@@ -15,15 +15,15 @@ data:
     lowercaseOutputLabelNames: true
     ssl: false
     whitelistObjectNames:
-    - kafka.server:type=ReplicaManager, name=*
-    - kafka.controller:type=KafkaController, name=*
-    - kafka.server:type=BrokerTopicMetrics, name=*
-    - kafka.network:type=RequestMetrics, name=RequestsPerSec, request=*
-    - kafka.network:type=SocketServer, name=NetworkProcessorAvgIdlePercent
-    - kafka.server:type=ReplicaFetcherManager, name=MaxLag, clientId=*
-    - kafka.server:type=KafkaRequestHandlerPool, name=RequestHandlerAvgIdlePercent
-    - kafka.controller:type=ControllerStats, name=*
-    - kafka.server:type=SessionExpireListener, name=*
+    - kafka.server:type=ReplicaManager,name=*
+    - kafka.controller:type=KafkaController,name=*
+    - kafka.server:type=BrokerTopicMetrics,name=*
+    - kafka.network:type=RequestMetrics,name=RequestsPerSec,request=*
+    - kafka.network:type=SocketServer,name=NetworkProcessorAvgIdlePercent
+    - kafka.server:type=ReplicaFetcherManager,name=MaxLag,clientId=*
+    - kafka.server:type=KafkaRequestHandlerPool,name=RequestHandlerAvgIdlePercent
+    - kafka.controller:type=ControllerStats,name=*
+    - kafka.server:type=SessionExpireListener,name=*
     rules:
     - pattern : kafka.server<type=ReplicaManager, name=(.+)><>(Value|OneMinuteRate)
       name: "cp_kafka_server_replicamanager_$1"

diff --git a/charts/cp-zookeeper/templates/jmx-configmap.yaml b/charts/cp-zookeeper/templates/jmx-configmap.yaml
@@ -16,9 +16,9 @@ data:
     ssl: false
     whitelistObjectNames:
     - org.apache.ZooKeeperService:name0=ReplicatedServer_id*
-    - org.apache.ZooKeeperService:name0=ReplicatedServer_id*, name1=replica.*
-    - org.apache.ZooKeeperService:name0=ReplicatedServer_id*, name1=replica.*, name2=*
-    - org.apache.ZooKeeperService:name0=ReplicatedServer_id*, name1=replica.*, name2=*, name3=*
+    - org.apache.ZooKeeperService:name0=ReplicatedServer_id*,name1=replica.*
+    - org.apache.ZooKeeperService:name0=ReplicatedServer_id*,name1=replica.*,name2=*
+    - org.apache.ZooKeeperService:name0=ReplicatedServer_id*,name1=replica.*,name2=*,name3=*
     rules:
     - pattern: "org.apache.ZooKeeperService<name0=ReplicatedServer_id(\\d+)><>(\\w+)"
       name: "cp_zookeeper_$2"