From aacc95b74cd42127f258ee31cdfadf12a27008b6 Mon Sep 17 00:00:00 2001
From: Frederic Branczyk <fbranczyk@gmail.com>
Date: Thu, 11 Jan 2018 15:18:12 +0100
Subject: [PATCH] kube-prometheus: bump various versions

---
 assets/prometheus/rules/etcd3.rules.yaml                        | 2 +-
 .../templates/grafana-deployment-template.yaml                  | 2 +-
 manifests/alertmanager/alertmanager.yaml                        | 2 +-
 manifests/grafana/grafana-deployment.yaml                       | 2 +-
 manifests/kube-state-metrics/kube-state-metrics-deployment.yaml | 2 +-
 manifests/node-exporter/node-exporter-daemonset.yaml            | 2 +-
 manifests/prometheus/prometheus-k8s-rules.yaml                  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/assets/prometheus/rules/etcd3.rules.yaml b/assets/prometheus/rules/etcd3.rules.yaml
index fe879fe3..a16bf016 100644
--- a/assets/prometheus/rules/etcd3.rules.yaml
+++ b/assets/prometheus/rules/etcd3.rules.yaml
@@ -86,7 +86,7 @@ groups:
         }} are slow
       summary: slow HTTP requests
   - alert: EtcdMemberCommunicationSlow
-    expr: histogram_quantile(0.99, rate(etcd_network_member_round_trip_time_seconds_bucket[5m]))
+    expr: histogram_quantile(0.99, rate(etcd_network_peer_round_trip_time_seconds_bucket[5m]))
       > 0.15
     for: 10m
     labels:
diff --git a/hack/grafana-dashboards-configmap-generator/templates/grafana-deployment-template.yaml b/hack/grafana-dashboards-configmap-generator/templates/grafana-deployment-template.yaml
index b6b0f7ec..8a7b8c02 100644
--- a/hack/grafana-dashboards-configmap-generator/templates/grafana-deployment-template.yaml
+++ b/hack/grafana-dashboards-configmap-generator/templates/grafana-deployment-template.yaml
@@ -11,7 +11,7 @@ spec:
     spec:
       containers:
       - name: grafana
-        image: grafana/grafana:4.5.2
+        image: grafana/grafana:4.6.3
         env:
         - name: GF_AUTH_BASIC_ENABLED
           value: "true"
diff --git a/manifests/alertmanager/alertmanager.yaml b/manifests/alertmanager/alertmanager.yaml
index 22259ef4..00651044 100644
--- a/manifests/alertmanager/alertmanager.yaml
+++ b/manifests/alertmanager/alertmanager.yaml
@@ -6,4 +6,4 @@ metadata:
     alertmanager: main
 spec:
   replicas: 3
-  version: v0.9.1
+  version: v0.13.0
diff --git a/manifests/grafana/grafana-deployment.yaml b/manifests/grafana/grafana-deployment.yaml
index 4907dceb..29dd9022 100644
--- a/manifests/grafana/grafana-deployment.yaml
+++ b/manifests/grafana/grafana-deployment.yaml
@@ -11,7 +11,7 @@ spec:
     spec:
       containers:
       - name: grafana
-        image: grafana/grafana:4.5.2
+        image: grafana/grafana:4.6.3
         env:
         - name: GF_AUTH_BASIC_ENABLED
           value: "true"
diff --git a/manifests/kube-state-metrics/kube-state-metrics-deployment.yaml b/manifests/kube-state-metrics/kube-state-metrics-deployment.yaml
index 22a84108..6a79f02b 100644
--- a/manifests/kube-state-metrics/kube-state-metrics-deployment.yaml
+++ b/manifests/kube-state-metrics/kube-state-metrics-deployment.yaml
@@ -42,7 +42,7 @@ spec:
             memory: 40Mi
             cpu: 20m
       - name: kube-state-metrics
-        image: quay.io/coreos/kube-state-metrics:v1.2.0-rc.0
+        image: quay.io/coreos/kube-state-metrics:v1.2.0
         args:
         - "--host=127.0.0.1"
         - "--port=8081"
diff --git a/manifests/node-exporter/node-exporter-daemonset.yaml b/manifests/node-exporter/node-exporter-daemonset.yaml
index 701e491f..250398bd 100644
--- a/manifests/node-exporter/node-exporter-daemonset.yaml
+++ b/manifests/node-exporter/node-exporter-daemonset.yaml
@@ -17,7 +17,7 @@ spec:
       hostNetwork: true
       hostPID: true
       containers:
-      - image: quay.io/prometheus/node-exporter:v0.15.0
+      - image: quay.io/prometheus/node-exporter:v0.15.2
         args:
         - "--web.listen-address=127.0.0.1:9101"
         - "--path.procfs=/host/proc"
diff --git a/manifests/prometheus/prometheus-k8s-rules.yaml b/manifests/prometheus/prometheus-k8s-rules.yaml
index 0a667e01..5235ff2b 100644
--- a/manifests/prometheus/prometheus-k8s-rules.yaml
+++ b/manifests/prometheus/prometheus-k8s-rules.yaml
@@ -126,7 +126,7 @@ data:
             }} are slow
           summary: slow HTTP requests
       - alert: EtcdMemberCommunicationSlow
-        expr: histogram_quantile(0.99, rate(etcd_network_member_round_trip_time_seconds_bucket[5m]))
+        expr: histogram_quantile(0.99, rate(etcd_network_peer_round_trip_time_seconds_bucket[5m]))
           > 0.15
         for: 10m
         labels:
-- 
GitLab