From 22a314ac161d3d203881eaf4b1a44ea8bf028a27 Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Fri, 28 Jul 2017 07:55:39 +0200 Subject: Makes /metrics export opt-in (through addon branch coming up) --- 50kafka.yml | 15 --------------- zookeeper/50pzoo.yml | 23 ----------------------- zookeeper/51zoo.yml | 23 ----------------------- 3 files changed, 61 deletions(-) diff --git a/50kafka.yml b/50kafka.yml index 9b8bde2..4404a6b 100644 --- a/50kafka.yml +++ b/50kafka.yml @@ -11,8 +11,6 @@ spec: labels: app: kafka annotations: - prometheus.io/scrape: "true" - prometheus.io/port: "5556" spec: terminationGracePeriodSeconds: 30 initContainers: @@ -23,24 +21,11 @@ spec: - name: config mountPath: /etc/kafka containers: - - name: metrics - image: solsson/kafka-prometheus-jmx-exporter@sha256:1f7c96c287a2dbec1d909cd8f96c0656310239b55a9a90d7fd12c81f384f1f7d - ports: - - containerPort: 5556 - resources: - requests: - cpu: 0m - memory: 40Mi - limits: - cpu: 10m - memory: 100Mi - name: broker image: solsson/kafka:0.11.0.0@sha256:b27560de08d30ebf96d12e74f80afcaca503ad4ca3103e63b1fd43a2e4c976ce env: - name: KAFKA_LOG4J_OPTS value: -Dlog4j.configuration=file:/etc/kafka/log4j.properties - - name: JMX_PORT - value: "5555" ports: - containerPort: 9092 command: diff --git a/zookeeper/50pzoo.yml b/zookeeper/50pzoo.yml index 9989662..f9d5c58 100644 --- a/zookeeper/50pzoo.yml +++ b/zookeeper/50pzoo.yml @@ -12,8 +12,6 @@ spec: app: zookeeper storage: persistent annotations: - prometheus.io/scrape: "true" - prometheus.io/port: "5556" spec: terminationGracePeriodSeconds: 10 initContainers: @@ -26,32 +24,11 @@ spec: - name: data mountPath: /var/lib/zookeeper/data containers: - - name: metrics - image: solsson/kafka-prometheus-jmx-exporter@sha256:1f7c96c287a2dbec1d909cd8f96c0656310239b55a9a90d7fd12c81f384f1f7d - command: - - java - - -Xms39M - - -Xmx99M - - -jar - - jmx_prometheus_httpserver.jar - - "5556" - - example_configs/zookeeper.yaml - ports: - - containerPort: 5556 - resources: - requests: - cpu: 0m - memory: 40Mi - limits: - cpu: 10m - memory: 100Mi - name: zookeeper image: solsson/kafka:0.11.0.0@sha256:b27560de08d30ebf96d12e74f80afcaca503ad4ca3103e63b1fd43a2e4c976ce env: - name: KAFKA_LOG4J_OPTS value: -Dlog4j.configuration=file:/etc/kafka/log4j.properties - - name: JMX_PORT - value: "5555" command: - ./bin/zookeeper-server-start.sh - /etc/kafka/zookeeper.properties diff --git a/zookeeper/51zoo.yml b/zookeeper/51zoo.yml index 7e39cac..778567d 100644 --- a/zookeeper/51zoo.yml +++ b/zookeeper/51zoo.yml @@ -12,8 +12,6 @@ spec: app: zookeeper storage: ephemeral annotations: - prometheus.io/scrape: "true" - prometheus.io/port: "5556" spec: terminationGracePeriodSeconds: 10 initContainers: @@ -29,32 +27,11 @@ spec: - name: data mountPath: /var/lib/zookeeper/data containers: - - name: metrics - image: solsson/kafka-prometheus-jmx-exporter@sha256:1f7c96c287a2dbec1d909cd8f96c0656310239b55a9a90d7fd12c81f384f1f7d - command: - - java - - -Xms39M - - -Xmx99M - - -jar - - jmx_prometheus_httpserver.jar - - "5556" - - example_configs/zookeeper.yaml - ports: - - containerPort: 5556 - resources: - requests: - cpu: 0m - memory: 40Mi - limits: - cpu: 10m - memory: 100Mi - name: zookeeper image: solsson/kafka:0.11.0.0@sha256:b27560de08d30ebf96d12e74f80afcaca503ad4ca3103e63b1fd43a2e4c976ce env: - name: KAFKA_LOG4J_OPTS value: -Dlog4j.configuration=file:/etc/kafka/log4j.properties - - name: JMX_PORT - value: "5555" command: - ./bin/zookeeper-server-start.sh - /etc/kafka/zookeeper.properties -- cgit v1.2.3