From c863ace2e506dbcdfd2ddd9904350f1cfbde8e7e Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Thu, 21 Mar 2024 10:59:48 +0200 Subject: [PATCH 01/17] bump prometheus to 2.51.0 (#4373) Signed-off-by: drfaust92 --- charts/kube-prometheus-stack/Chart.yaml | 2 +- charts/kube-prometheus-stack/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml index 3e29adeb13a0..8766242a9208 100644 --- 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: 57.0.3 +version: 57.1.0 appVersion: v0.72.0 kubeVersion: ">=1.19.0-0" home: https://github.com/prometheus-operator/kube-prometheus diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml index d39ba0110c4d..5798db2ed47f 100644 --- a/charts/kube-prometheus-stack/values.yaml +++ b/charts/kube-prometheus-stack/values.yaml @@ -3354,7 +3354,7 @@ prometheus: image: registry: quay.io repository: prometheus/prometheus - tag: v2.50.1 + tag: v2.51.0 sha: "" ## Tolerations for use with node taints From cfa19f0510c617842012663e8b13efd260409541 Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Thu, 21 Mar 2024 11:36:33 +0200 Subject: [PATCH 02/17] bump to 0.15.0 (#4376) Signed-off-by: drfaust92 --- charts/prometheus-stackdriver-exporter/Chart.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/charts/prometheus-stackdriver-exporter/Chart.yaml b/charts/prometheus-stackdriver-exporter/Chart.yaml index d49fb67b836e..8506ec28d307 100644 --- a/charts/prometheus-stackdriver-exporter/Chart.yaml +++ b/charts/prometheus-stackdriver-exporter/Chart.yaml @@ -1,10 +1,11 @@ apiVersion: v1 description: Stackdriver exporter for Prometheus name: prometheus-stackdriver-exporter -version: 4.4.1 -appVersion: v0.14.1 +version: 4.5.0 +appVersion: v0.15.0 home: https://www.stackdriver.com/ sources: + - https://github.com/prometheus-community/stackdriver_exporter - https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus-stackdriver-exporter keywords: - metrics From 8d5472dd82b4b8a48b44651bbc4e9734fa0c128c Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Thu, 21 Mar 2024 13:36:20 +0200 Subject: [PATCH 03/17] [kube-state-metrics] bump to 2.11.0 (#4371) Signed-off-by: drfaust92 --- charts/kube-state-metrics/Chart.yaml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/charts/kube-state-metrics/Chart.yaml b/charts/kube-state-metrics/Chart.yaml index f6596eea8f2f..37fb0dfb0329 100644 --- a/charts/kube-state-metrics/Chart.yaml +++ b/charts/kube-state-metrics/Chart.yaml @@ -2,23 +2,23 @@ apiVersion: v2 name: kube-state-metrics description: Install kube-state-metrics to generate and expose cluster-level metrics keywords: -- metric -- monitoring -- prometheus -- kubernetes + - metric + - monitoring + - prometheus + - kubernetes type: application -version: 5.16.4 -appVersion: 2.10.1 +version: 5.17.0 +appVersion: 2.11.0 home: https://github.com/kubernetes/kube-state-metrics/ sources: -- https://github.com/kubernetes/kube-state-metrics/ + - https://github.com/kubernetes/kube-state-metrics/ maintainers: -- name: tariq1890 - email: tariq.ibrahim@mulesoft.com -- name: mrueg - email: manuel@rueg.eu -- name: dotdc - email: david@0xdc.me + - name: tariq1890 + email: tariq.ibrahim@mulesoft.com + - name: mrueg + email: manuel@rueg.eu + - name: dotdc + email: david@0xdc.me annotations: "artifacthub.io/license": Apache-2.0 "artifacthub.io/links": | From 8f8bbfcf33a7628dc7c67b29a05299f557d21b2a Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Thu, 21 Mar 2024 22:29:36 +0200 Subject: [PATCH 04/17] [prometheus-operator-admission-webhook] bump 0.72.0 (#4374) Signed-off-by: drfaust92 --- charts/prometheus-operator-admission-webhook/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/prometheus-operator-admission-webhook/Chart.yaml b/charts/prometheus-operator-admission-webhook/Chart.yaml index 68a8c997e492..51626e2de135 100644 --- a/charts/prometheus-operator-admission-webhook/Chart.yaml +++ b/charts/prometheus-operator-admission-webhook/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: Prometheus Operator Admission Webhook name: prometheus-operator-admission-webhook -version: 0.10.1 -appVersion: 0.71.2 +version: 0.11.0 +appVersion: 0.72.0 home: https://github.com/prometheus-operator/prometheus-operator icon: https://github.com/prometheus-operator/prometheus-operator/raw/main/Documentation/logos/prometheus-operator-logo.png keywords: From 862870fc3c847e32479b509e511584d5283126a3 Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Sat, 23 Mar 2024 15:33:51 +0200 Subject: [PATCH 05/17] [prometheus] bump to 2.51.0 + deps (#4372) * bump to 2.51.0 + deps Signed-off-by: drfaust92 * bump to prom 2.51.0 + deps Signed-off-by: drfaust92 * bump deps Signed-off-by: drfaust92 --------- Signed-off-by: drfaust92 --- charts/prometheus/Chart.lock | 10 +++++----- charts/prometheus/Chart.yaml | 10 +++++----- charts/prometheus/values.yaml | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/charts/prometheus/Chart.lock b/charts/prometheus/Chart.lock index ec645e9db143..568062d83e9a 100644 --- a/charts/prometheus/Chart.lock +++ b/charts/prometheus/Chart.lock @@ -1,15 +1,15 @@ dependencies: - name: alertmanager repository: https://prometheus-community.github.io/helm-charts - version: 1.9.0 + version: 1.10.0 - name: kube-state-metrics repository: https://prometheus-community.github.io/helm-charts - version: 5.16.4 + version: 5.17.0 - name: prometheus-node-exporter repository: https://prometheus-community.github.io/helm-charts - version: 4.30.3 + version: 4.31.0 - name: prometheus-pushgateway repository: https://prometheus-community.github.io/helm-charts version: 2.8.0 -digest: sha256:23062baabef57dc60e08aaec1882cdde4f84ec9d2807573368b7e86ec1fa89f0 -generated: "2024-03-08T09:36:45.247714358Z" +digest: sha256:885a96865c58be0d6a4c12b57a751bc58d657c7b4b0442882b3d8003a86d3174 +generated: "2024-03-21T14:31:16.69152+02:00" diff --git a/charts/prometheus/Chart.yaml b/charts/prometheus/Chart.yaml index d729a3206b13..7ee70c3c22ab 100644 --- a/charts/prometheus/Chart.yaml +++ b/charts/prometheus/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: prometheus -appVersion: v2.50.1 -version: 25.17.0 +appVersion: v2.51.0 +version: 25.18.0 kubeVersion: ">=1.19.0-0" description: Prometheus is a monitoring system and time series database. home: https://prometheus.io/ @@ -26,15 +26,15 @@ maintainers: type: application dependencies: - name: alertmanager - version: "1.9.*" + version: "1.10.*" repository: https://prometheus-community.github.io/helm-charts condition: alertmanager.enabled - name: kube-state-metrics - version: "5.16.*" + version: "5.17.*" repository: https://prometheus-community.github.io/helm-charts condition: kube-state-metrics.enabled - name: prometheus-node-exporter - version: "4.30.*" + version: "4.31.*" 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 index 45e2b3313f88..4a0fc82ce5ab 100644 --- 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.71.2 + tag: v0.72.0 # When digest is set to a non-empty value, images will be pulled by digest (regardless of tag value). digest: "" pullPolicy: IfNotPresent From a7a20477fb84113e3a4302b4589eb4343db0a8b3 Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Sat, 23 Mar 2024 15:56:43 +0200 Subject: [PATCH 06/17] [kube-state-metrics] bump kube-rbac-proxy to support K8s 1.28 (#4384) Signed-off-by: drfaust92 --- charts/kube-state-metrics/Chart.yaml | 2 +- charts/kube-state-metrics/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/kube-state-metrics/Chart.yaml b/charts/kube-state-metrics/Chart.yaml index 37fb0dfb0329..d51f8b956d25 100644 --- a/charts/kube-state-metrics/Chart.yaml +++ b/charts/kube-state-metrics/Chart.yaml @@ -7,7 +7,7 @@ keywords: - prometheus - kubernetes type: application -version: 5.17.0 +version: 5.18.0 appVersion: 2.11.0 home: https://github.com/kubernetes/kube-state-metrics/ sources: diff --git a/charts/kube-state-metrics/values.yaml b/charts/kube-state-metrics/values.yaml index 75aa2f7e9184..443f309a279d 100644 --- a/charts/kube-state-metrics/values.yaml +++ b/charts/kube-state-metrics/values.yaml @@ -99,7 +99,7 @@ kubeRBACProxy: image: registry: quay.io repository: brancz/kube-rbac-proxy - tag: v0.14.0 + tag: v0.16.0 sha: "" pullPolicy: IfNotPresent From 108f1f6266ba1bce54ee990fb360b268602562bf Mon Sep 17 00:00:00 2001 From: Alexandre NICOLAIE Date: Sat, 23 Mar 2024 15:59:02 +0100 Subject: [PATCH 07/17] [kube-prometheus-stack] Add `node-exporter` RBAC Proxy rule to Prometheus ClusterRole (#3946) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jan-Otto Kröpke --- charts/kube-prometheus-stack/Chart.yaml | 2 +- .../kube-prometheus-stack/ci/03-non-defaults-values.yaml | 6 +++++- .../templates/prometheus/clusterrole.yaml | 7 +++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml index 8766242a9208..a69e51868de1 100644 --- 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: 57.1.0 +version: 57.1.1 appVersion: v0.72.0 kubeVersion: ">=1.19.0-0" home: https://github.com/prometheus-operator/kube-prometheus diff --git a/charts/kube-prometheus-stack/ci/03-non-defaults-values.yaml b/charts/kube-prometheus-stack/ci/03-non-defaults-values.yaml index 8731002589da..18ad385989c9 100644 --- a/charts/kube-prometheus-stack/ci/03-non-defaults-values.yaml +++ b/charts/kube-prometheus-stack/ci/03-non-defaults-values.yaml @@ -79,5 +79,9 @@ kubeProxy: k8s-app: kube-proxy nodeExporter: - enabled: false + enabled: true forceDeployDashboards: true + +prometheus-node-exporter: + kubeRBACProxy: + enabled: true diff --git a/charts/kube-prometheus-stack/templates/prometheus/clusterrole.yaml b/charts/kube-prometheus-stack/templates/prometheus/clusterrole.yaml index 3585b5db1151..249144d8013c 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/clusterrole.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/clusterrole.yaml @@ -24,6 +24,13 @@ rules: verbs: ["get", "list", "watch"] - nonResourceURLs: ["/metrics", "/metrics/cadvisor"] verbs: ["get"] +{{/* fix(#3338): add required rules to use node-exporter with the RBAC proxy */}} +{{- if and .Values.nodeExporter.enabled (index .Values "prometheus-node-exporter").kubeRBACProxy.enabled }} +- apiGroups: [ "" ] + resources: + - services/{{ include "prometheus-node-exporter.fullname" (index .Subcharts "prometheus-node-exporter") }} + verbs: [ "get", "list", "watch" ] +{{- end }} {{- if .Values.prometheus.additionalRulesForClusterRole }} {{ toYaml .Values.prometheus.additionalRulesForClusterRole | indent 0 }} {{- end }} From 7fee9f864fdbbdace8a9b3cf4827c5663b4867f6 Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Mon, 25 Mar 2024 05:49:54 +0200 Subject: [PATCH 08/17] bump kube-rbac-proxy to support K8s 1.28 (#4385) Signed-off-by: drfaust92 --- charts/prometheus-node-exporter/Chart.yaml | 2 +- charts/prometheus-node-exporter/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/prometheus-node-exporter/Chart.yaml b/charts/prometheus-node-exporter/Chart.yaml index 3f502dab141a..fb82cbf659b1 100644 --- a/charts/prometheus-node-exporter/Chart.yaml +++ b/charts/prometheus-node-exporter/Chart.yaml @@ -6,7 +6,7 @@ keywords: - prometheus - exporter type: application -version: 4.31.0 +version: 4.32.0 appVersion: 1.7.0 home: https://github.com/prometheus/node_exporter/ sources: diff --git a/charts/prometheus-node-exporter/values.yaml b/charts/prometheus-node-exporter/values.yaml index 8246df236376..615fc6cea252 100644 --- a/charts/prometheus-node-exporter/values.yaml +++ b/charts/prometheus-node-exporter/values.yaml @@ -45,7 +45,7 @@ kubeRBACProxy: image: registry: quay.io repository: brancz/kube-rbac-proxy - tag: v0.15.0 + tag: v0.16.0 sha: "" pullPolicy: IfNotPresent From df4680cbf39c4fca89f1b9918e11aad5b9890b58 Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Mon, 25 Mar 2024 20:01:36 +0200 Subject: [PATCH 09/17] [prometheus-pgbouncer-exporter] pin image + use appVersion correctly (#4375) * pin image + use appVersion correctly Signed-off-by: drfaust92 * pin image + use appVersion correctly Signed-off-by: drfaust92 * pin image + use appVersion correctly Signed-off-by: drfaust92 --------- Signed-off-by: drfaust92 --- .../prometheus-pgbouncer-exporter/Chart.yaml | 28 +++++++++---------- .../prometheus-pgbouncer-exporter/values.yaml | 3 +- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/charts/prometheus-pgbouncer-exporter/Chart.yaml b/charts/prometheus-pgbouncer-exporter/Chart.yaml index 8be1ef806b77..270c7fea610f 100644 --- a/charts/prometheus-pgbouncer-exporter/Chart.yaml +++ b/charts/prometheus-pgbouncer-exporter/Chart.yaml @@ -1,23 +1,23 @@ apiVersion: v2 -appVersion: "1.18.0" +appVersion: "v0.7.0" description: A Helm chart for prometheus pgbouncer-exporter name: prometheus-pgbouncer-exporter -version: 0.1.1 +version: 0.2.0 home: https://github.com/prometheus-community/pgbouncer_exporter sources: -- https://github.com/prometheus-community/pgbouncer_exporter + - https://github.com/prometheus-community/pgbouncer_exporter keywords: -- pgbouncer -- prometheus -- exporter + - pgbouncer + - prometheus + - exporter maintainers: -- email: stewart.shea@gmail.com - name: stewartshea -- email: rootsandtrees@posteo.de - name: zeritti + - email: stewart.shea@gmail.com + name: stewartshea + - email: rootsandtrees@posteo.de + name: zeritti type: application dependencies: -- name: postgresql - version: "~12.2.2" - repository: https://charts.bitnami.com/bitnami - condition: postgresql.enabled + - name: postgresql + version: "~15.0.0" + repository: https://charts.bitnami.com/bitnami + condition: postgresql.enabled diff --git a/charts/prometheus-pgbouncer-exporter/values.yaml b/charts/prometheus-pgbouncer-exporter/values.yaml index 96cec1210ca2..4641c394f1ec 100644 --- a/charts/prometheus-pgbouncer-exporter/values.yaml +++ b/charts/prometheus-pgbouncer-exporter/values.yaml @@ -4,7 +4,8 @@ replicaCount: 1 image: repository: quay.io/prometheuscommunity/pgbouncer-exporter - tag: latest + # if not set appVersion field from Chart.yaml is used + tag: "" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. From 457c00097b18f46714f852030a48a5d1d368c5e6 Mon Sep 17 00:00:00 2001 From: Max Gautier Date: Tue, 26 Mar 2024 09:42:55 +0000 Subject: [PATCH 10/17] [kube-prometheus-stack] Remove outdated PDB warning (#4392) --- charts/kube-prometheus-stack/Chart.yaml | 2 +- charts/kube-prometheus-stack/values.yaml | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml index a69e51868de1..4c33e95333e3 100644 --- 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: 57.1.1 +version: 57.1.2 appVersion: v0.72.0 kubeVersion: ">=1.19.0-0" home: https://github.com/prometheus-operator/kube-prometheus diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml index 5798db2ed47f..9ed9729b4227 100644 --- a/charts/kube-prometheus-stack/values.yaml +++ b/charts/kube-prometheus-stack/values.yaml @@ -286,8 +286,6 @@ alertmanager: ## Configure pod disruption budgets for Alertmanager ## ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/#specifying-a-poddisruptionbudget - ## This configuration is immutable once created and will require the PDB to be deleted to be changed - ## https://github.com/kubernetes/kubernetes/issues/45398 ## podDisruptionBudget: enabled: false @@ -3076,8 +3074,6 @@ prometheus: ## Configure pod disruption budgets for Prometheus ## ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/#specifying-a-poddisruptionbudget - ## This configuration is immutable once created and will require the PDB to be deleted to be changed - ## https://github.com/kubernetes/kubernetes/issues/45398 ## podDisruptionBudget: enabled: false @@ -4176,8 +4172,6 @@ thanosRuler: ## Configure pod disruption budgets for ThanosRuler ## ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/#specifying-a-poddisruptionbudget - ## This configuration is immutable once created and will require the PDB to be deleted to be changed - ## https://github.com/kubernetes/kubernetes/issues/45398 ## podDisruptionBudget: enabled: false From e910ea74ee6b2a1ae800a9927ac1c221519334fd Mon Sep 17 00:00:00 2001 From: David Calvert Date: Wed, 27 Mar 2024 16:52:26 +0100 Subject: [PATCH 11/17] [kube-prometheus-stack] bump kube-state-metrics to 5.18.* (#4397) --- charts/kube-prometheus-stack/Chart.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml index 4c33e95333e3..352aac39fd49 100644 --- 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: 57.1.2 +version: 57.2.0 appVersion: v0.72.0 kubeVersion: ">=1.19.0-0" home: https://github.com/prometheus-operator/kube-prometheus @@ -45,11 +45,11 @@ dependencies: version: "0.0.0" condition: crds.enabled - name: kube-state-metrics - version: "5.16.*" + version: "5.18.*" repository: https://prometheus-community.github.io/helm-charts condition: kubeStateMetrics.enabled - name: prometheus-node-exporter - version: "4.31.*" + version: "4.32.*" repository: https://prometheus-community.github.io/helm-charts condition: nodeExporter.enabled - name: grafana From b3aa1379fdec97cd8418b433413c3c40ea3caeb2 Mon Sep 17 00:00:00 2001 From: rashmichandrashekar Date: Wed, 27 Mar 2024 13:25:05 -0700 Subject: [PATCH 12/17] [prometheus-kafka-exporter] add ability to customize apiversion in service monitor (#4389) Signed-off-by: Rashmi Chandrashekar Co-authored-by: MH Co-authored-by: zeritti <47476160+zeritti@users.noreply.github.com> --- charts/prometheus-kafka-exporter/Chart.yaml | 2 +- charts/prometheus-kafka-exporter/templates/servicemonitor.yaml | 2 +- charts/prometheus-kafka-exporter/values.yaml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/charts/prometheus-kafka-exporter/Chart.yaml b/charts/prometheus-kafka-exporter/Chart.yaml index 1939f6c7e4b8..ed11822b387b 100644 --- a/charts/prometheus-kafka-exporter/Chart.yaml +++ b/charts/prometheus-kafka-exporter/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "v1.7.0" description: A Helm chart to export the metrics from Kafka in Prometheus format using the kafka-exporter from https://github.com/danielqsj/kafka_exporter name: prometheus-kafka-exporter home: https://github.com/danielqsj/kafka_exporter -version: 2.9.0 +version: 2.10.0 kubeVersion: ">=1.19.0-0" sources: - https://gkarthiks.github.io/helm-charts/charts/prometheus-kafka-exporter diff --git a/charts/prometheus-kafka-exporter/templates/servicemonitor.yaml b/charts/prometheus-kafka-exporter/templates/servicemonitor.yaml index 73d2399f1458..6060dd74e774 100644 --- a/charts/prometheus-kafka-exporter/templates/servicemonitor.yaml +++ b/charts/prometheus-kafka-exporter/templates/servicemonitor.yaml @@ -1,5 +1,5 @@ {{- if .Values.prometheus.serviceMonitor.enabled }} -apiVersion: monitoring.coreos.com/v1 +apiVersion: {{ .Values.prometheus.serviceMonitor.apiVersion }} kind: ServiceMonitor metadata: name: {{ include "prometheus-kafka-exporter.fullname" . }} diff --git a/charts/prometheus-kafka-exporter/values.yaml b/charts/prometheus-kafka-exporter/values.yaml index fa9768393acb..3c522b4e898e 100644 --- a/charts/prometheus-kafka-exporter/values.yaml +++ b/charts/prometheus-kafka-exporter/values.yaml @@ -101,6 +101,7 @@ prometheus: serviceMonitor: enabled: false namespace: monitoring + apiVersion: "monitoring.coreos.com/v1" interval: "30s" # If serviceMonitor is enabled and you want prometheus to automatically register # target using serviceMonitor, add additionalLabels with prometheus release name From e908c1a8f64f03d484690934c201db76af4c910c Mon Sep 17 00:00:00 2001 From: rashmichandrashekar Date: Thu, 28 Mar 2024 10:53:28 -0700 Subject: [PATCH 13/17] [prometheus-elasticsearch-exporter] add ability to customize apiversion for pod/service monitor (#4388) * Adding support for azure managed prometheus Signed-off-by: Rashmi Chandrashekar * addressing comments Signed-off-by: Rashmi Chandrashekar * removing azmon value flag Signed-off-by: Rashmi Chandrashekar * removing add Signed-off-by: Rashmi Chandrashekar * removing checks Signed-off-by: Rashmi Chandrashekar --------- Signed-off-by: Rashmi Chandrashekar --- charts/prometheus-elasticsearch-exporter/Chart.yaml | 2 +- .../prometheus-elasticsearch-exporter/templates/podmonitor.yaml | 2 +- .../templates/servicemonitor.yaml | 2 +- charts/prometheus-elasticsearch-exporter/values.yaml | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/charts/prometheus-elasticsearch-exporter/Chart.yaml b/charts/prometheus-elasticsearch-exporter/Chart.yaml index daf6a25fb784..d8a4ba31d04c 100644 --- a/charts/prometheus-elasticsearch-exporter/Chart.yaml +++ b/charts/prometheus-elasticsearch-exporter/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: Elasticsearch stats exporter for Prometheus name: prometheus-elasticsearch-exporter -version: 5.6.0 +version: 5.7.0 kubeVersion: ">=1.10.0-0" appVersion: "v1.7.0" home: https://github.com/prometheus-community/elasticsearch_exporter diff --git a/charts/prometheus-elasticsearch-exporter/templates/podmonitor.yaml b/charts/prometheus-elasticsearch-exporter/templates/podmonitor.yaml index fe4fb30cc615..666f5d32f620 100644 --- a/charts/prometheus-elasticsearch-exporter/templates/podmonitor.yaml +++ b/charts/prometheus-elasticsearch-exporter/templates/podmonitor.yaml @@ -1,7 +1,7 @@ {{- if and .Values.podMonitor.enabled .Values.serviceMonitor.enabled }} {{- fail "Either .Values.podMonitor.enabled or .Values.serviceMonitor.enabled can be enabled at a time, but not both." }} {{- else if .Values.podMonitor.enabled }} -apiVersion: monitoring.coreos.com/v1 +apiVersion: {{ .Values.podMonitor.apiVersion }} kind: PodMonitor metadata: name: {{ template "elasticsearch-exporter.fullname" . }} diff --git a/charts/prometheus-elasticsearch-exporter/templates/servicemonitor.yaml b/charts/prometheus-elasticsearch-exporter/templates/servicemonitor.yaml index 7f2ff01c7cbf..b7d4e206be98 100644 --- a/charts/prometheus-elasticsearch-exporter/templates/servicemonitor.yaml +++ b/charts/prometheus-elasticsearch-exporter/templates/servicemonitor.yaml @@ -1,6 +1,6 @@ {{- if .Values.serviceMonitor.enabled }} --- -apiVersion: monitoring.coreos.com/v1 +apiVersion: {{ .Values.serviceMonitor.apiVersion }} kind: ServiceMonitor metadata: name: {{ template "elasticsearch-exporter.fullname" . }} diff --git a/charts/prometheus-elasticsearch-exporter/values.yaml b/charts/prometheus-elasticsearch-exporter/values.yaml index 456731379f4e..dcf5d4d19f0e 100644 --- a/charts/prometheus-elasticsearch-exporter/values.yaml +++ b/charts/prometheus-elasticsearch-exporter/values.yaml @@ -242,6 +242,7 @@ serviceMonitor: ## https://github.com/coreos/prometheus-operator ## enabled: false + apiVersion: "monitoring.coreos.com/v1" # namespace: monitoring labels: {} interval: 10s @@ -258,6 +259,7 @@ podMonitor: ## https://prometheus-operator.dev/docs/operator/api/#monitoring.coreos.com/v1.PodMonitor ## enabled: false + apiVersion: "monitoring.coreos.com/v1" namespace: "" labels: {} interval: 60s From 7e8db0fab052e5c0fd908dd5a30fae734a67fee7 Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Sun, 31 Mar 2024 21:56:39 +0300 Subject: [PATCH 14/17] [prometheus] bump to 2.51.1 + deps (#4407) * bump to 2.51.1 + deps Signed-off-by: drfaust92 * bump to 2.51.1 + deps Signed-off-by: drfaust92 --------- Signed-off-by: drfaust92 --- charts/prometheus/Chart.lock | 8 ++++---- charts/prometheus/Chart.yaml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/charts/prometheus/Chart.lock b/charts/prometheus/Chart.lock index 568062d83e9a..514b74bce151 100644 --- a/charts/prometheus/Chart.lock +++ b/charts/prometheus/Chart.lock @@ -4,12 +4,12 @@ dependencies: version: 1.10.0 - name: kube-state-metrics repository: https://prometheus-community.github.io/helm-charts - version: 5.17.0 + version: 5.18.0 - name: prometheus-node-exporter repository: https://prometheus-community.github.io/helm-charts - version: 4.31.0 + version: 4.32.0 - name: prometheus-pushgateway repository: https://prometheus-community.github.io/helm-charts version: 2.8.0 -digest: sha256:885a96865c58be0d6a4c12b57a751bc58d657c7b4b0442882b3d8003a86d3174 -generated: "2024-03-21T14:31:16.69152+02:00" +digest: sha256:845b6afcabde9eeecc322bc57f8e925a149b44c92f4170db0b45061ce6911637 +generated: "2024-03-29T20:56:04.276491+03:00" diff --git a/charts/prometheus/Chart.yaml b/charts/prometheus/Chart.yaml index 7ee70c3c22ab..82e86e33a8a8 100644 --- a/charts/prometheus/Chart.yaml +++ b/charts/prometheus/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: prometheus -appVersion: v2.51.0 -version: 25.18.0 +appVersion: v2.51.1 +version: 25.19.0 kubeVersion: ">=1.19.0-0" description: Prometheus is a monitoring system and time series database. home: https://prometheus.io/ @@ -30,11 +30,11 @@ dependencies: repository: https://prometheus-community.github.io/helm-charts condition: alertmanager.enabled - name: kube-state-metrics - version: "5.17.*" + version: "5.18.*" repository: https://prometheus-community.github.io/helm-charts condition: kube-state-metrics.enabled - name: prometheus-node-exporter - version: "4.31.*" + version: "4.32.*" repository: https://prometheus-community.github.io/helm-charts condition: prometheus-node-exporter.enabled - name: prometheus-pushgateway From f5158e026cab0333dc71e8f5789eff61a88aaffb Mon Sep 17 00:00:00 2001 From: Darya Bulanova Date: Wed, 3 Apr 2024 14:49:41 +0200 Subject: [PATCH 15/17] [prometheus-blackbox-exporter] Enable annotations for Secret (#4399) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * This PR enables setting annotations for the secret. Signed-off-by: Dasha Bulanova * Update charts/prometheus-blackbox-exporter/templates/configmap.yaml Looks much better ) thank you Co-authored-by: André Bauer Signed-off-by: Darya Bulanova * Fix linter issue Signed-off-by: Darya Bulanova --------- Signed-off-by: Dasha Bulanova Signed-off-by: Darya Bulanova Co-authored-by: André Bauer --- charts/prometheus-blackbox-exporter/Chart.yaml | 2 +- charts/prometheus-blackbox-exporter/templates/configmap.yaml | 4 ++++ charts/prometheus-blackbox-exporter/values.yaml | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/charts/prometheus-blackbox-exporter/Chart.yaml b/charts/prometheus-blackbox-exporter/Chart.yaml index e0a822d9d945..3fa6a53585ff 100644 --- a/charts/prometheus-blackbox-exporter/Chart.yaml +++ b/charts/prometheus-blackbox-exporter/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 description: Prometheus Blackbox Exporter name: prometheus-blackbox-exporter -version: 8.12.0 +version: 8.13.0 appVersion: v0.24.0 home: https://github.com/prometheus/blackbox_exporter sources: diff --git a/charts/prometheus-blackbox-exporter/templates/configmap.yaml b/charts/prometheus-blackbox-exporter/templates/configmap.yaml index 511784c922dc..5b808cc82876 100644 --- a/charts/prometheus-blackbox-exporter/templates/configmap.yaml +++ b/charts/prometheus-blackbox-exporter/templates/configmap.yaml @@ -6,6 +6,10 @@ metadata: namespace: {{ template "prometheus-blackbox-exporter.namespace" . }} labels: {{- include "prometheus-blackbox-exporter.labels" . | nindent 4 }} + {{- if and .Values.secretConfig .Values.secretAnnotations }} + annotations: + {{- toYaml .Values.secretAnnotations | nindent 4 }} + {{- end }} {{ if .Values.secretConfig -}} stringData: {{- else -}} data: {{- end }} blackbox.yaml: | {{ toYaml .Values.config | indent 4 }} diff --git a/charts/prometheus-blackbox-exporter/values.yaml b/charts/prometheus-blackbox-exporter/values.yaml index 25a47000294b..7c5993e55516 100644 --- a/charts/prometheus-blackbox-exporter/values.yaml +++ b/charts/prometheus-blackbox-exporter/values.yaml @@ -249,6 +249,9 @@ podAnnotations: {} # Annotations for the Deployment deploymentAnnotations: {} +# Annotations for the Secret +secretAnnotations: {} + # Hostaliases allow to add additional DNS entries to be injected directly into pods. # This will take precedence over your implemented DNS solution hostAliases: [] From 3839fee960ca53f51f48fa7b4fd11b85b9c6a1fc Mon Sep 17 00:00:00 2001 From: Vincent <99386370+vince-vibin@users.noreply.github.com> Date: Wed, 3 Apr 2024 16:59:13 +0200 Subject: [PATCH 16/17] [prometheus-adapter] allow using cluster roles for auth reader (#4400) * [prometheus-adapter] allow using cluster roles for auth reader Signed-off-by: vsternad * fix versioning Signed-off-by: vsternad --------- Signed-off-by: vsternad Co-authored-by: vsternad --- charts/prometheus-adapter/Chart.yaml | 2 +- .../cluster-role-binding-auth-reader.yaml | 20 +++++++++++++++++++ .../templates/role-binding-auth-reader.yaml | 2 +- charts/prometheus-adapter/values.yaml | 2 ++ 4 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 charts/prometheus-adapter/templates/cluster-role-binding-auth-reader.yaml diff --git a/charts/prometheus-adapter/Chart.yaml b/charts/prometheus-adapter/Chart.yaml index c3e2f355103a..c2acf16b8c3c 100644 --- a/charts/prometheus-adapter/Chart.yaml +++ b/charts/prometheus-adapter/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: prometheus-adapter -version: 4.9.1 +version: 4.10.0 appVersion: v0.11.2 description: A Helm chart for k8s prometheus adapter home: https://github.com/kubernetes-sigs/prometheus-adapter diff --git a/charts/prometheus-adapter/templates/cluster-role-binding-auth-reader.yaml b/charts/prometheus-adapter/templates/cluster-role-binding-auth-reader.yaml new file mode 100644 index 000000000000..fe13048847f4 --- /dev/null +++ b/charts/prometheus-adapter/templates/cluster-role-binding-auth-reader.yaml @@ -0,0 +1,20 @@ +{{- if and .Values.rbac.create .Values.rbac.useAuthReaderClusterRole -}} +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + {{- if .Values.customAnnotations }} + annotations: + {{- toYaml .Values.customAnnotations | nindent 4 }} + {{- end }} + labels: + {{- include "k8s-prometheus-adapter.labels" . | indent 4 }} + name: {{ template "k8s-prometheus-adapter.name" . }}-auth-reader +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: extension-apiserver-authentication-reader +subjects: +- kind: ServiceAccount + name: {{ template "k8s-prometheus-adapter.serviceAccountName" . }} + namespace: {{ include "k8s-prometheus-adapter.namespace" . | quote }} +{{- end -}} diff --git a/charts/prometheus-adapter/templates/role-binding-auth-reader.yaml b/charts/prometheus-adapter/templates/role-binding-auth-reader.yaml index d3c77c1c65d7..f01997e62d3b 100644 --- a/charts/prometheus-adapter/templates/role-binding-auth-reader.yaml +++ b/charts/prometheus-adapter/templates/role-binding-auth-reader.yaml @@ -1,4 +1,4 @@ -{{- if .Values.rbac.create -}} +{{- if and .Values.rbac.create (not .Values.rbac.useAuthReaderClusterRole) -}} apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: diff --git a/charts/prometheus-adapter/values.yaml b/charts/prometheus-adapter/values.yaml index ab9aaeaa9650..36a986efff4b 100644 --- a/charts/prometheus-adapter/values.yaml +++ b/charts/prometheus-adapter/values.yaml @@ -58,6 +58,8 @@ securityContext: rbac: # Specifies whether RBAC resources should be created create: true + # Specifies if a Cluster Role should be used for the Auth Reader + useAuthReaderClusterRole: false externalMetrics: resources: ["*"] customMetrics: From fd6b0073754fcd0646ebe2c52662d62b15536c8c Mon Sep 17 00:00:00 2001 From: Sebastian Gaiser Date: Wed, 3 Apr 2024 17:17:43 +0200 Subject: [PATCH 17/17] [kube-state-metrics]: update from '2.11.0' to '2.12.0' (#4412) Signed-off-by: Sebastian Gaiser --- charts/kube-state-metrics/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/kube-state-metrics/Chart.yaml b/charts/kube-state-metrics/Chart.yaml index d51f8b956d25..9c5a266e0d47 100644 --- a/charts/kube-state-metrics/Chart.yaml +++ b/charts/kube-state-metrics/Chart.yaml @@ -7,8 +7,8 @@ keywords: - prometheus - kubernetes type: application -version: 5.18.0 -appVersion: 2.11.0 +version: 5.18.1 +appVersion: 2.12.0 home: https://github.com/kubernetes/kube-state-metrics/ sources: - https://github.com/kubernetes/kube-state-metrics/