Merge pull request #148 from scoof/improvement-metricrelabelings

improvement: support relabelings in ServiceMonitor
bloomberg · Nov 11, 2024 · 02065cf · 02065cf
2 parents d1c6047 + 98bee8c
commit 02065cf
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git 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
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: goldpinger
-appVersion: "3.10.1"
-version: 1.0.0
+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
 sources:

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

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