From 1db4e9f84dbe741d708f5dfa24238a3e87c68d76 Mon Sep 17 00:00:00 2001
From: Aaron Taylor <me@ataylor.io>
Date: Wed, 5 Jul 2017 20:05:06 -0400
Subject: [PATCH] Prometheus: modify config to support k8s 1.6 by default
 (#1080)

* charts/stable/prometheus: modify config to support 1.6 by default

This commit adds support for Kubernetes 1.6 RBAC restrictions within
the prometheus configuration for scraping node metrics.

Fixes https://github.com/kubernetes/charts/issues/955

Initial discussion of the issue:
https://github.com/prometheus/prometheus/issues/2606

* stable/prometheus: bump chart minor version
---
 stable/prometheus/Chart.yaml  | 2 +-
 stable/prometheus/values.yaml | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/stable/prometheus/Chart.yaml b/stable/prometheus/Chart.yaml
index ad429f613e..b10c0e4ac2 100755
--- a/stable/prometheus/Chart.yaml
+++ b/stable/prometheus/Chart.yaml
@@ -1,5 +1,5 @@
 name: prometheus
-version: 3.0.3
+version: 3.1.0
 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 18592d2cbf..0dc510c049 100644
--- a/stable/prometheus/values.yaml
+++ b/stable/prometheus/values.yaml
@@ -515,6 +515,12 @@ serverFiles:
         relabel_configs:
           - action: labelmap
             regex: __meta_kubernetes_node_label_(.+)
+          - target_label: __address__
+            replacement: kubernetes.default.svc:443
+          - source_labels: [__meta_kubernetes_node_name]
+            regex: (.+)
+            target_label: __metrics_path__
+            replacement: /api/v1/nodes/${1}/proxy/metrics
 
       # Scrape config for service endpoints.
       #