[kube-prometheus-stack] Added attachMetadata option to additionalServiceMonitors and additionalPodMonitors (#6106)

Co-authored-by: Jan-Otto Kröpke <[email protected]>

Author: christophemorio

charts/kube-prometheus-stack/Chart.yaml

@@ -31,7 +31,7 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-version: 77.4.0
+version: 77.5.0
 # renovate: github=prometheus-operator/prometheus-operator
 appVersion: v0.85.0
 kubeVersion: ">=1.25.0-0"

charts/kube-prometheus-stack/templates/prometheus/podmonitors.yaml

@@ -37,5 +37,9 @@ items:
     {{- if .fallbackScrapeProtocol }}
       fallbackScrapeProtocol: {{ .fallbackScrapeProtocol }}
     {{- end }}
+    {{- with .attachMetadata }}
+      attachMetadata:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
 {{- end }}
 {{- end }}

charts/kube-prometheus-stack/templates/prometheus/servicemonitors.yaml

@@ -38,5 +38,9 @@ items:
     {{- if .fallbackScrapeProtocol }}
       fallbackScrapeProtocol: {{ .fallbackScrapeProtocol }}
     {{- end }}
+    {{- with .attachMetadata }}
+      attachMetadata:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
 {{- end }}
 {{- end }}

charts/kube-prometheus-stack/values.yaml

@@ -4808,6 +4808,12 @@ prometheus:
     ##
     # fallbackScrapeProtocol: ""
 
+    ## Attaches node metadata to the discovered targets
+    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api-reference/api.md#monitoring.coreos.com/v1.AttachMetadata
+    ##
+    # attachMetadata:
+    #   node: true
+
   additionalPodMonitors: []
   ## Name of the PodMonitor to create
   ##
@@ -4868,6 +4874,12 @@ prometheus:
     ##
     # fallbackScrapeProtocol: ""
 
+    ## Attaches node metadata to the discovered targets
+    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api-reference/api.md#monitoring.coreos.com/v1.AttachMetadata
+    ##
+    # attachMetadata:
+    #   node: true
+
 ## Configuration for thanosRuler
 ## ref: https://thanos.io/tip/components/rule.md/
 ##