From ea21375f1522d99e2f55ac1f954216a0c8ac4263 Mon Sep 17 00:00:00 2001 From: paulfantom Date: Thu, 1 Oct 2020 10:20:40 +0200 Subject: [PATCH 1/2] jsonnet/kube-prometheus/prometheus: ignore timestamps from cadvisor --- jsonnet/kube-prometheus/prometheus/prometheus.libsonnet | 1 + 1 file changed, 1 insertion(+) diff --git a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet index a1a52d8f..fa2bca05 100644 --- a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet +++ b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet @@ -312,6 +312,7 @@ local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; path: '/metrics/cadvisor', interval: '30s', honorLabels: true, + honorTimestamps: false, tlsConfig: { insecureSkipVerify: true, }, From 1e8a60ea5754de4174ce551efcc904bd13b6830b Mon Sep 17 00:00:00 2001 From: paulfantom Date: Thu, 1 Oct 2020 10:22:32 +0200 Subject: [PATCH 2/2] manifests: regenerate --- manifests/prometheus-serviceMonitorKubelet.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/manifests/prometheus-serviceMonitorKubelet.yaml b/manifests/prometheus-serviceMonitorKubelet.yaml index afa853aa..7db47ef0 100644 --- a/manifests/prometheus-serviceMonitorKubelet.yaml +++ b/manifests/prometheus-serviceMonitorKubelet.yaml @@ -53,6 +53,7 @@ spec: insecureSkipVerify: true - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token honorLabels: true + honorTimestamps: false interval: 30s metricRelabelings: - action: drop