Skip to content

Commit b4e7db6

Browse files
authored
chore(chart-deps): update kube-prometheus-stack to version 79.9.0 (#2761)
1 parent 684519f commit b4e7db6

40 files changed

+255
-54
lines changed

apps.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ appsInfo:
6565
integration: App Platform uses Gitea as its default repository for App Platform configuration (values). Gitea can also be used by Teams to provide application code repositories. Access to Gitea is provided by the OIDC integration in App Platform. Members of the otomi-admin and team-admin group can seamlessly sign in to Gitea. When Argo CD is enabled, App Platform will automatically create a Gitops repository for each Team in Gitea.
6666
grafana:
6767
title: Grafana
68-
appVersion: 12.2.1
68+
appVersion: 12.3.0
6969
repo: https://github.com/grafana/grafana
7070
maintainers: Grafana Labs
7171
relatedLinks:

chart/chart-index/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ dependencies:
6565
version: v0.16.0
6666
repository: oci://ghcr.io/kserve/charts/kserve
6767
- name: kube-prometheus-stack
68-
version: 79.5.0
68+
version: 79.9.0
6969
repository: https://prometheus-community.github.io/helm-charts
7070
- name: kyverno
7171
version: 3.5.2

charts/kube-prometheus-stack/Chart.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ dependencies:
44
version: 0.0.0
55
- name: kube-state-metrics
66
repository: https://prometheus-community.github.io/helm-charts
7-
version: 6.4.1
7+
version: 6.4.2
88
- name: prometheus-node-exporter
99
repository: https://prometheus-community.github.io/helm-charts
10-
version: 4.49.1
10+
version: 4.49.2
1111
- name: grafana
1212
repository: https://grafana.github.io/helm-charts
13-
version: 10.1.4
13+
version: 10.2.0
1414
- name: prometheus-windows-exporter
1515
repository: https://prometheus-community.github.io/helm-charts
1616
version: 0.12.2
17-
digest: sha256:5182cd9a0191e1e629bf7d14951be06c9cdfbe147a938cf4e87d843081bcbe1b
18-
generated: "2025-11-11T16:45:57.311683289Z"
17+
digest: sha256:7e66999c109cf735c850c1fa341018edb43bbbb9dbe31a899a4bf918b5fe4033
18+
generated: "2025-11-28T16:43:27.964772353Z"

charts/kube-prometheus-stack/Chart.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ dependencies:
1818
- condition: kubeStateMetrics.enabled
1919
name: kube-state-metrics
2020
repository: https://prometheus-community.github.io/helm-charts
21-
version: 6.4.1
21+
version: 6.4.2
2222
- condition: nodeExporter.enabled
2323
name: prometheus-node-exporter
2424
repository: https://prometheus-community.github.io/helm-charts
25-
version: 4.49.1
25+
version: 4.49.2
2626
- condition: grafana.enabled
2727
name: grafana
2828
repository: https://grafana.github.io/helm-charts
29-
version: 10.1.4
29+
version: 10.2.0
3030
- condition: windowsMonitoring.enabled
3131
name: prometheus-windows-exporter
3232
repository: https://prometheus-community.github.io/helm-charts
@@ -72,4 +72,4 @@ sources:
7272
- https://github.com/prometheus-community/helm-charts
7373
- https://github.com/prometheus-operator/kube-prometheus
7474
type: application
75-
version: 79.5.0
75+
version: 79.9.0

charts/kube-prometheus-stack/charts/grafana/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ annotations:
66
- name: Upstream Project
77
url: https://github.com/grafana/grafana
88
apiVersion: v2
9-
appVersion: 12.2.1
9+
appVersion: 12.3.0
1010
description: The leading tool for querying and visualizing time series and metrics.
1111
home: https://grafana.com
1212
icon: https://artifacthub.io/image/b4fed1a7-6c8f-4945-b99d-096efa3e4116
@@ -34,4 +34,4 @@ sources:
3434
- https://github.com/grafana/grafana
3535
- https://github.com/grafana/helm-charts
3636
type: application
37-
version: 10.1.4
37+
version: 10.2.0

charts/kube-prometheus-stack/charts/grafana/templates/_pod.tpl

Lines changed: 204 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,13 @@ dnsConfig:
2525
{{- with .Values.priorityClassName }}
2626
priorityClassName: {{ . }}
2727
{{- end }}
28-
{{- if ( or (and .Values.persistence.enabled .Values.initChownData.enabled) .Values.dashboards .Values.extraInitContainers (and .Values.sidecar.alerts.enabled .Values.sidecar.alerts.initAlerts) (and .Values.sidecar.datasources.enabled .Values.sidecar.datasources.initDatasources) (and .Values.sidecar.notifiers.enabled .Values.sidecar.notifiers.initNotifiers)) }}
28+
{{- if ( or (and .Values.persistence.enabled .Values.initChownData.enabled)
29+
.Values.dashboards
30+
.Values.extraInitContainers
31+
(and .Values.sidecar.alerts.enabled .Values.sidecar.alerts.initAlerts)
32+
(and .Values.sidecar.datasources.enabled .Values.sidecar.datasources.initDatasources)
33+
(and .Values.sidecar.notifiers.enabled .Values.sidecar.notifiers.initNotifiers)
34+
(and .Values.sidecar.dashboards.enabled .Values.sidecar.dashboards.initDashboards)) }}
2935
initContainers:
3036
{{- end }}
3137
{{- if ( and .Values.persistence.enabled .Values.initChownData.enabled ) }}
@@ -208,7 +214,7 @@ initContainers:
208214
value: "true"
209215
{{- end }}
210216
- name: METHOD
211-
value: "LIST"
217+
value: {{ .Values.sidecar.datasources.watchMethod }}
212218
- name: LABEL
213219
value: "{{ tpl .Values.sidecar.datasources.label $root }}"
214220
{{- with .Values.sidecar.datasources.labelValue }}
@@ -223,22 +229,80 @@ initContainers:
223229
value: "/etc/grafana/provisioning/datasources"
224230
- name: RESOURCE
225231
value: {{ quote .Values.sidecar.datasources.resource }}
232+
{{- if .Values.sidecar.datasources.resourceName }}
233+
- name: RESOURCE_NAME
234+
value: {{ quote .Values.sidecar.datasources.resourceName }}
235+
{{- end }}
226236
{{- with .Values.sidecar.enableUniqueFilenames }}
227237
- name: UNIQUE_FILENAMES
228238
value: "{{ . }}"
229239
{{- end }}
230-
{{- if .Values.sidecar.datasources.searchNamespace }}
240+
{{- with .Values.sidecar.datasources.searchNamespace }}
231241
- name: NAMESPACE
232-
value: "{{ tpl (.Values.sidecar.datasources.searchNamespace | join ",") . }}"
242+
value: "{{ tpl (. | join ",") $root }}"
233243
{{- end }}
234-
{{- with .Values.sidecar.skipTlsVerify }}
244+
{{- if .Values.sidecar.skipTlsVerify }}
235245
- name: SKIP_TLS_VERIFY
236-
value: "{{ . }}"
246+
value: "{{ .Values.sidecar.skipTlsVerify }}"
237247
{{- end }}
238248
{{- with .Values.sidecar.datasources.script }}
239249
- name: SCRIPT
240250
value: {{ quote . }}
241251
{{- end }}
252+
{{- if and (not .Values.env.GF_SECURITY_ADMIN_USER) (not .Values.env.GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION) }}
253+
- name: REQ_USERNAME
254+
valueFrom:
255+
secretKeyRef:
256+
name: {{ (tpl .Values.admin.existingSecret .) | default (include "grafana.fullname" .) }}
257+
key: {{ .Values.admin.userKey | default "admin-user" }}
258+
{{- end }}
259+
{{- if and (not .Values.env.GF_SECURITY_ADMIN_PASSWORD) (not .Values.env.GF_SECURITY_ADMIN_PASSWORD__FILE) (not .Values.env.GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION) }}
260+
- name: REQ_PASSWORD
261+
valueFrom:
262+
secretKeyRef:
263+
name: {{ (tpl .Values.admin.existingSecret .) | default (include "grafana.fullname" .) }}
264+
key: {{ .Values.admin.passwordKey | default "admin-password" }}
265+
{{- end }}
266+
{{- if not .Values.sidecar.datasources.skipReload }}
267+
- name: REQ_URL
268+
value: {{ .Values.sidecar.datasources.reloadURL }}
269+
- name: REQ_METHOD
270+
value: POST
271+
{{- end }}
272+
{{- if .Values.sidecar.datasources.watchServerTimeout }}
273+
{{- if ne .Values.sidecar.datasources.watchMethod "WATCH" }}
274+
{{- fail (printf "Cannot use .Values.sidecar.datasources.watchServerTimeout with .Values.sidecar.datasources.watchMethod %s" .Values.sidecar.datasources.watchMethod) }}
275+
{{- end }}
276+
- name: WATCH_SERVER_TIMEOUT
277+
value: "{{ .Values.sidecar.datasources.watchServerTimeout }}"
278+
{{- end }}
279+
{{- if .Values.sidecar.datasources.watchClientTimeout }}
280+
{{- if ne .Values.sidecar.datasources.watchMethod "WATCH" }}
281+
{{- fail (printf "Cannot use .Values.sidecar.datasources.watchClientTimeout with .Values.sidecar.datasources.watchMethod %s" .Values.sidecar.datasources.watchMethod) }}
282+
{{- end }}
283+
- name: WATCH_CLIENT_TIMEOUT
284+
value: "{{ .Values.sidecar.datasources.watchClientTimeout }}"
285+
{{- end }}
286+
{{- if .Values.sidecar.datasources.maxTotalRetries }}
287+
- name: REQ_RETRY_TOTAL
288+
value: "{{ .Values.sidecar.datasources.maxTotalRetries }}"
289+
{{- end }}
290+
{{- if .Values.sidecar.datasources.maxConnectRetries }}
291+
- name: REQ_RETRY_CONNECT
292+
value: "{{ .Values.sidecar.datasources.maxConnectRetries }}"
293+
{{- end }}
294+
{{- if .Values.sidecar.datasources.maxReadRetries }}
295+
- name: REQ_RETRY_READ
296+
value: "{{ .Values.sidecar.datasources.maxReadRetries }}"
297+
{{- end }}
298+
{{- with .Values.sidecar.livenessProbe }}
299+
livenessProbe:
300+
{{- toYaml . | nindent 6 }}
301+
{{- end }}
302+
{{- with .Values.sidecar.readinessProbe }}
303+
readinessProbe:
304+
{{- toYaml . | nindent 6 }}
305+
{{- end }}
242306
{{- with .Values.sidecar.resources }}
243307
resources:
244308
{{- toYaml . | nindent 6 }}
@@ -327,6 +391,138 @@ initContainers:
327391
{{- toYaml . | trim | nindent 6 }}
328392
{{- end }}
329393
{{- end}}
394+
{{- if and .Values.sidecar.dashboards.enabled .Values.sidecar.dashboards.initDashboards }}
395+
- name: {{ include "grafana.name" . }}-init-sc-dashboard
396+
{{- $registry := .Values.global.imageRegistry | default .Values.sidecar.image.registry -}}
397+
{{- if .Values.sidecar.image.sha }}
398+
image: "{{ $registry }}/{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}@sha256:{{ .Values.sidecar.image.sha }}"
399+
{{- else }}
400+
image: "{{ $registry }}/{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}"
401+
{{- end }}
402+
imagePullPolicy: {{ .Values.sidecar.imagePullPolicy }}
403+
env:
404+
{{- range $key, $value := .Values.sidecar.dashboards.env }}
405+
- name: "{{ $key }}"
406+
value: "{{ $value }}"
407+
{{- end }}
408+
{{- range $key, $value := .Values.sidecar.dashboards.envValueFrom }}
409+
- name: {{ $key | quote }}
410+
valueFrom:
411+
{{- tpl (toYaml $value) $ | nindent 10 }}
412+
{{- end }}
413+
{{- if .Values.sidecar.dashboards.ignoreAlreadyProcessed }}
414+
- name: IGNORE_ALREADY_PROCESSED
415+
value: "true"
416+
{{- end }}
417+
- name: METHOD
418+
value: {{ .Values.sidecar.dashboards.watchMethod }}
419+
- name: LABEL
420+
value: "{{ tpl .Values.sidecar.dashboards.label $root }}"
421+
{{- with .Values.sidecar.dashboards.labelValue }}
422+
- name: LABEL_VALUE
423+
value: {{ quote (tpl . $root) }}
424+
{{- end }}
425+
{{- if or .Values.sidecar.logLevel .Values.sidecar.dashboards.logLevel }}
426+
- name: LOG_LEVEL
427+
value: {{ default .Values.sidecar.logLevel .Values.sidecar.dashboards.logLevel }}
428+
{{- end }}
429+
- name: FOLDER
430+
value: "{{ .Values.sidecar.dashboards.folder }}{{- with .Values.sidecar.dashboards.defaultFolderName }}/{{ . }}{{- end }}"
431+
- name: RESOURCE
432+
value: {{ quote .Values.sidecar.dashboards.resource }}
433+
{{- if .Values.sidecar.dashboards.resourceName }}
434+
- name: RESOURCE_NAME
435+
value: {{ quote .Values.sidecar.dashboards.resourceName }}
436+
{{- end }}
437+
{{- with .Values.sidecar.enableUniqueFilenames }}
438+
- name: UNIQUE_FILENAMES
439+
value: "{{ . }}"
440+
{{- end }}
441+
{{- with .Values.sidecar.dashboards.searchNamespace }}
442+
- name: NAMESPACE
443+
value: "{{ tpl (. | join ",") $root }}"
444+
{{- end }}
445+
{{- with .Values.sidecar.skipTlsVerify }}
446+
- name: SKIP_TLS_VERIFY
447+
value: "{{ . }}"
448+
{{- end }}
449+
{{- with .Values.sidecar.dashboards.folderAnnotation }}
450+
- name: FOLDER_ANNOTATION
451+
value: "{{ . }}"
452+
{{- end }}
453+
{{- with .Values.sidecar.dashboards.script }}
454+
- name: SCRIPT
455+
value: {{ quote . }}
456+
{{- end }}
457+
{{- if not .Values.sidecar.dashboards.skipReload }}
458+
{{- if and (not .Values.env.GF_SECURITY_ADMIN_USER) (not .Values.env.GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION) }}
459+
- name: REQ_USERNAME
460+
valueFrom:
461+
secretKeyRef:
462+
name: {{ (tpl .Values.admin.existingSecret .) | default (include "grafana.fullname" .) }}
463+
key: {{ .Values.admin.userKey | default "admin-user" }}
464+
{{- end }}
465+
{{- if and (not .Values.env.GF_SECURITY_ADMIN_PASSWORD) (not .Values.env.GF_SECURITY_ADMIN_PASSWORD__FILE) (not .Values.env.GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION) }}
466+
- name: REQ_PASSWORD
467+
valueFrom:
468+
secretKeyRef:
469+
name: {{ (tpl .Values.admin.existingSecret .) | default (include "grafana.fullname" .) }}
470+
key: {{ .Values.admin.passwordKey | default "admin-password" }}
471+
{{- end }}
472+
- name: REQ_URL
473+
value: {{ .Values.sidecar.dashboards.reloadURL }}
474+
- name: REQ_METHOD
475+
value: POST
476+
{{- end }}
477+
{{- if .Values.sidecar.dashboards.watchServerTimeout }}
478+
{{- if ne .Values.sidecar.dashboards.watchMethod "WATCH" }}
479+
{{- fail (printf "Cannot use .Values.sidecar.dashboards.watchServerTimeout with .Values.sidecar.dashboards.watchMethod %s" .Values.sidecar.dashboards.watchMethod) }}
480+
{{- end }}
481+
- name: WATCH_SERVER_TIMEOUT
482+
value: "{{ .Values.sidecar.dashboards.watchServerTimeout }}"
483+
{{- end }}
484+
{{- if .Values.sidecar.dashboards.watchClientTimeout }}
485+
{{- if ne .Values.sidecar.dashboards.watchMethod "WATCH" }}
486+
{{- fail (printf "Cannot use .Values.sidecar.dashboards.watchClientTimeout with .Values.sidecar.dashboards.watchMethod %s" .Values.sidecar.dashboards.watchMethod) }}
487+
{{- end }}
488+
- name: WATCH_CLIENT_TIMEOUT
489+
value: {{ .Values.sidecar.dashboards.watchClientTimeout | quote }}
490+
{{- end }}
491+
{{- if .Values.sidecar.dashboards.maxTotalRetries }}
492+
- name: REQ_RETRY_TOTAL
493+
value: "{{ .Values.sidecar.dashboards.maxTotalRetries }}"
494+
{{- end }}
495+
{{- if .Values.sidecar.dashboards.maxConnectRetries }}
496+
- name: REQ_RETRY_CONNECT
497+
value: "{{ .Values.sidecar.dashboards.maxConnectRetries }}"
498+
{{- end }}
499+
{{- if .Values.sidecar.dashboards.maxReadRetries }}
500+
- name: REQ_RETRY_READ
501+
value: "{{ .Values.sidecar.dashboards.maxReadRetries }}"
502+
{{- end }}
503+
{{- with .Values.sidecar.livenessProbe }}
504+
livenessProbe:
505+
{{- toYaml . | nindent 6 }}
506+
{{- end }}
507+
{{- with .Values.sidecar.readinessProbe }}
508+
readinessProbe:
509+
{{- toYaml . | nindent 6 }}
510+
{{- end }}
511+
{{- with .Values.sidecar.resources }}
512+
resources:
513+
{{- toYaml . | nindent 6 }}
514+
{{- end }}
515+
{{- with .Values.sidecar.securityContext }}
516+
securityContext:
517+
{{- toYaml . | nindent 6 }}
518+
{{- end }}
519+
volumeMounts:
520+
- name: sc-dashboard-volume
521+
mountPath: {{ .Values.sidecar.dashboards.folder | quote }}
522+
{{- with .Values.sidecar.dashboards.extraMounts }}
523+
{{- toYaml . | trim | nindent 6 }}
524+
{{- end }}
525+
{{- end}}
330526
{{- with .Values.extraInitContainers }}
331527
{{- tpl (toYaml .) $root | nindent 2 }}
332528
{{- end }}
@@ -466,7 +662,7 @@ containers:
466662
{{- toYaml . | trim | nindent 6 }}
467663
{{- end }}
468664
{{- end}}
469-
{{- if .Values.sidecar.dashboards.enabled }}
665+
{{- if and .Values.sidecar.dashboards.enabled (not .Values.sidecar.dashboards.initDashboards) }}
470666
- name: {{ include "grafana.name" . }}-sc-dashboard
471667
{{- $registry := .Values.global.imageRegistry | default .Values.sidecar.image.registry -}}
472668
{{- if .Values.sidecar.image.sha }}
@@ -726,7 +922,7 @@ containers:
726922
{{- toYaml . | trim | nindent 6 }}
727923
{{- end }}
728924
{{- end}}
729-
{{- if .Values.sidecar.notifiers.enabled }}
925+
{{- if and .Values.sidecar.notifiers.enabled (not .Values.sidecar.notifiers.initNotifiers) }}
730926
- name: {{ include "grafana.name" . }}-sc-notifiers
731927
{{- $registry := .Values.global.imageRegistry | default .Values.sidecar.image.registry -}}
732928
{{- if .Values.sidecar.image.sha }}

charts/kube-prometheus-stack/charts/grafana/values.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1136,6 +1136,9 @@ sidecar:
11361136
# Otherwise, it's executed as is. Shebangs known to work are #!/bin/sh and #!/usr/bin/env python
11371137
script: null
11381138
skipReload: false
1139+
# This is needed if skipReload is true, to load any dashboards defined at startup time.
1140+
# Deploy the dashboard sidecar as an initContainer.
1141+
initDashboards: false
11391142
# watchServerTimeout: request to the server, asking it to cleanly close the connection after that.
11401143
# defaults to 60sec; much higher values like 3600 seconds (1h) are feasible for non-Azure K8S
11411144
# watchServerTimeout: 3600

charts/kube-prometheus-stack/charts/kube-state-metrics/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ name: kube-state-metrics
2626
sources:
2727
- https://github.com/kubernetes/kube-state-metrics/
2828
type: application
29-
version: 6.4.1
29+
version: 6.4.2

charts/kube-prometheus-stack/charts/kube-state-metrics/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ kubeRBACProxy:
106106
image:
107107
registry: quay.io
108108
repository: brancz/kube-rbac-proxy
109-
tag: v0.20.0
109+
tag: v0.20.1
110110
sha: ""
111111
pullPolicy: IfNotPresent
112112

charts/kube-prometheus-stack/charts/prometheus-node-exporter/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ name: prometheus-node-exporter
2525
sources:
2626
- https://github.com/prometheus/node_exporter/
2727
type: application
28-
version: 4.49.1
28+
version: 4.49.2

0 commit comments

Comments
 (0)