From d3694193c0386735920acf0fdd562b3c7a656d04 Mon Sep 17 00:00:00 2001 From: justin0u0 Date: Tue, 1 Oct 2024 09:51:27 +0800 Subject: [PATCH 1/2] feat: support setting .endpoints[].relabelings in ServiceMonitor --- helm/kubenurse/templates/servicemonitor.yaml | 4 ++++ helm/kubenurse/values.yaml | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/helm/kubenurse/templates/servicemonitor.yaml b/helm/kubenurse/templates/servicemonitor.yaml index 21a5a835..dc30a743 100644 --- a/helm/kubenurse/templates/servicemonitor.yaml +++ b/helm/kubenurse/templates/servicemonitor.yaml @@ -13,6 +13,10 @@ spec: endpoints: - port: {{ .Values.service.name }} interval: 60s + {{- with .Values.serviceMonitor.relabelings }} + relabelings: + {{- toYaml . | nindent 6 }} + {{- end }} namespaceSelector: matchNames: - {{ .Release.Namespace }} diff --git a/helm/kubenurse/values.yaml b/helm/kubenurse/values.yaml index 75891b75..dac1401d 100644 --- a/helm/kubenurse/values.yaml +++ b/helm/kubenurse/values.yaml @@ -26,6 +26,13 @@ daemonset: serviceMonitor: enabled: false labels: {} + relabelings: [] + # - sourceLabels: [__meta_kubernetes_pod_node_name] + # separator: ; + # regex: ^(.*)$ + # targetLabel: nodename + # replacement: $1 + # action: replace # environment variables # From 2a107b05d9431a226f37eb6fdbf4c7ae42cd623d Mon Sep 17 00:00:00 2001 From: justin0u0 Date: Tue, 1 Oct 2024 11:59:51 +0800 Subject: [PATCH 2/2] docs: add the serviceMonitor.relabelings Helm parameter --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 37f19712..1eafb924 100644 --- a/README.md +++ b/README.md @@ -111,6 +111,7 @@ The following command can be used to install kubenurse with Helm: `helm upgrade | daemonset.volumes | Additional volumes to be added to the daemonset | `[]` | | serviceMonitor.enabled | Adds a ServiceMonitor for use with [Prometheus-operator](https://github.com/prometheus-operator/prometheus-operator) | `false` | | serviceMonitor.labels | Additional labels to be added to the ServiceMonitor | `{}` | +| serviceMonitor.relabelings | Additional relabelings to be added to the endpoint of the ServiceMonitor | `[]` | | serviceAccount.name | The name of the service account which is used | `Release.Name` | | service.name | The name of service which exposes the kubenurse application | `8080-8080` | | service.port | The port number of the service | `8080` |