From 595b67800a3d1cb3894dee52fa106b1ad892ca52 Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Tue, 12 Sep 2023 18:39:22 +0300 Subject: [PATCH 1/3] bump adapter to 0.11.1 (#3782) Signed-off-by: drfaust92 Co-authored-by: MH --- charts/prometheus-adapter/Chart.yaml | 4 ++-- charts/prometheus-adapter/templates/deployment.yaml | 2 +- charts/prometheus-adapter/values.yaml | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/charts/prometheus-adapter/Chart.yaml b/charts/prometheus-adapter/Chart.yaml index 84a22eb9872f..5759511c5bb3 100644 --- a/charts/prometheus-adapter/Chart.yaml +++ b/charts/prometheus-adapter/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: prometheus-adapter -version: 4.4.1 -appVersion: v0.11.0 +version: 4.5.0 +appVersion: v0.11.1 description: A Helm chart for k8s prometheus adapter home: https://github.com/kubernetes-sigs/prometheus-adapter keywords: diff --git a/charts/prometheus-adapter/templates/deployment.yaml b/charts/prometheus-adapter/templates/deployment.yaml index 5be132f9beb9..8068180b443d 100644 --- a/charts/prometheus-adapter/templates/deployment.yaml +++ b/charts/prometheus-adapter/templates/deployment.yaml @@ -50,7 +50,7 @@ spec: {{- end }} containers: - name: {{ .Chart.Name }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" + image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} {{- with .Values.env }} env: diff --git a/charts/prometheus-adapter/values.yaml b/charts/prometheus-adapter/values.yaml index a1dc139a1a26..495a5c764f3c 100644 --- a/charts/prometheus-adapter/values.yaml +++ b/charts/prometheus-adapter/values.yaml @@ -4,7 +4,8 @@ topologySpreadConstraints: [] image: repository: registry.k8s.io/prometheus-adapter/prometheus-adapter - tag: v0.11.0 + # if not set appVersion field from Chart.yaml is used + tag: "" pullPolicy: IfNotPresent logLevel: 4 From b7ba011dedf81d4fbd78cbf87d9905f1cfb51081 Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Tue, 12 Sep 2023 18:42:15 +0300 Subject: [PATCH 2/3] bump mongo exporter to 0.39.0 (#3783) Signed-off-by: drfaust92 Co-authored-by: MH --- charts/prometheus-mongodb-exporter/Chart.yaml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/charts/prometheus-mongodb-exporter/Chart.yaml b/charts/prometheus-mongodb-exporter/Chart.yaml index d2a823972768..7175b61e5067 100644 --- a/charts/prometheus-mongodb-exporter/Chart.yaml +++ b/charts/prometheus-mongodb-exporter/Chart.yaml @@ -1,18 +1,18 @@ apiVersion: v2 -appVersion: "0.31.0" +appVersion: "0.39.0" description: A Prometheus exporter for MongoDB metrics home: https://github.com/percona/mongodb_exporter keywords: -- exporter -- metrics -- mongodb -- prometheus + - exporter + - metrics + - mongodb + - prometheus maintainers: -- email: ssheehy@firescope.com - name: steven-sheehy -- email: rootsandtrees@posteo.de - name: zeritti + - email: ssheehy@firescope.com + name: steven-sheehy + - email: rootsandtrees@posteo.de + name: zeritti name: prometheus-mongodb-exporter sources: -- https://github.com/percona/mongodb_exporter -version: 3.3.1 + - https://github.com/percona/mongodb_exporter +version: 3.4.0 From 0f018d18ca0eb562621a2bd3d0f90a1a49bb2ced Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Tue, 12 Sep 2023 23:32:14 +0300 Subject: [PATCH 3/3] [prometheus-elasticsearch-exporter] bump elastic-exporter to 1.6.0 (#3781) * bump elasticexporter to 1.6.0 Signed-off-by: drfaust92 * revert lint changes Signed-off-by: drfaust92 --------- Signed-off-by: drfaust92 --- charts/prometheus-elasticsearch-exporter/Chart.yaml | 4 ++-- .../templates/deployment.yaml | 4 ++-- charts/prometheus-elasticsearch-exporter/values.yaml | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/charts/prometheus-elasticsearch-exporter/Chart.yaml b/charts/prometheus-elasticsearch-exporter/Chart.yaml index e5a29cd2aa10..10cc69ac72eb 100644 --- a/charts/prometheus-elasticsearch-exporter/Chart.yaml +++ b/charts/prometheus-elasticsearch-exporter/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v1 description: Elasticsearch stats exporter for Prometheus name: prometheus-elasticsearch-exporter -version: 5.2.0 +version: 5.3.0 kubeVersion: ">=1.10.0-0" -appVersion: 1.5.0 +appVersion: "v1.6.0" home: https://github.com/prometheus-community/elasticsearch_exporter sources: - https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus-elasticsearch-exporter diff --git a/charts/prometheus-elasticsearch-exporter/templates/deployment.yaml b/charts/prometheus-elasticsearch-exporter/templates/deployment.yaml index acb6131fbd87..05e6573631ff 100644 --- a/charts/prometheus-elasticsearch-exporter/templates/deployment.yaml +++ b/charts/prometheus-elasticsearch-exporter/templates/deployment.yaml @@ -75,7 +75,7 @@ spec: - secretRef: name: {{ .Values.envFromSecret }} {{- end }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" + image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} command: ["elasticsearch_exporter", {{- with .Values.log.format }} @@ -109,7 +109,7 @@ spec: "--es.snapshots", {{- end }} {{- if .Values.es.cluster_settings }} - "--es.cluster_settings", + "--collector.clustersettings", {{- end }} {{- if .Values.es.slm }} "--es.slm", diff --git a/charts/prometheus-elasticsearch-exporter/values.yaml b/charts/prometheus-elasticsearch-exporter/values.yaml index 720070e3f11c..ce15680ce103 100644 --- a/charts/prometheus-elasticsearch-exporter/values.yaml +++ b/charts/prometheus-elasticsearch-exporter/values.yaml @@ -14,7 +14,8 @@ restartPolicy: Always image: repository: quay.io/prometheuscommunity/elasticsearch-exporter - tag: v1.5.0 + # if not set appVersion field from Chart.yaml is used + tag: "" pullPolicy: IfNotPresent pullSecret: ""