diff --git a/bitnami/kube-prometheus/Chart.yaml b/bitnami/kube-prometheus/Chart.yaml index 20c0cd983..eb443796a 100644 --- a/bitnami/kube-prometheus/Chart.yaml +++ b/bitnami/kube-prometheus/Chart.yaml @@ -34,4 +34,4 @@ sources: - https://github.com/bitnami/bitnami-docker-prometheus - https://github.com/bitnami/bitnami-docker-alertmanager - https://github.com/prometheus-operator/kube-prometheus -version: 6.7.1 \ No newline at end of file +version: 6.8.0 \ No newline at end of file diff --git a/bitnami/kube-prometheus/README.md b/bitnami/kube-prometheus/README.md index b83c15676..b4aaa108d 100644 --- a/bitnami/kube-prometheus/README.md +++ b/bitnami/kube-prometheus/README.md @@ -7,7 +7,7 @@ Prometheus Operator provides easy monitoring definitions for Kubernetes services [Overview of Prometheus Operator](https://github.com/coreos/prometheus-operator) Trademarks: This software listing is packaged by Bitnami. The respective trademarks mentioned in the offering are owned by the respective companies, and use of them does not imply any affiliation or endorsement. - + ## TL;DR ```bash @@ -243,6 +243,13 @@ The command removes all the Kubernetes components associated with the chart and | `prometheus.readinessProbe.timeoutSeconds` | When the probe times out | `3` | | `prometheus.readinessProbe.failureThreshold` | Minimum consecutive failures for the probe | `10` | | `prometheus.readinessProbe.successThreshold` | Minimum consecutive successes for the probe | `1` | +| `prometheus.startupProbe.enabled` | Turn on and off startup probe | `true` | +| `prometheus.startupProbe.path` | Path of the HTTP service for checking the ready state | `/-/ready` | +| `prometheus.startupProbe.initialDelaySeconds` | Delay before startup probe is initiated | `0` | +| `prometheus.startupProbe.periodSeconds` | How often to perform the probe | `15` | +| `prometheus.startupProbe.timeoutSeconds` | When the probe times out | `3` | +| `prometheus.startupProbe.failureThreshold` | Minimum consecutive failures for the probe | `60` | +| `prometheus.startupProbe.successThreshold` | Minimum consecutive successes for the probe | `1` | | `prometheus.enableAdminAPI` | Enable Prometheus adminitrative API | `false` | | `prometheus.enableFeatures` | Enable access to Prometheus disabled features. | `[]` | | `prometheus.alertingEndpoints` | Alertmanagers to which alerts will be sent | `[]` | diff --git a/bitnami/kube-prometheus/templates/prometheus/prometheus.yaml b/bitnami/kube-prometheus/templates/prometheus/prometheus.yaml index 7c547fef6..ff875cc81 100644 --- a/bitnami/kube-prometheus/templates/prometheus/prometheus.yaml +++ b/bitnami/kube-prometheus/templates/prometheus/prometheus.yaml @@ -316,6 +316,18 @@ spec: failureThreshold: {{ .Values.prometheus.readinessProbe.failureThreshold }} successThreshold: {{ .Values.prometheus.readinessProbe.successThreshold }} {{- end }} + {{- if .Values.prometheus.startupProbe.enabled }} + startupProbe: + httpGet: + path: {{ .Values.prometheus.startupProbe.path }} + port: web + scheme: HTTP + initialDelaySeconds: {{ .Values.prometheus.startupProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.prometheus.startupProbe.periodSeconds }} + timeoutSeconds: {{ .Values.prometheus.startupProbe.timeoutSeconds }} + failureThreshold: {{ .Values.prometheus.startupProbe.failureThreshold }} + successThreshold: {{ .Values.prometheus.startupProbe.successThreshold }} + {{- end }} {{- end }} {{- if or .Values.operator.prometheusConfigReloader.containerSecurityContext.enabled .Values.operator.prometheusConfigReloader.livenessProbe.enabled .Values.operator.prometheusConfigReloader.readinessProbe.enabled }} ## This monkey patching is needed until the securityContexts are diff --git a/bitnami/kube-prometheus/values.yaml b/bitnami/kube-prometheus/values.yaml index cdd9b0e36..bc54ec73f 100644 --- a/bitnami/kube-prometheus/values.yaml +++ b/bitnami/kube-prometheus/values.yaml @@ -662,6 +662,24 @@ prometheus: periodSeconds: 10 successThreshold: 1 timeoutSeconds: 3 + ## Configure extra options for startup probe + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes + ## @param prometheus.startupProbe.enabled Turn on and off readiness probe + ## @param prometheus.startupProbe.path Path of the HTTP service for checking the ready state + ## @param prometheus.startupProbe.initialDelaySeconds Delay before readiness probe is initiated + ## @param prometheus.startupProbe.periodSeconds How often to perform the probe + ## @param prometheus.startupProbe.timeoutSeconds When the probe times out + ## @param prometheus.startupProbe.failureThreshold Minimum consecutive failures for the probe + ## @param prometheus.startupProbe.successThreshold Minimum consecutive successes for the probe + ## + startupProbe: + enabled: true + path: /-/ready + initialDelaySeconds: 0 + failureThreshold: 60 + periodSeconds: 15 + successThreshold: 1 + timeoutSeconds: 3 ## @param prometheus.enableAdminAPI Enable Prometheus adminitrative API ## ref: https://prometheus.io/docs/prometheus/latest/querying/api/#tsdb-admin-apis ##