From eb14061eaca39f5f5d5a88056305d4f143c1366b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20R=C3=BCegg?= Date: Fri, 26 Apr 2019 15:28:43 +0200 Subject: [PATCH 1/2] Switch metrics exporter image MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use a more up to date image with more features and a versioned tag. Signed-off-by: Simon Rüegg --- bitnami/zookeeper/values-production.yaml | 4 ++-- bitnami/zookeeper/values.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bitnami/zookeeper/values-production.yaml b/bitnami/zookeeper/values-production.yaml index 58bb4d51e..565727a8c 100644 --- a/bitnami/zookeeper/values-production.yaml +++ b/bitnami/zookeeper/values-production.yaml @@ -189,8 +189,8 @@ metrics: image: registry: docker.io - repository: javsalgar/zookeeper-exporter - tag: latest + repository: dabealu/zookeeper-exporter + tag: v0.1.0 pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. diff --git a/bitnami/zookeeper/values.yaml b/bitnami/zookeeper/values.yaml index 2502e51fb..a9fc4b6c8 100644 --- a/bitnami/zookeeper/values.yaml +++ b/bitnami/zookeeper/values.yaml @@ -189,8 +189,8 @@ metrics: image: registry: docker.io - repository: javsalgar/zookeeper-exporter - tag: latest + repository: dabealu/zookeeper-exporter + tag: v0.1.0 pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. From 8c7209da38281ce9be50728ad0618e4542fc6ec5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20R=C3=BCegg?= Date: Fri, 26 Apr 2019 15:29:09 +0200 Subject: [PATCH 2/2] Set ZooKeeper exporter connection timeout MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Usually a metrics endpoint is scraped with an interval of between 10s - 1m, so a lower connection timeout makes sense. Signed-off-by: Simon Rüegg WIP --- bitnami/zookeeper/Chart.yaml | 2 +- bitnami/zookeeper/README.md | 1 + bitnami/zookeeper/templates/metrics-deployment.yaml | 2 ++ bitnami/zookeeper/values-production.yaml | 2 ++ bitnami/zookeeper/values.yaml | 2 ++ 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/bitnami/zookeeper/Chart.yaml b/bitnami/zookeeper/Chart.yaml index 09be7d67a..7bd2b9906 100644 --- a/bitnami/zookeeper/Chart.yaml +++ b/bitnami/zookeeper/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: zookeeper -version: 2.1.0 +version: 2.2.0 appVersion: 3.4.14 description: A centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services for distributed applications. keywords: diff --git a/bitnami/zookeeper/README.md b/bitnami/zookeeper/README.md index 31e9b1d15..9bfd58622 100644 --- a/bitnami/zookeeper/README.md +++ b/bitnami/zookeeper/README.md @@ -113,6 +113,7 @@ The following tables lists the configurable parameters of the Zookeeper chart an | `metrics.podAnnotations` | Additional annotations for Metrics exporter pod | `{prometheus.io/scrape: "true", prometheus.io/port: "9141"}` | | `metrics.resources` | Exporter resource requests/limit | Memory: `256Mi`, CPU: `100m` | | `metrics.tolerations` | Exporter toleration labels for pod assignment | `[]` | +| `metrics.timeoutSeconds` | Timeout in seconds the exporter uses to scrape its targets | 3 | Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, diff --git a/bitnami/zookeeper/templates/metrics-deployment.yaml b/bitnami/zookeeper/templates/metrics-deployment.yaml index 3f34bfce3..7795fa046 100644 --- a/bitnami/zookeeper/templates/metrics-deployment.yaml +++ b/bitnami/zookeeper/templates/metrics-deployment.yaml @@ -39,6 +39,8 @@ spec: name: zookeeper-exporter command: - /usr/local/bin/zookeeper-exporter + - -timeout + - {{ .Values.metrics.timeoutSeconds | quote }} - -zk-list {{- $replicaCount := int .Values.replicaCount }} {{- $followerPort := int .Values.service.followerPort }} diff --git a/bitnami/zookeeper/values-production.yaml b/bitnami/zookeeper/values-production.yaml index 565727a8c..e39fb5849 100644 --- a/bitnami/zookeeper/values-production.yaml +++ b/bitnami/zookeeper/values-production.yaml @@ -205,6 +205,8 @@ metrics: prometheus.io/port: "9141" podLabels: {} + timeoutSeconds: 3 + ## Metrics exporter resource requests and limits ## ref: http://kubernetes.io/docs/user-guide/compute-resources/ ## diff --git a/bitnami/zookeeper/values.yaml b/bitnami/zookeeper/values.yaml index a9fc4b6c8..3362c794d 100644 --- a/bitnami/zookeeper/values.yaml +++ b/bitnami/zookeeper/values.yaml @@ -205,6 +205,8 @@ metrics: prometheus.io/port: "9141" podLabels: {} + timeoutSeconds: 3 + ## Metrics exporter resource requests and limits ## ref: http://kubernetes.io/docs/user-guide/compute-resources/ ##