[stable/prometheus-node-exporter] add scrapeTimeout for the service m…

…onitor (#14293)

Signed-off-by: Ryan Belgrave <[email protected]>

stable/prometheus-node-exporter/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "0.18.0"
 description: A Helm chart for prometheus node-exporter
 name: prometheus-node-exporter
-version: 1.5.0
+version: 1.5.1
 home: https://github.com/prometheus/node_exporter/
 sources:
 - https://github.com/prometheus/node_exporter/

stable/prometheus-node-exporter/README.md

@@ -65,6 +65,7 @@ The following table lists the configurable parameters of the Node Exporter chart
 | `prometheus.monitor.enabled` | Set this to `true` to create ServiceMonitor for Prometheus operator | `false` | |
 | `prometheus.monitor.additionalLabels` | Additional labels that can be used so ServiceMonitor will be discovered by Prometheus | `{}` | |
 | `prometheus.monitor.namespace` | namespace where servicemonitor resource should be created | `the same namespace as prometheus node exporter` | |
+| `prometheus.monitor.scrapeTimeout` | Timeout after which the scrape is ended | `10s` | |
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
 

stable/prometheus-node-exporter/templates/monitor.yaml

@@ -14,4 +14,7 @@ spec:
       release: {{ .Release.Name }}
   endpoints:
     - port: metrics
+      {{- if .Values.prometheus.monitor.scrapeTimeout }}
+      scrapeTimeout: {{ .Values.prometheus.monitor.scrapeTimeout }}
+      {{- end }}
 {{- end }}

stable/prometheus-node-exporter/values.yaml

@@ -20,6 +20,8 @@ prometheus:
     additionalLabels: {}
     namespace: ""
 
+    scrapeTimeout: 10s
+
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little