From d78a24c453b5cf64b274fb1703a730fb37bcdd34 Mon Sep 17 00:00:00 2001 From: Minh Danh Date: Fri, 16 Aug 2019 06:28:34 +0700 Subject: [PATCH] [stable/helm-exporter] Support scrapeTimeout to avoid timeouts (#16310) * Support scrapeTimeout to avoid timeouts Signed-off-by: Minh Danh * Bump version to 0.3.1 Signed-off-by: Minh Danh * Use latest image Signed-off-by: Minh Danh --- stable/helm-exporter/Chart.yaml | 2 +- stable/helm-exporter/templates/servicemonitor.yaml | 3 +++ stable/helm-exporter/values.yaml | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/stable/helm-exporter/Chart.yaml b/stable/helm-exporter/Chart.yaml index 746239806d..bf887002d8 100644 --- a/stable/helm-exporter/Chart.yaml +++ b/stable/helm-exporter/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "0.4.0" description: Exports helm release stats to prometheus name: helm-exporter -version: 0.3.0 +version: 0.3.1 home: https://github.com/sstarcher/helm-exporter sources: - https://github.com/sstarcher/helm-exporter diff --git a/stable/helm-exporter/templates/servicemonitor.yaml b/stable/helm-exporter/templates/servicemonitor.yaml index e8e20f0032..49cfaeb24d 100644 --- a/stable/helm-exporter/templates/servicemonitor.yaml +++ b/stable/helm-exporter/templates/servicemonitor.yaml @@ -21,6 +21,9 @@ spec: {{- with .Values.serviceMonitor.interval }} interval: {{ . }} {{- end }} + {{- with .Values.serviceMonitor.scrapeTimeout }} + scrapeTimeout: {{ . }} + {{- end }} namespaceSelector: matchNames: - {{ .Release.Namespace }} diff --git a/stable/helm-exporter/values.yaml b/stable/helm-exporter/values.yaml index 71d07c33a1..548e5c6825 100644 --- a/stable/helm-exporter/values.yaml +++ b/stable/helm-exporter/values.yaml @@ -2,7 +2,7 @@ replicaCount: 1 image: repository: sstarcher/helm-exporter - tag: 0.4.0 + tag: 0.4.2 pullPolicy: Always # To override default tiller namespace name or to provide the multiple tiller namespaces like "kube-system,dev" @@ -34,6 +34,7 @@ serviceMonitor: # Specifies whether a ServiceMonitor should be created create: false interval: + scrapeTimeout: namespace: additionalLabels: {}