From e04d6117bc4c0e1dac47e9303bf5ad92188bce29 Mon Sep 17 00:00:00 2001 From: Chad Bowman Date: Tue, 16 Jul 2024 00:33:50 -0600 Subject: [PATCH] [bitnami/kafka] fix jmx-servicemonitor by using JMX Exporter's default metrics path (#27455) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [bitnami/kafka] fix jmx-servicemonitor by using JMX Exporter's default metrics path Signed-off-by: Chad Bowman * Update CHANGELOG.md Signed-off-by: Bitnami Containers * Update CHANGELOG.md Signed-off-by: Bitnami Containers --------- Signed-off-by: Chad Bowman Signed-off-by: Bitnami Containers Signed-off-by: Carlos Rodríguez Hernández Co-authored-by: Bitnami Containers Co-authored-by: Carlos Rodríguez Hernández --- bitnami/kafka/CHANGELOG.md | 8 ++++++-- bitnami/kafka/Chart.yaml | 2 +- bitnami/kafka/README.md | 1 + bitnami/kafka/templates/metrics/jmx-servicemonitor.yaml | 2 +- bitnami/kafka/values.yaml | 3 +++ 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/bitnami/kafka/CHANGELOG.md b/bitnami/kafka/CHANGELOG.md index fc2036c96a..4a2305923a 100644 --- a/bitnami/kafka/CHANGELOG.md +++ b/bitnami/kafka/CHANGELOG.md @@ -1,8 +1,12 @@ # Changelog -## 29.3.7 (2024-07-02) +## 29.3.8 (2024-07-16) -* [bitnami/kafka] Fix jmx-exporter scrape path ([#27562](https://github.com/bitnami/charts/pull/27562)) +* [bitnami/kafka] fix jmx-servicemonitor by using JMX Exporter's default metrics path ([#27455](https://github.com/bitnami/charts/pull/27455)) + +## 29.3.7 (2024-07-08) + +* [bitnami/kafka] Fix jmx-exporter scrape path (#27562) ([1dd9439](https://github.com/bitnami/charts/commit/1dd943997da79e6095bee6d05410178a0344d4c9)), closes [#27562](https://github.com/bitnami/charts/issues/27562) ## 29.3.6 (2024-07-02) diff --git a/bitnami/kafka/Chart.yaml b/bitnami/kafka/Chart.yaml index e02b1a95e4..fd80ead4c0 100644 --- a/bitnami/kafka/Chart.yaml +++ b/bitnami/kafka/Chart.yaml @@ -40,4 +40,4 @@ maintainers: name: kafka sources: - https://github.com/bitnami/charts/tree/main/bitnami/kafka -version: 29.3.7 +version: 29.3.8 diff --git a/bitnami/kafka/README.md b/bitnami/kafka/README.md index 930a71eb67..cc8d5bc8c8 100644 --- a/bitnami/kafka/README.md +++ b/bitnami/kafka/README.md @@ -935,6 +935,7 @@ You can enable this initContainer by setting `volumePermissions.enabled` to `tru | `metrics.jmx.extraRules` | Add extra rules to JMX exporter configuration | `""` | | `metrics.serviceMonitor.enabled` | if `true`, creates a Prometheus Operator ServiceMonitor (requires `metrics.jmx.enabled` to be `true`) | `false` | | `metrics.serviceMonitor.namespace` | Namespace in which Prometheus is running | `""` | +| `metrics.serviceMonitor.path` | Path where JMX exporter serves metrics | `/metrics` | | `metrics.serviceMonitor.interval` | Interval at which metrics should be scraped | `""` | | `metrics.serviceMonitor.scrapeTimeout` | Timeout after which the scrape is ended | `""` | | `metrics.serviceMonitor.labels` | Additional labels that can be used so ServiceMonitor will be discovered by Prometheus | `{}` | diff --git a/bitnami/kafka/templates/metrics/jmx-servicemonitor.yaml b/bitnami/kafka/templates/metrics/jmx-servicemonitor.yaml index 53b197d498..7b1127a030 100644 --- a/bitnami/kafka/templates/metrics/jmx-servicemonitor.yaml +++ b/bitnami/kafka/templates/metrics/jmx-servicemonitor.yaml @@ -27,7 +27,7 @@ spec: app.kubernetes.io/component: metrics endpoints: - port: http-metrics - path: "/metrics" + path: {{ .Values.metrics.serviceMonitor.path }} {{- if .Values.metrics.serviceMonitor.interval }} interval: {{ .Values.metrics.serviceMonitor.interval }} {{- end }} diff --git a/bitnami/kafka/values.yaml b/bitnami/kafka/values.yaml index f81716b463..ae19b2cc38 100644 --- a/bitnami/kafka/values.yaml +++ b/bitnami/kafka/values.yaml @@ -2046,6 +2046,9 @@ metrics: ## @param metrics.serviceMonitor.namespace Namespace in which Prometheus is running ## namespace: "" + ## @param metrics.serviceMonitor.path Path where JMX exporter serves metrics + ## + path: /metrics ## @param metrics.serviceMonitor.interval Interval at which metrics should be scraped ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#endpoint ##