[bitnami/mongodb] feat: allow setting targetLabel and `podTargetLab…

…els` array on ServiceMonitor This will allow chart users to include additional labels to prometheus metrics collected on mongodb Signed-off-by: Umar Hussain <[email protected]>
bitnami · Nov 19, 2024 · a3d274d · a3d274d
1 parent b850cea
commit a3d274d
Show file tree

Hide file tree

Showing 5 changed files with 3,540 additions and 229 deletions.
diff --git a/bitnami/mongodb/Chart.yaml b/bitnami/mongodb/Chart.yaml
@@ -39,4 +39,4 @@ maintainers:
 name: mongodb
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/mongodb
-version: 16.3.0
+version: 16.4.0
diff --git a/bitnami/mongodb/README.md b/bitnami/mongodb/README.md
@@ -1117,6 +1117,8 @@ If you encounter errors when working with persistent volumes, refer to our [trou
 | `metrics.serviceMonitor.selector`            | Prometheus instance selector labels                                                                                                                                                                                               | `{}`                               |
 | `metrics.serviceMonitor.honorLabels`         | Specify honorLabels parameter to add the scrape endpoint                                                                                                                                                                          | `false`                            |
 | `metrics.serviceMonitor.jobLabel`            | The name of the label on the target service to use as the job name in prometheus.                                                                                                                                                 | `""`                               |
+| `metrics.serviceMonitor.targetLabels`        | Defines the labels which are transferred from the associated Kubernetes Service object onto the ingested metrics.                                                                                                                 | `[]`                               |
+| `metrics.serviceMonitor.podTargetLabels`     | Defines the labels which are transferred from the associated Kubernetes Pod object onto the ingested metrics.                                                                                                                     | `[]`                               |
 | `metrics.prometheusRule.enabled`             | Set this to true to create prometheusRules for Prometheus operator                                                                                                                                                                | `false`                            |
 | `metrics.prometheusRule.additionalLabels`    | Additional labels that can be used so prometheusRules will be discovered by Prometheus                                                                                                                                            | `{}`                               |
 | `metrics.prometheusRule.namespace`           | Namespace where prometheusRules resource should be created                                                                                                                                                                        | `""`                               |

diff --git a/bitnami/mongodb/templates/servicemonitor.yaml b/bitnami/mongodb/templates/servicemonitor.yaml
@@ -19,6 +19,14 @@ spec:
   {{- if .Values.metrics.serviceMonitor.jobLabel }}
   jobLabel: {{ .Values.metrics.serviceMonitor.jobLabel }}
   {{- end }}
+  {{- if and .Values.metrics.serviceMonitor.targetLabels (gt (len .Values.metrics.serviceMonitor.targetLabels) 0)}}
+  targetLabels:
+    {{- .Values.metrics.serviceMonitor.targetLabels | toYaml | nindent 4}}
+  {{- end }}
+  {{- if and .Values.metrics.serviceMonitor.podTargetLabels (gt (len .Values.metrics.serviceMonitor.podTargetLabels) 0)}}
+  podTargetLabels:
+    {{- .Values.metrics.serviceMonitor.podTargetLabels | toYaml | nindent 4}}
+  {{- end }}
   selector:
     matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 6 }}
       {{- if .Values.metrics.serviceMonitor.selector }}