From ea241c09dddba5de578896be27947a24c444210e Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Fri, 14 Jul 2023 11:03:56 +0200 Subject: [PATCH] [bitnami/redis] add sampleLimit and targetLimit for redis chart (#17587) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add sampleLimit and targetLimit for redis chart Signed-off-by: Markus Blaschke * Update README.md with readme-generator-for-helm Signed-off-by: Bitnami Containers * add sampleLimit and targetLimit for redis chart Signed-off-by: Markus Blaschke * Update README.md with readme-generator-for-helm Signed-off-by: Bitnami Containers --------- Signed-off-by: Markus Blaschke 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/redis/Chart.yaml | 2 +- bitnami/redis/README.md | 2 ++ bitnami/redis/templates/servicemonitor.yaml | 6 ++++++ bitnami/redis/values.yaml | 7 +++++++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/bitnami/redis/Chart.yaml b/bitnami/redis/Chart.yaml index 94846ed876..1c99655411 100644 --- a/bitnami/redis/Chart.yaml +++ b/bitnami/redis/Chart.yaml @@ -25,4 +25,4 @@ maintainers: name: redis sources: - https://github.com/bitnami/charts/tree/main/bitnami/redis -version: 17.12.0 +version: 17.13.0 diff --git a/bitnami/redis/README.md b/bitnami/redis/README.md index 79d93b80cf..e2b1f950da 100644 --- a/bitnami/redis/README.md +++ b/bitnami/redis/README.md @@ -507,6 +507,8 @@ The command removes all the Kubernetes components associated with the chart and | `metrics.serviceMonitor.honorLabels` | Specify honorLabels parameter to add the scrape endpoint | `false` | | `metrics.serviceMonitor.additionalLabels` | Additional labels that can be used so ServiceMonitor resource(s) can be discovered by Prometheus | `{}` | | `metrics.serviceMonitor.podTargetLabels` | Labels from the Kubernetes pod to be transferred to the created metrics | `[]` | +| `metrics.serviceMonitor.sampleLimit` | Limit of how many samples should be scraped from every Pod | `false` | +| `metrics.serviceMonitor.targetLimit` | Limit of how many targets should be scraped | `false` | | `metrics.prometheusRule.enabled` | Create a custom prometheusRule Resource for scraping metrics using PrometheusOperator | `false` | | `metrics.prometheusRule.namespace` | The namespace in which the prometheusRule will be created | `""` | | `metrics.prometheusRule.additionalLabels` | Additional labels for the prometheusRule | `{}` | diff --git a/bitnami/redis/templates/servicemonitor.yaml b/bitnami/redis/templates/servicemonitor.yaml index a9a14c4da9..732ffbac93 100644 --- a/bitnami/redis/templates/servicemonitor.yaml +++ b/bitnami/redis/templates/servicemonitor.yaml @@ -40,6 +40,12 @@ spec: {{- if .Values.metrics.serviceMonitor.podTargetLabels }} podTargetLabels: {{- toYaml .Values.metrics.serviceMonitor.podTargetLabels | nindent 4 }} {{- end }} + {{ with .Values.metrics.serviceMonitor.sampleLimit }} + sampleLimit: {{ . }} + {{- end }} + {{ with .Values.metrics.serviceMonitor.targetLimit }} + targetLimit: {{ . }} + {{- end }} namespaceSelector: matchNames: - {{ .Release.Namespace }} diff --git a/bitnami/redis/values.yaml b/bitnami/redis/values.yaml index 618842033d..5c1f8af57a 100644 --- a/bitnami/redis/values.yaml +++ b/bitnami/redis/values.yaml @@ -1627,6 +1627,13 @@ metrics: ## @param metrics.serviceMonitor.podTargetLabels Labels from the Kubernetes pod to be transferred to the created metrics ## podTargetLabels: [] + ## @param metrics.serviceMonitor.sampleLimit Limit of how many samples should be scraped from every Pod + ## + sampleLimit: false + ## @param metrics.serviceMonitor.targetLimit Limit of how many targets should be scraped + ## + targetLimit: false + ## Custom PrometheusRule to be defined ## ref: https://github.com/coreos/prometheus-operator#customresourcedefinitions ##