From e2654898cc93aa1aa97aefff167cf22ca7476693 Mon Sep 17 00:00:00 2001
From: Nacho Barrientos <nacho.barrientos@cern.ch>
Date: Mon, 17 Mar 2025 11:46:56 +0100
Subject: [PATCH] Actually honour scrapping interval configuration
---
templates/kube_state/servicemonitor.yaml | 4 ++--
templates/node_exporter/podmonitor.yaml | 3 +++
values.yaml | 8 ++++----
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/templates/kube_state/servicemonitor.yaml b/templates/kube_state/servicemonitor.yaml
index c55b1c6..5f9811c 100644
--- a/templates/kube_state/servicemonitor.yaml
+++ b/templates/kube_state/servicemonitor.yaml
@@ -10,7 +10,7 @@ spec:
endpoints:
- port: http-metrics
scheme: http
- interval: 30s
+ interval: {{ .Values.metrics.kubeState.scrapeInterval }}
path: /metrics
{{- if and .Values.metrics.kubeState .Values.metrics.kubeState.serviceMonitor.relabelings }}
relabelings:
@@ -18,7 +18,7 @@ spec:
{{- end }}
- port: telemetry
scheme: http
- interval: 30s
+ interval: {{ .Values.metrics.kubeState.scrapeInterval }}
{{- if and .Values.metrics.kubeState .Values.metrics.kubeState.relabelings }}
relabelings:
{{- .Values.metrics.kubeState.relabelings | toYaml | nindent 4}}
diff --git a/templates/node_exporter/podmonitor.yaml b/templates/node_exporter/podmonitor.yaml
index a30bad9..fbf48f7 100644
--- a/templates/node_exporter/podmonitor.yaml
+++ b/templates/node_exporter/podmonitor.yaml
@@ -13,6 +13,9 @@ spec:
app.kubernetes.io/name: node-exporter
podMetricsEndpoints:
- targetPort: 9100
+ {{- if .Values.metrics.nodeExporter.scrapeInterval }}
+ interval: {{ .Values.metrics.nodeExporter.scrapeInterval }}
+ {{- end }}
relabelings:
- action: replace
sourceLabels:
diff --git a/values.yaml b/values.yaml
index 3cdf010..04a7983 100644
--- a/values.yaml
+++ b/values.yaml
@@ -48,8 +48,8 @@ metrics:
nodeExporter:
# -- if true node exporter will be installed as a daemon set together with a pod monitor
enabled: true
- # -- indicates how often node exporter will be scraped by the local prometheus
- scrapeInterval: "15s"
+ # -- indicates how often this exporter will be scraped by the local prometheus
+ scrapeInterval: ''
resources:
requests:
cpu: "5m"
@@ -67,8 +67,8 @@ metrics:
nodeSelector: {}
# -- if true kube state will be installed together with a service monitor
enabled: true
- # -- indicates how often node exporter will be scraped by the local prometheus
- scrapeInterval: "15s"
+ # -- indicates how often this exporter will be scraped by the local prometheus
+ scrapeInterval: "30s"
resources:
requests:
cpu: "5m"
--
GitLab