From db52a3c28a31503fb07fd617768737a3192874e2 Mon Sep 17 00:00:00 2001
From: Staffan Olsson <staffan@repos.se>
Date: Tue, 8 Aug 2017 13:41:16 +0200
Subject: Uses JMX config from config map, so we can experiment

---
 zookeeper/10zookeeper-config.yml | 19 +++++++++++++++++++
 zookeeper/51zoo.yml              |  5 ++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/zookeeper/10zookeeper-config.yml b/zookeeper/10zookeeper-config.yml
index e796b4b..c9b7a6f 100644
--- 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
index 37dea41..611f8ac 100644
--- 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:
-- 
cgit v1.2.3