Uses JMX config from config map, so we can experiment

Yolean · Nov 3, 2017 · db52a3c · db52a3c
1 parent b6c85eb
commit db52a3c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/zookeeper/10zookeeper-config.yml b/zookeeper/10zookeeper-config.yml
@@ -35,3 +35,22 @@ data:
     # Suppress connection log messages, three lines per livenessProbe execution
     log4j.logger.org.apache.zookeeper.server.NIOServerCnxnFactory=WARN
     log4j.logger.org.apache.zookeeper.server.NIOServerCnxn=WARN
+
+  jmx-zookeeper-prometheus.yaml: |+
+    rules:
+    - pattern: "org.apache.ZooKeeperService<name0=ReplicatedServer_id(\\d)><>(\\w+)"
+      name: "zookeeper_$2"
+    - pattern: "org.apache.ZooKeeperService<name0=ReplicatedServer_id(\\d), name1=replica.(\\d)><>(\\w+)"
+      name: "zookeeper_$3"
+      labels:
+        replicaId: "$2"
+    - pattern: "org.apache.ZooKeeperService<name0=ReplicatedServer_id(\\d), name1=replica.(\\d), name2=(\\w+)><>(\\w+)"
+      name: "zookeeper_$4"
+      labels:
+        replicaId: "$2"
+        memberType: "$3"
+    - pattern: "org.apache.ZooKeeperService<name0=ReplicatedServer_id(\\d), name1=replica.(\\d), name2=(\\w+), name3=(\\w+)><>(\\w+)"
+      name: "zookeeper_$4_$5"
+      labels:
+        replicaId: "$2"
+        memberType: "$3"
diff --git a/zookeeper/51zoo.yml b/zookeeper/51zoo.yml
@@ -70,7 +70,7 @@ spec:
         - -jar
         - jmx_prometheus_httpserver.jar
         - "5556"
-        - example_configs/zookeeper.yaml
+        - /etc/kafka/jmx-zookeeper-prometheus.yaml
         ports:
         - containerPort: 5556
         resources:
@@ -79,6 +79,9 @@ spec:
             memory: 100Mi
           limits:
             memory: 150Mi
+        volumeMounts:
+        - name: config
+          mountPath: /etc/kafka
       volumes:
       - name: config
         configMap: