From 596b8697d005fa388515a675346ca054f29f17e2 Mon Sep 17 00:00:00 2001
From: seph <seph@directionless.org>
Date: Tue, 17 Jul 2018 10:13:18 -0400
Subject: [PATCH] Set default scrape values
We default to a 30s scrapeInterval, we may as well also set scrapeTimeout to the same.
---
.../kube-state-metrics/kube-state-metrics.libsonnet | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet b/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
index 59c0104a..2805fc9d 100644
--- a/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
+++ b/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
@@ -7,7 +7,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
kubeStateMetrics+:: {
collectors: '', // empty string gets a default set
scrapeInterval: '30s',
- scrapeTimeout: '',
+ scrapeTimeout: '30s',
baseCPU: '100m',
baseMemory: '150Mi',
@@ -270,12 +270,13 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
port: 'https-main',
scheme: 'https',
interval: $._config.kubeStateMetrics.scrapeInterval,
+ scrapeTimeout: $._config.kubeStateMetrics.scrapeTimeout,
honorLabels: true,
bearerTokenFile: '/var/run/secrets/kubernetes.io/serviceaccount/token',
tlsConfig: {
insecureSkipVerify: true,
},
- } + if $._config.kubeStateMetrics.scrapeTimeout != '' then { scrapeTimeout: $._config.kubeStateMetrics.scrapeTimeout } else {},
+ },
{
port: 'https-self',
scheme: 'https',
--
GitLab