Merge branch 'main' of https://github.com/Sheikh-Abubaker/prometheus-…

…helm-charts into additionalMetricsRelabels-pr
prometheus-community · Apr 5, 2024 · 293e3b8 · 293e3b8
2 parents 406f547 + fd6b007
commit 293e3b8
Show file tree

Hide file tree

Showing 28 changed files with 103 additions and 64 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: 57.0.3
+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

diff --git 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
@@ -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 }}

diff --git 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
@@ -3354,7 +3350,7 @@ prometheus:
     image:
       registry: quay.io
       repository: prometheus/prometheus
-      tag: v2.50.1
+      tag: v2.51.0
       sha: ""
 
     ## Tolerations for use with node taints
@@ -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

diff --git 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.18.1
+appVersion: 2.12.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: [email protected]
-- name: mrueg
-  email: [email protected]
-- name: dotdc
-  email: [email protected]
+  - name: tariq1890
+    email: [email protected]
+  - name: mrueg
+    email: [email protected]
+  - name: dotdc
+    email: [email protected]
 annotations:
   "artifacthub.io/license": Apache-2.0
   "artifacthub.io/links": |

diff --git 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
 

diff --git 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
@@ -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
@@ -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
@@ -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:

diff --git 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
@@ -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: []

diff --git 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
@@ -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
@@ -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
@@ -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

diff --git 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
@@ -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
@@ -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

diff --git 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
@@ -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
 

diff --git 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:

diff --git 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: [email protected]
-  name: stewartshea
-- email: [email protected]
-  name: zeritti
+  - email: [email protected]
+    name: stewartshea
+  - email: [email protected]
+    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
@@ -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.

diff --git 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

diff --git 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.18.0
 - name: prometheus-node-exporter
   repository: https://prometheus-community.github.io/helm-charts
-  version: 4.30.3
+  version: 4.32.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:845b6afcabde9eeecc322bc57f8e925a149b44c92f4170db0b45061ce6911637
+generated: "2024-03-29T20:56:04.276491+03:00"