Merge branch 'main' into add_terminationMsgPath

prometheus-community · Jan 30, 2024 · 6b1b10a · 6b1b10a
2 parents e8b022d + cd64024
commit 6b1b10a
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 10 deletions.
diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml
@@ -23,7 +23,7 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-version: 56.2.1
+version: 56.3.0
 appVersion: v0.71.2
 kubeVersion: ">=1.19.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus

diff --git a/charts/kube-prometheus-stack/templates/prometheus/prometheus.yaml b/charts/kube-prometheus-stack/templates/prometheus/prometheus.yaml
@@ -448,6 +448,9 @@ spec:
 {{- end }}
 {{- if .Values.prometheus.prometheusSpec.minReadySeconds }}
   minReadySeconds: {{ .Values.prometheus.prometheusSpec.minReadySeconds }}
+{{- end }}
+{{- if .Values.prometheus.prometheusSpec.maximumStartupDurationSeconds }}
+  maximumStartupDurationSeconds: {{ .Values.prometheus.prometheusSpec.maximumStartupDurationSeconds }}
 {{- end }}
   hostNetwork: {{ .Values.prometheus.prometheusSpec.hostNetwork }}
 {{- if .Values.prometheus.prometheusSpec.hostAliases }}

diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml
@@ -3873,6 +3873,13 @@ prometheus:
     ## Otherwise, use prometheus.prometheusSpec.additionalConfig (passed through tpl)
     additionalConfigString: ""
 
+    ## Defines the maximum time that the `prometheus` container's startup probe
+    ## will wait before being considered failed. The startup probe will return
+    ## success after the WAL replay is complete. If set, the value should be
+    ## greater than 60 (seconds). Otherwise it will be equal to 600 seconds (15
+    ## minutes).
+    maximumStartupDurationSeconds: 0
+
   additionalRulesForClusterRole: []
   #  - apiGroups: [ "" ]
   #    resources:

diff --git a/charts/prometheus-redis-exporter/Chart.yaml b/charts/prometheus-redis-exporter/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: v1.56.0
+appVersion: v1.57.0
 description: Prometheus exporter for Redis metrics
 name: prometheus-redis-exporter
-version: 6.1.0
+version: 6.1.1
 home: https://github.com/oliver006/redis_exporter
 sources:
   - https://github.com/oliver006/redis_exporter

diff --git a/charts/prometheus-systemd-exporter/Chart.yaml b/charts/prometheus-systemd-exporter/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: prometheus-systemd-exporter
 description: A Helm chart for prometheus systemd-exporter
 type: application
-version: 0.1.1
+version: 0.2.0
 appVersion: "0.6.0"
 home: https://github.com/prometheus-community/systemd_exporter
 sources:

diff --git a/charts/prometheus-systemd-exporter/templates/daemonset.yaml b/charts/prometheus-systemd-exporter/templates/daemonset.yaml
@@ -81,6 +81,9 @@ spec:
             - name: systemd
               mountPath: /host/systemd
               readOnly: true
+            {{- with .Values.extraVolumeMounts }}
+              {{- toYaml . | nindent 12 }}
+            {{- end }}
       hostNetwork: {{ .Values.hostNetwork }}
       hostPID: {{ .Values.hostPID }}
       {{- with .Values.affinity }}
@@ -102,3 +105,6 @@ spec:
         - name: systemd
           hostPath:
             path: /run/systemd
+        {{- with .Values.extraVolumes }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
diff --git a/charts/prometheus-systemd-exporter/values.yaml b/charts/prometheus-systemd-exporter/values.yaml
@@ -179,3 +179,12 @@ readinessProbe:
   periodSeconds: 10
   successThreshold: 1
   timeoutSeconds: 1
+
+extraVolumes: []
+  # - name: systemd-example
+  #   hostPath:
+  #     path: /var/run/example
+extraVolumeMounts: []
+  # - mountPath: /var/run/example
+  #   name: systemd-example
+  #   readOnly: true
diff --git a/charts/prometheus/Chart.lock b/charts/prometheus/Chart.lock
@@ -7,9 +7,9 @@ dependencies:
   version: 5.16.0
 - name: prometheus-node-exporter
   repository: https://prometheus-community.github.io/helm-charts
-  version: 4.25.0
+  version: 4.26.0
 - name: prometheus-pushgateway
   repository: https://prometheus-community.github.io/helm-charts
   version: 2.6.0
-digest: sha256:55b6f92e9b2615b8d96825f87214a8aa17114e1883c017fe2ca552302e65d09f
-generated: "2024-01-20T23:54:27.953216+02:00"
+digest: sha256:c04ed5d0a9f4673cdf8cf43d8c09990170bd3a0c30f4529e6a06f00ea6ff2d63
+generated: "2024-01-25T19:22:54.227295+02:00"
diff --git a/charts/prometheus/Chart.yaml b/charts/prometheus/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: prometheus
 appVersion: v2.49.1
-version: 25.10.0
+version: 25.11.0
 kubeVersion: ">=1.19.0-0"
 description: Prometheus is a monitoring system and time series database.
 home: https://prometheus.io/
@@ -34,7 +34,7 @@ dependencies:
     repository: https://prometheus-community.github.io/helm-charts
     condition: kube-state-metrics.enabled
   - name: prometheus-node-exporter
-    version: "4.25.*"
+    version: "4.26.*"
     repository: https://prometheus-community.github.io/helm-charts
     condition: prometheus-node-exporter.enabled
   - name: prometheus-pushgateway

diff --git a/charts/prometheus/values.yaml b/charts/prometheus/values.yaml
@@ -60,7 +60,7 @@ configmapReload:
     ##
     image:
       repository: quay.io/prometheus-operator/prometheus-config-reloader
-      tag: v0.70.0
+      tag: v0.71.2
       # When digest is set to a non-empty value, images will be pulled by digest (regardless of tag value).
       digest: ""
       pullPolicy: IfNotPresent