Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-03-06 15:10:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/apache] Support custom scrape_uri in apache exporter (#35050)

Browse Source 
* [bitnami/apache] Support custom scrape_uri in apache exporter command

Signed-off-by: Ann Moon <ann.moon2867@gmail.com>

* Update README

Signed-off-by: Ann Moon <ann.moon2867@gmail.com>

* Fix typo in README

Signed-off-by: Ann Moon <ann.moon2867@gmail.com>

* Update CHANGELOG.md

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>

* Update README.md with readme-generator-for-helm

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>

* Update CHANGELOG.md

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>

* Update chart version and templates

Signed-off-by: Ann Moon <ann.moon2867@gmail.com>

* Update CHANGELOG.md

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>

---------

Signed-off-by: Ann Moon <ann.moon2867@gmail.com>
Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>
Co-authored-by: Bitnami Bot <bitnami.bot@broadcom.com>
This commit is contained in:
Ann Moon
2025-07-17 22:29:39 -07:00
committed by GitHub
parent bd99c5c1e8
commit 6c008fcf2f
6 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bitnami/apache/CHANGELOG.md
View File

@@ -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))
## <small>11.3.22 (2025-07-10)</small>
* [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)
## <small>11.3.21 (2025-07-08)</small>

2
bitnami/apache/Chart.yaml
View File

@@ -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

1
bitnami/apache/README.md
View File

@@ -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) | `{}` |

2
bitnami/apache/templates/deployment.yaml
View File

@@ -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 }}

2
bitnami/apache/templates/networkpolicy.yaml
View File

@@ -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:

3
bitnami/apache/values.yaml
View File

@@ -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: