From 6c008fcf2fd8943b243860164f17cd53485f6119 Mon Sep 17 00:00:00 2001 From: Ann Moon <32624965+amoon78@users.noreply.github.com> Date: Thu, 17 Jul 2025 22:29:39 -0700 Subject: [PATCH] [bitnami/apache] Support custom scrape_uri in apache exporter (#35050) * [bitnami/apache] Support custom scrape_uri in apache exporter command Signed-off-by: Ann Moon * Update README Signed-off-by: Ann Moon * Fix typo in README Signed-off-by: Ann Moon * Update CHANGELOG.md Signed-off-by: Bitnami Bot * Update README.md with readme-generator-for-helm Signed-off-by: Bitnami Bot * Update CHANGELOG.md Signed-off-by: Bitnami Bot * Update chart version and templates Signed-off-by: Ann Moon * Update CHANGELOG.md Signed-off-by: Bitnami Bot --------- Signed-off-by: Ann Moon Signed-off-by: Bitnami Bot Co-authored-by: Bitnami Bot --- bitnami/apache/CHANGELOG.md | 8 ++++++-- bitnami/apache/Chart.yaml | 2 +- bitnami/apache/README.md | 1 + bitnami/apache/templates/deployment.yaml | 2 +- bitnami/apache/templates/networkpolicy.yaml | 2 +- bitnami/apache/values.yaml | 3 +++ 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/bitnami/apache/CHANGELOG.md b/bitnami/apache/CHANGELOG.md index cb00611ba0..89997633e8 100644 --- a/bitnami/apache/CHANGELOG.md +++ b/bitnami/apache/CHANGELOG.md @@ -1,8 +1,12 @@ # Changelog -## 11.3.22 (2025-07-10) +## 11.4.0 (2025-07-16) -* [bitnami/apache] :zap: :arrow_up: Update dependency references ([#34992](https://github.com/bitnami/charts/pull/34992)) +* [bitnami/apache] Support custom scrape_uri in apache exporter ([#35050](https://github.com/bitnami/charts/pull/35050)) + +## 11.3.22 (2025-07-10) + +* [bitnami/apache] :zap: :arrow_up: Update dependency references (#34992) ([2a2be25](https://github.com/bitnami/charts/commit/2a2be25c074bedc94656f17095c2a2cbe4368f19)), closes [#34992](https://github.com/bitnami/charts/issues/34992) ## 11.3.21 (2025-07-08) diff --git a/bitnami/apache/Chart.yaml b/bitnami/apache/Chart.yaml index ea959d578c..ad28c0d1de 100644 --- a/bitnami/apache/Chart.yaml +++ b/bitnami/apache/Chart.yaml @@ -38,4 +38,4 @@ maintainers: name: apache sources: - https://github.com/bitnami/charts/tree/main/bitnami/apache -version: 11.3.22 +version: 11.4.0 diff --git a/bitnami/apache/README.md b/bitnami/apache/README.md index 56833e4479..4e6cf02169 100644 --- a/bitnami/apache/README.md +++ b/bitnami/apache/README.md @@ -305,6 +305,7 @@ Install the [Bitnami Kube Prometheus helm chart](https://github.com/bitnami/char | `metrics.image.pullPolicy` | Apache Exporter image pull policy | `IfNotPresent` | | `metrics.image.pullSecrets` | Apache Exporter image pull secrets | `[]` | | `metrics.image.debug` | Apache Exporter image debug mode | `false` | +| `metrics.scrapeUri` | Apache Prometheus Exporter scrape_uri | `""` | | `metrics.podAnnotations` | Additional custom annotations for Apache exporter service | `{}` | | `metrics.resourcesPreset` | Set container resources according to one common preset (allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge). This is ignored if metrics.resources is set (metrics.resources is recommended for production). | `none` | | `metrics.resources` | Set container requests and limits for different resources like CPU or memory (essential for production workloads) | `{}` | diff --git a/bitnami/apache/templates/deployment.yaml b/bitnami/apache/templates/deployment.yaml index aff59f68cc..3d407fceb5 100644 --- a/bitnami/apache/templates/deployment.yaml +++ b/bitnami/apache/templates/deployment.yaml @@ -285,7 +285,7 @@ spec: - name: metrics image: {{ template "apache.metrics.image" . }} imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} - command: ['/bin/apache_exporter', '--scrape_uri', 'http://status.localhost:8080/server-status/?auto'] + command: ['/bin/apache_exporter', '--scrape_uri', {{ default (printf "http://status.localhost:%v/server-status/?auto" .Values.containerPorts.http) .Values.metrics.scrapeUri | quote }}] env: - name: BITNAMI_DEBUG value: {{ ternary "true" "false" .Values.metrics.image.debug | quote }} diff --git a/bitnami/apache/templates/networkpolicy.yaml b/bitnami/apache/templates/networkpolicy.yaml index 327e1fa37f..8800803180 100644 --- a/bitnami/apache/templates/networkpolicy.yaml +++ b/bitnami/apache/templates/networkpolicy.yaml @@ -41,7 +41,7 @@ spec: - port: {{ .Values.containerPorts.https }} {{- end }} {{- if .Values.metrics.enabled }} - - port: {{ .Values.metrics.containerPorts.metrics }} + - port: {{ .Values.metrics.containerPort }} {{- end }} {{- if not .Values.networkPolicy.allowExternal }} from: diff --git a/bitnami/apache/values.yaml b/bitnami/apache/values.yaml index aa44a64122..34a10b151f 100644 --- a/bitnami/apache/values.yaml +++ b/bitnami/apache/values.yaml @@ -705,6 +705,9 @@ metrics: ## Enable debug mode ## debug: false + ## @param metrics.scrapeUri Apache Prometheus Exporter scrape_uri + ## Default scrape_uri is 'http://status.localhost:{{ .Values.containerPorts.http }}/server-status/?auto' if this variable is empty. + scrapeUri: "" ## @param metrics.podAnnotations [object] Additional custom annotations for Apache exporter service ## podAnnotations: