From 2e7a38f57389cf3bf3a8cf497890694ce2bf482f Mon Sep 17 00:00:00 2001 From: dongjiang1989 Date: Tue, 12 Mar 2024 22:44:43 +0800 Subject: [PATCH 1/4] add service monitor Signed-off-by: dongjiang1989 --- charts/prometheus-mysql-exporter/templates/servicemonitor.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/charts/prometheus-mysql-exporter/templates/servicemonitor.yaml b/charts/prometheus-mysql-exporter/templates/servicemonitor.yaml index a3caf528c20c..da2a2c65e213 100644 --- a/charts/prometheus-mysql-exporter/templates/servicemonitor.yaml +++ b/charts/prometheus-mysql-exporter/templates/servicemonitor.yaml @@ -72,7 +72,6 @@ spec: - client.{{ .name }} {{- end }} {{- end }} - {{- else }} - path: /metrics port: {{ .Values.service.name }} {{- if .Values.serviceMonitor.interval }} @@ -87,5 +86,4 @@ spec: {{- if .Values.serviceMonitor.relabelings }} relabelings: {{ toYaml .Values.serviceMonitor.relabelings | nindent 8 }} {{- end }} - {{- end }} {{- end }} From 14137dfc78b312ae4a1b06f8df4504dea5907f63 Mon Sep 17 00:00:00 2001 From: dongjiang1989 Date: Tue, 12 Mar 2024 22:48:07 +0800 Subject: [PATCH 2/4] update chart version Signed-off-by: dongjiang1989 --- charts/prometheus-mysql-exporter/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/prometheus-mysql-exporter/Chart.yaml b/charts/prometheus-mysql-exporter/Chart.yaml index 3608fad30dd2..26f350bfa53a 100644 --- a/charts/prometheus-mysql-exporter/Chart.yaml +++ b/charts/prometheus-mysql-exporter/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: A Helm chart for prometheus mysql exporter with cloudsqlproxy name: prometheus-mysql-exporter -version: 2.5.0 +version: 2.5.1 home: https://github.com/prometheus/mysqld_exporter appVersion: v0.15.1 sources: From 407b6e402c0f5cb3f8d2962cc0ae4bc24d95a168 Mon Sep 17 00:00:00 2001 From: dongjiang1989 Date: Tue, 12 Mar 2024 22:51:54 +0800 Subject: [PATCH 3/4] fix bug Signed-off-by: dongjiang1989 --- charts/prometheus-mysql-exporter/templates/servicemonitor.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/prometheus-mysql-exporter/templates/servicemonitor.yaml b/charts/prometheus-mysql-exporter/templates/servicemonitor.yaml index da2a2c65e213..25114d23b04b 100644 --- a/charts/prometheus-mysql-exporter/templates/servicemonitor.yaml +++ b/charts/prometheus-mysql-exporter/templates/servicemonitor.yaml @@ -86,4 +86,5 @@ spec: {{- if .Values.serviceMonitor.relabelings }} relabelings: {{ toYaml .Values.serviceMonitor.relabelings | nindent 8 }} {{- end }} + {{- end }} {{- end }} From 60092259df440591b398abc4e663c48f8f96edf5 Mon Sep 17 00:00:00 2001 From: dongjiang1989 Date: Tue, 12 Mar 2024 23:13:01 +0800 Subject: [PATCH 4/4] fix bug Signed-off-by: dongjiang1989 --- charts/prometheus-mysql-exporter/templates/servicemonitor.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/prometheus-mysql-exporter/templates/servicemonitor.yaml b/charts/prometheus-mysql-exporter/templates/servicemonitor.yaml index 25114d23b04b..59108d9d3209 100644 --- a/charts/prometheus-mysql-exporter/templates/servicemonitor.yaml +++ b/charts/prometheus-mysql-exporter/templates/servicemonitor.yaml @@ -71,6 +71,7 @@ spec: auth_module: - client.{{ .name }} {{- end }} + {{- end }} {{- end }} - path: /metrics port: {{ .Values.service.name }} @@ -86,5 +87,4 @@ spec: {{- if .Values.serviceMonitor.relabelings }} relabelings: {{ toYaml .Values.serviceMonitor.relabelings | nindent 8 }} {{- end }} - {{- end }} {{- end }}