[bitnami/prometheus] Allowing to disable the scraping of prometheus and alertmanager hosts with new values (#33777)

This commit is contained in:
Koren Peretz
2025-05-23 17:21:46 +03:00
committed by GitHub
parent 91fc6bf12f
commit bae4289bdb
4 changed files with 18 additions and 4 deletions

View File

@@ -1,8 +1,12 @@
# Changelog
## 2.0.8 (2025-05-17)
## 2.1.0 (2025-05-23)
* [bitnami/prometheus] Added variable whether to include the default cluster role rules in rbac ([#33722](https://github.com/bitnami/charts/pull/33722))
* [bitnami/prometheus] Allowing to disable the scraping of prometheus and alertmanager hosts with new values ([#33777](https://github.com/bitnami/charts/pull/33777))
## <small>2.0.8 (2025-05-19)</small>
* [bitnami/prometheus] Added variable whether to include the default cluster role rules in rbac (#3372 ([cd9a26e](https://github.com/bitnami/charts/commit/cd9a26e5119370b678e18aa05582bc46dc22850f)), closes [#33722](https://github.com/bitnami/charts/issues/33722)
## <small>2.0.7 (2025-05-17)</small>

View File

@@ -39,4 +39,4 @@ sources:
- https://github.com/bitnami/containers/tree/main/bitnami/prometheus
- https://github.com/prometheus/prometheus
- https://github.com/prometheus-community/helm-charts
version: 2.0.8
version: 2.1.0

View File

@@ -474,6 +474,8 @@ server:
| `server.image.digest` | Prometheus image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag image tag (immutable tags are recommended) | `""` |
| `server.image.pullPolicy` | Prometheus image pull policy | `IfNotPresent` |
| `server.image.pullSecrets` | Prometheus image pull secrets | `[]` |
| `server.scrapePrometheusHost` | Specifies whether to include prometheus host scraping job | `true` |
| `server.scrapeAlertmanagerHost` | Specifies whether to include alertmanager host scraping job | `true` |
| `server.configuration` | Promethus configuration. This content will be stored in the the prometheus.yaml file and the content can be a template. | `""` |
| `server.alertingRules` | Prometheus alerting rules. This content will be stored in the the rules.yaml file and the content can be a template. | `{}` |
| `server.extraScrapeConfigs` | Promethus configuration, useful to declare new scrape_configs. This content will be merged with the 'server.configuration' value and stored in the the prometheus.yaml file. | `[]` |

View File

@@ -695,6 +695,12 @@ server:
## - myRegistryKeySecretName
##
pullSecrets: []
## @param server.scrapePrometheusHost Specifies whether to include prometheus host scraping job
##
scrapePrometheusHost: true
## @param server.scrapeAlertmanagerHost Specifies whether to include alertmanager host scraping job
##
scrapeAlertmanagerHost: true
## @param server.configuration [string] Promethus configuration. This content will be stored in the the prometheus.yaml file and the content can be a template.
## ref: <https://github.com/prometheus-community/helm-charts/blob/main/charts/prometheus/values.yaml>
##
@@ -718,9 +724,11 @@ server:
remote_write: {{- include "common.tplvalues.render" (dict "value" .Values.server.remoteWrite "context" $) | nindent 4 }}
{{- end }}
scrape_configs:
{{- if .Values.server.scrapePrometheusHost }}
- job_name: prometheus
{{- include "prometheus.scrape_config" (dict "component" "server" "context" $) | nindent 4 }}
{{- if .Values.alertmanager.enabled }}
{{- end }}
{{- if and .Values.alertmanager.enabled .Values.server.scrapeAlertmanagerHost }}
- job_name: alertmanager
{{- include "prometheus.scrape_config" (dict "component" "alertmanager" "context" $) | nindent 4 }}
{{- end }}