aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStaffan Olsson <staffan@repos.se>2017-08-08 13:41:16 +0200
committerStaffan Olsson <staffan@repos.se>2017-11-03 13:36:08 +0100
commitdb52a3c28a31503fb07fd617768737a3192874e2 (patch)
treeb16e1db49eb8bc42874af217dda397c43b407cff
parentb6c85eb08ce323e2c0ba19dccaea5e227f651715 (diff)
downloadkubernetes-kafka-db52a3c28a31503fb07fd617768737a3192874e2.tar.gz
kubernetes-kafka-db52a3c28a31503fb07fd617768737a3192874e2.tar.bz2
kubernetes-kafka-db52a3c28a31503fb07fd617768737a3192874e2.zip
Uses JMX config from config map, so we can experiment
-rw-r--r--zookeeper/10zookeeper-config.yml19
-rw-r--r--zookeeper/51zoo.yml5
2 files changed, 23 insertions, 1 deletions
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: