Merge pull request #195 from andi4000/feat/honor-labels-servicemonitor

feat: expose honorLabels key in ServiceMonitor
flipt-io · Dec 12, 2024 · dd7f5b4 · dd7f5b4
2 parents 5d27334 + 6532e4d
commit dd7f5b4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/charts/flipt/Chart.yaml b/charts/flipt/Chart.yaml
@@ -3,7 +3,7 @@ name: flipt
 home: https://flipt.io
 description: Flipt is an open-source, self-hosted feature flag solution.
 type: application
-version: 0.76.1
+version: 0.77.0
 appVersion: v1.53.1
 maintainers:
   - name: Flipt

diff --git a/charts/flipt/templates/servicemonitor.yaml b/charts/flipt/templates/servicemonitor.yaml
@@ -18,6 +18,7 @@ spec:
       interval: {{ . }}
       {{- end }}
       path: /metrics
+      honorLabels: {{ .Values.metrics.serviceMonitor.honorLabels }}
       {{- with .Values.metrics.serviceMonitor.relabelings }}
       relabelings:
         {{- toYaml . | nindent 8 }}

diff --git a/charts/flipt/values.yaml b/charts/flipt/values.yaml
@@ -207,6 +207,9 @@ metrics:
     # -- ServiceMonitor relabel configs to apply to samples before scraping
     # https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
     relabelings: []
+    # -- What to do when flipt metrics labels are conflicting with Prometheus server-side labels.
+    # true means keep label values from flipt.
+    honorLabels: false
     # -- ServiceMonitor will use http by default, but you can pick https as well
     scheme: http
     # -- ServiceMonitor will use these tlsConfig settings to make the health check requests