feat(charts): support extra relabelings on control-plane PodMonitors

charts/linkerd-control-plane/templates/podmonitor.yaml

@@ -38,6 +38,13 @@ spec:
             - __meta_kubernetes_pod_container_name
           action: replace
           targetLabel: component
+        {{- with $podMonitor.controller.extraRelabelings }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      {{- with $podMonitor.controller.extraMetricRelabelings }}
+      metricRelabelings:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
 {{- end }}
 {{- if and $podMonitor.enabled $podMonitor.serviceMirror.enabled }}
 ---
@@ -80,6 +87,13 @@ spec:
             - __meta_kubernetes_pod_container_name
           action: replace
           targetLabel: component
+        {{- with $podMonitor.serviceMirror.extraRelabelings }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      {{- with $podMonitor.serviceMirror.extraMetricRelabelings }}
+      metricRelabelings:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
 {{- end }}
 {{- if and $podMonitor.enabled $podMonitor.proxy.enabled }}
 ---
@@ -142,4 +156,11 @@ spec:
           regex: __tmp_pod_label_linkerd_io_(.+)
         - action: labelmap
           regex: __tmp_pod_label_(.+)
+        {{- with $podMonitor.proxy.extraRelabelings }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      {{- with $podMonitor.proxy.extraMetricRelabelings }}
+      metricRelabelings:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
 {{- end }}

charts/linkerd-control-plane/values.yaml

@@ -725,19 +725,34 @@ podMonitor:
     # -- Sets honorTimestamps for the control-plane PodMonitor endpoint. When set to false
     # Prometheus uses scrape time instead of exporter-provided timestamps.
     honorTimestamps: false
+    # -- Additional relabelings, appended after the relabelings the chart already sets
+    # on the control-plane PodMonitor endpoint
+    extraRelabelings: []
+    # -- Metric relabelings to set on the control-plane PodMonitor endpoint
+    extraMetricRelabelings: []
   serviceMirror:
     # -- Enables the creation of PodMonitor for the Service Mirror component
     enabled: true
     # -- Sets honorTimestamps for the Service Mirror PodMonitor endpoint. When set to false,
     # Prometheus uses scrape time instead of exporter-provided timestamps.
     honorTimestamps: false
+    # -- Additional relabelings, appended after the relabelings the chart already sets
+    # on the Service Mirror PodMonitor endpoint
+    extraRelabelings: []
+    # -- Metric relabelings to set on the Service Mirror PodMonitor endpoint
+    extraMetricRelabelings: []
   proxy:
     # -- Enables the creation of PodMonitor for the data-plane
     enabled: true
     # -- Sets honorTimestamps for the proxy PodMonitor endpoint. When set to false,
     # Prometheus uses scrape time instead of exporter-provided timestamps,
     # preventing duplicate timestamp drops in clusters with frequent pod restarts.
     honorTimestamps: false
+    # -- Additional relabelings, appended after the relabelings the chart already sets
+    # on the proxy PodMonitor endpoint
+    extraRelabelings: []
+    # -- Metric relabelings to set on the proxy PodMonitor endpoint
+    extraMetricRelabelings: []
 
 
 # Egress related configuration