From 876b3f4068c26efd4101a7b59afab3edbecf408b Mon Sep 17 00:00:00 2001 From: Andreas Plesner Date: Mon, 12 Aug 2024 09:13:29 +0200 Subject: [PATCH 1/6] improvement: support relabelings in ServiceMonitor Signed-Off-By: Andreas Plesner --- charts/goldpinger/templates/servicemonitor.yaml | 4 ++++ charts/goldpinger/values.yaml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/charts/goldpinger/templates/servicemonitor.yaml b/charts/goldpinger/templates/servicemonitor.yaml index 95bbad6..5d8af50 100644 --- a/charts/goldpinger/templates/servicemonitor.yaml +++ b/charts/goldpinger/templates/servicemonitor.yaml @@ -25,4 +25,8 @@ spec: selector: matchLabels: {{- include "goldpinger.selectorLabels" . | nindent 6 }} + {{- with .Values.serviceMonitor.metricRelabelings }} + metricRelabelings: + {{- toYaml . | nindent 4 }} + {{- end }} {{- end -}} diff --git a/charts/goldpinger/values.yaml b/charts/goldpinger/values.yaml index b0cd8d2..ad3ba7f 100644 --- a/charts/goldpinger/values.yaml +++ b/charts/goldpinger/values.yaml @@ -143,6 +143,10 @@ serviceMonitor: # namespace: monitoring interval: 30s # honorLabels: true + metricRelabelings: {} + # - action: drop + # source_labels: [__name__] + # regex: goldpinger_peers_response_time_s_bucket ## Custom PrometheusRule to be defined ## ref: https://github.com/coreos/prometheus-operator#customresourcedefinitions From b07803d8c6dd8c41fa3bc982990ccfacd1e44d28 Mon Sep 17 00:00:00 2001 From: Andreas Plesner Date: Mon, 26 Aug 2024 12:17:37 +0200 Subject: [PATCH 2/6] fix: move metricRelabelings to correct section Signed-off-by: Andreas Plesner --- charts/goldpinger/templates/servicemonitor.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/goldpinger/templates/servicemonitor.yaml b/charts/goldpinger/templates/servicemonitor.yaml index 5d8af50..6e2463e 100644 --- a/charts/goldpinger/templates/servicemonitor.yaml +++ b/charts/goldpinger/templates/servicemonitor.yaml @@ -18,6 +18,10 @@ spec: {{- if .Values.serviceMonitor.honorLabels }} honorLabels: true {{- end }} + {{- with .Values.serviceMonitor.metricRelabelings }} + metricRelabelings: + {{- toYaml . | nindent 8 }} + {{- end }} jobLabel: name namespaceSelector: matchNames: @@ -25,8 +29,4 @@ spec: selector: matchLabels: {{- include "goldpinger.selectorLabels" . | nindent 6 }} - {{- with .Values.serviceMonitor.metricRelabelings }} - metricRelabelings: - {{- toYaml . | nindent 4 }} - {{- end }} {{- end -}} From f7ab34e462f323765eee21ba53ea5ac4f23a1ce3 Mon Sep 17 00:00:00 2001 From: Sachin Kamboj Date: Mon, 9 Sep 2024 13:38:55 -0400 Subject: [PATCH 3/6] Update the chart version Signed-off-by: Sachin Kamboj --- charts/goldpinger/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/goldpinger/Chart.yaml b/charts/goldpinger/Chart.yaml index 733592b..e096884 100644 --- a/charts/goldpinger/Chart.yaml +++ b/charts/goldpinger/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: goldpinger appVersion: "3.10.1" -version: 1.0.0 +version: 1.0.1 description: Goldpinger is a tool to help debug, troublshoot and visualize network connectivity and slowness issues. home: https://github.com/bloomberg/goldpinger sources: From d8819d6d6dab9699a1725032b69aa2a8dc8fba26 Mon Sep 17 00:00:00 2001 From: Andreas Plesner Date: Mon, 9 Sep 2024 20:40:26 +0200 Subject: [PATCH 4/6] Fix datatype Signed-off-by: Andreas Plesner --- charts/goldpinger/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/goldpinger/values.yaml b/charts/goldpinger/values.yaml index ad3ba7f..1c80a1b 100644 --- a/charts/goldpinger/values.yaml +++ b/charts/goldpinger/values.yaml @@ -143,7 +143,7 @@ serviceMonitor: # namespace: monitoring interval: 30s # honorLabels: true - metricRelabelings: {} + metricRelabelings: [] # - action: drop # source_labels: [__name__] # regex: goldpinger_peers_response_time_s_bucket From 8db3d2f2de59ed0536d8f2f0a932fcb8f4ba0da3 Mon Sep 17 00:00:00 2001 From: Sachin Kamboj Date: Mon, 11 Nov 2024 09:14:07 -0500 Subject: [PATCH 5/6] Fix typo Signed-off-by: Sachin Kamboj --- charts/goldpinger/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/goldpinger/Chart.yaml b/charts/goldpinger/Chart.yaml index e096884..cb5743b 100644 --- a/charts/goldpinger/Chart.yaml +++ b/charts/goldpinger/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 name: goldpinger appVersion: "3.10.1" version: 1.0.1 -description: Goldpinger is a tool to help debug, troublshoot and visualize network connectivity and slowness issues. +description: Goldpinger is a tool to help debug, troubleshoot and visualize network connectivity and slowness issues. home: https://github.com/bloomberg/goldpinger sources: - https://github.com/bloomberg/goldpinger From 41680b856af76897b543d8a6f250264a7a88eb0d Mon Sep 17 00:00:00 2001 From: Sachin Kamboj Date: Mon, 11 Nov 2024 09:16:18 -0500 Subject: [PATCH 6/6] Up the app version Signed-off-by: Sachin Kamboj --- Makefile | 2 +- charts/goldpinger/Chart.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 05112af..d962ac1 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ name ?= goldpinger -version ?= v3.10.1 +version ?= v3.10.2 bin ?= goldpinger pkg ?= "github.com/bloomberg/goldpinger" tag = $(name):$(version) diff --git a/charts/goldpinger/Chart.yaml b/charts/goldpinger/Chart.yaml index cb5743b..200ed43 100644 --- a/charts/goldpinger/Chart.yaml +++ b/charts/goldpinger/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: goldpinger -appVersion: "3.10.1" +appVersion: "3.10.2" version: 1.0.1 description: Goldpinger is a tool to help debug, troubleshoot and visualize network connectivity and slowness issues. home: https://github.com/bloomberg/goldpinger