From da541e6e4814376048db408d13298274313e6a14 Mon Sep 17 00:00:00 2001 From: David Cook Date: Wed, 27 Sep 2023 19:20:01 -0500 Subject: [PATCH 1/5] [prometheus-postgres-exporter] Upgrade postgres-exporter version (#3832) Signed-off-by: David Cook --- charts/prometheus-postgres-exporter/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/prometheus-postgres-exporter/Chart.yaml b/charts/prometheus-postgres-exporter/Chart.yaml index f71cd028b7a4..2b4496f92eb3 100644 --- a/charts/prometheus-postgres-exporter/Chart.yaml +++ b/charts/prometheus-postgres-exporter/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "v0.13.2" +appVersion: "v0.14.0" description: A Helm chart for prometheus postgres-exporter name: prometheus-postgres-exporter -version: 5.0.0 +version: 5.1.0 home: https://github.com/prometheus-community/postgres_exporter sources: - https://github.com/prometheus-community/postgres_exporter From 56aa92d92cab4992223e68cc68f5598d3e7b7488 Mon Sep 17 00:00:00 2001 From: Joon Seo Kim Date: Thu, 28 Sep 2023 22:32:57 +0900 Subject: [PATCH 2/5] [prometheus-kafka-exporter] Add LoadBalancer Service Type (#3830) * [prometheus-kafka-exporter]: Add loadBalancerIP to specify a reserved static IP Signed-off-by: KimJoonSeo * [prometheus-kafka-exporter]: Update a chart version Signed-off-by: KimJoonSeo * Update charts/prometheus-kafka-exporter/values.yaml Co-authored-by: zeritti <47476160+zeritti@users.noreply.github.com> Signed-off-by: Joon Seo Kim * Update charts/prometheus-kafka-exporter/values.yaml Co-authored-by: zeritti <47476160+zeritti@users.noreply.github.com> Signed-off-by: Joon Seo Kim --------- Signed-off-by: KimJoonSeo Signed-off-by: Joon Seo Kim Co-authored-by: zeritti <47476160+zeritti@users.noreply.github.com> --- charts/prometheus-kafka-exporter/Chart.yaml | 2 +- charts/prometheus-kafka-exporter/templates/service.yaml | 3 +++ charts/prometheus-kafka-exporter/values.yaml | 6 ++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/charts/prometheus-kafka-exporter/Chart.yaml b/charts/prometheus-kafka-exporter/Chart.yaml index 8c7699e56af6..9368f97aae55 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.6.0 +version: 2.7.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/service.yaml b/charts/prometheus-kafka-exporter/templates/service.yaml index c990ac530ab4..404572dae516 100644 --- a/charts/prometheus-kafka-exporter/templates/service.yaml +++ b/charts/prometheus-kafka-exporter/templates/service.yaml @@ -14,6 +14,9 @@ metadata: {{- end }} spec: type: {{ .Values.service.type }} +{{- if and (eq .Values.service.type "LoadBalancer") (.Values.service.loadBalancerIP) }} + loadBalancerIP: {{ .Values.service.loadBalancerIP }} +{{- end }} ports: - port: {{ .Values.service.port }} targetPort: exporter-port diff --git a/charts/prometheus-kafka-exporter/values.yaml b/charts/prometheus-kafka-exporter/values.yaml index bd83ab4f012a..7ba874594563 100644 --- a/charts/prometheus-kafka-exporter/values.yaml +++ b/charts/prometheus-kafka-exporter/values.yaml @@ -71,9 +71,11 @@ service: port: 9308 labels: {} annotations: {} - # Specifies a custom nodePort for external use. - # Must be used with service.type=NodePort. + # Specifies a custom nodePort for external use. Used with service.type=NodePort. nodePort: null + # Specifies a reserved static IP. Used with service.type=LoadBalancer. + # The field is deprecated, implementation-specific annotations should be set instead. + loadBalancerIP: null liveness: enabled: false From 74d6e9e9ca0b1ae58456cdc85cb57512fa9b39c8 Mon Sep 17 00:00:00 2001 From: Till Wiese <1872304+m3adow@users.noreply.github.com> Date: Fri, 29 Sep 2023 11:20:00 +0200 Subject: [PATCH 3/5] Fix elasticsearch-exporter preStop command (#3838) Use the existing `/bin/sleep` instead of the non-existing `/bin/bash` Signed-off-by: Till Wiese <1872304+m3adow@users.noreply.github.com> --- charts/prometheus-elasticsearch-exporter/Chart.yaml | 2 +- .../prometheus-elasticsearch-exporter/templates/deployment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/prometheus-elasticsearch-exporter/Chart.yaml b/charts/prometheus-elasticsearch-exporter/Chart.yaml index 10cc69ac72eb..860e79fd3c60 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.3.0 +version: 5.3.1 kubeVersion: ">=1.10.0-0" appVersion: "v1.6.0" home: https://github.com/prometheus-community/elasticsearch_exporter diff --git a/charts/prometheus-elasticsearch-exporter/templates/deployment.yaml b/charts/prometheus-elasticsearch-exporter/templates/deployment.yaml index 05e6573631ff..96db3fff8a2e 100644 --- a/charts/prometheus-elasticsearch-exporter/templates/deployment.yaml +++ b/charts/prometheus-elasticsearch-exporter/templates/deployment.yaml @@ -161,7 +161,7 @@ spec: lifecycle: preStop: exec: - command: ["/bin/bash", "-c", "sleep 20"] + command: ["/bin/sleep", "20"] volumeMounts: {{- if and .Values.es.ssl.enabled (eq .Values.es.ssl.useExistingSecrets false) }} - mountPath: /ssl From 10e87dbc93ea9ce6bb7ead03c7eab5d387bf724d Mon Sep 17 00:00:00 2001 From: Priyanshu Raj <55045459+rpriyanshu9@users.noreply.github.com> Date: Fri, 29 Sep 2023 20:06:17 +0530 Subject: [PATCH 4/5] [prometheus-adapter] Add sidecar container support (#3737) Signed-off-by: Priyanshu Raj Signed-off-by: Priyanshu Raj <55045459+rpriyanshu9@users.noreply.github.com> --- charts/prometheus-adapter/Chart.yaml | 2 +- charts/prometheus-adapter/templates/deployment.yaml | 3 +++ charts/prometheus-adapter/values.yaml | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/charts/prometheus-adapter/Chart.yaml b/charts/prometheus-adapter/Chart.yaml index 5759511c5bb3..cd630d6c466c 100644 --- a/charts/prometheus-adapter/Chart.yaml +++ b/charts/prometheus-adapter/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: prometheus-adapter -version: 4.5.0 +version: 4.6.0 appVersion: v0.11.1 description: A Helm chart for k8s prometheus adapter home: https://github.com/kubernetes-sigs/prometheus-adapter diff --git a/charts/prometheus-adapter/templates/deployment.yaml b/charts/prometheus-adapter/templates/deployment.yaml index 8068180b443d..0d0a491002d8 100644 --- a/charts/prometheus-adapter/templates/deployment.yaml +++ b/charts/prometheus-adapter/templates/deployment.yaml @@ -104,6 +104,9 @@ spec: name: volume-serving-cert readOnly: true {{- end }} + {{- with .Values.extraContainers }} + {{- toYaml . | nindent 6 }} + {{- end }} nodeSelector: {{- toYaml .Values.nodeSelector | nindent 8 }} affinity: diff --git a/charts/prometheus-adapter/values.yaml b/charts/prometheus-adapter/values.yaml index 495a5c764f3c..7e19862c01e0 100644 --- a/charts/prometheus-adapter/values.yaml +++ b/charts/prometheus-adapter/values.yaml @@ -213,6 +213,9 @@ extraArguments: [] # - --tls-private-key-file=/etc/tls/tls.key # - --tls-cert-file=/etc/tls/tls.crt +# Additional containers to add to the pod +extraContainers: [] + # Any extra volumes extraVolumes: [] # - name: example-name From 3205e454685a5de2a90d27748280160b96884516 Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Sat, 30 Sep 2023 18:38:26 +0300 Subject: [PATCH 5/5] [prometheus-node-exporter] remove ns from clusterrole (#3844) * remove ns from cluster role Signed-off-by: drfaust92 * Remove notes on minor changes from README Signed-off-by: zeritti <47476160+zeritti@users.noreply.github.com> * Fix linting errors Signed-off-by: zeritti <47476160+zeritti@users.noreply.github.com> --------- Signed-off-by: drfaust92 Signed-off-by: zeritti <47476160+zeritti@users.noreply.github.com> Co-authored-by: zeritti <47476160+zeritti@users.noreply.github.com> --- charts/prometheus-node-exporter/Chart.yaml | 2 +- charts/prometheus-node-exporter/README.md | 16 ++++++---------- .../templates/clusterrole.yaml | 1 - 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/charts/prometheus-node-exporter/Chart.yaml b/charts/prometheus-node-exporter/Chart.yaml index 76b9a7ecc0e5..5ec6a9076803 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.23.1 +version: 4.23.2 appVersion: 1.6.1 home: https://github.com/prometheus/node_exporter/ sources: diff --git a/charts/prometheus-node-exporter/README.md b/charts/prometheus-node-exporter/README.md index 5dbfa328977c..ef8384410240 100644 --- a/charts/prometheus-node-exporter/README.md +++ b/charts/prometheus-node-exporter/README.md @@ -1,18 +1,18 @@ -# Prometheus `Node Exporter` +# Prometheus Node Exporter Prometheus exporter for hardware and OS metrics exposed by *NIX kernels, written in Go with pluggable metric collectors. -This chart bootstraps a prometheus [`Node Exporter`](http://github.com/prometheus/node_exporter) daemonset on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +This chart bootstraps a Prometheus [Node Exporter](http://github.com/prometheus/node_exporter) daemonset on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. ## Get Repository Info - + ```console helm repo add prometheus-community https://prometheus-community.github.io/helm-charts helm repo update ``` -_See [`helm repo`](https://helm.sh/docs/helm/helm_repo/) for command documentation._ - +_See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation._ + ## Install Chart ```console @@ -36,15 +36,11 @@ _See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall/) for command doc ## Upgrading Chart ```console -helm upgrade [RELEASE_NAME] [CHART] --install +helm upgrade [RELEASE_NAME] prometheus-community/prometheus-node-exporter --install ``` _See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._ -### 4.16 to 4.17+ - -`containerSecurityContext.readOnlyRootFilesystem` is set to `true` by default. - ### 3.x to 4.x Starting from version 4.0.0, the `node exporter` chart is using the [Kubernetes recommended labels](https://kubernetes.io/docs/concepts/overview/working-with-objects/common-labels/). Therefore you have to delete the daemonset before you upgrade. diff --git a/charts/prometheus-node-exporter/templates/clusterrole.yaml b/charts/prometheus-node-exporter/templates/clusterrole.yaml index 1fd91150f489..c256dba73dbb 100644 --- a/charts/prometheus-node-exporter/templates/clusterrole.yaml +++ b/charts/prometheus-node-exporter/templates/clusterrole.yaml @@ -3,7 +3,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: {{ include "prometheus-node-exporter.fullname" . }} - namespace: {{ include "prometheus-node-exporter.namespace" . }} labels: {{- include "prometheus-node-exporter.labels" . | nindent 4 }} rules: