From fe9a11bfff213ceece94adf776b26e4f39d5f0e6 Mon Sep 17 00:00:00 2001 From: Michal Cwienczek Date: Tue, 20 Feb 2018 06:56:38 +0100 Subject: [PATCH] [Prometheus] Updated cAdvisor endpoint (#3684) * Updated values.yaml cadvisor endpoint Updated cadvisor scape endpoint so that it is compatible with Kubernetes 1.7.3+ See more here https://github.com/prometheus/prometheus/issues/3181#issuecomment-329927699 * Added extensive description about the problem with cadvisor * Bumped chart version * Removed trailing spaces * Update Chart.yaml --- stable/prometheus/Chart.yaml | 2 +- stable/prometheus/values.yaml | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/stable/prometheus/Chart.yaml b/stable/prometheus/Chart.yaml index e9ce440fb3..ab17893a78 100755 --- a/stable/prometheus/Chart.yaml +++ b/stable/prometheus/Chart.yaml @@ -1,5 +1,5 @@ name: prometheus -version: 5.1.7 +version: 5.2.1 description: Prometheus is a monitoring system and time series database. home: https://prometheus.io/ icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png diff --git a/stable/prometheus/values.yaml b/stable/prometheus/values.yaml index 8589944035..ee81b10565 100644 --- a/stable/prometheus/values.yaml +++ b/stable/prometheus/values.yaml @@ -780,6 +780,11 @@ serverFiles: kubernetes_sd_configs: - role: node + # This configuration will work only on kubelet 1.7.3+ + # As the scrape endpoints for cAdvisor have changed + # if you are using older version you need to change the replacement to + # replacement: /api/v1/nodes/${1}:4194/proxy/metrics + # more info here https://github.com/coreos/prometheus-operator/issues/633 relabel_configs: - action: labelmap regex: __meta_kubernetes_node_label_(.+) @@ -788,7 +793,7 @@ serverFiles: - source_labels: [__meta_kubernetes_node_name] regex: (.+) target_label: __metrics_path__ - replacement: /api/v1/nodes/${1}:4194/proxy/metrics + replacement: /api/v1/nodes/${1}/proxy/metrics/cadvisor # Scrape config for service endpoints. #