From bae05410fd888738ed6792209b708b7d894d2f23 Mon Sep 17 00:00:00 2001 From: Andrew Seigner Date: Tue, 11 Sep 2018 14:45:55 -0700 Subject: [PATCH] Bump Prometheus to v2.4.0, Grafana to 5.2.4 (#1625) Prometheus v2.3.1 -> v2.4.0 Grafana 5.1.3 -> 5.2.4 Signed-off-by: Andrew Seigner --- cli/cmd/install.go | 2 +- cli/cmd/testdata/install_default.golden | 2 +- grafana/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/cmd/install.go b/cli/cmd/install.go index ce34a0fc8..c9d519d60 100644 --- a/cli/cmd/install.go +++ b/cli/cmd/install.go @@ -90,7 +90,7 @@ func validateAndBuildConfig(options *installOptions) (*installConfig, error) { Namespace: controlPlaneNamespace, ControllerImage: fmt.Sprintf("%s/controller:%s", options.dockerRegistry, options.linkerdVersion), WebImage: fmt.Sprintf("%s/web:%s", options.dockerRegistry, options.linkerdVersion), - PrometheusImage: "prom/prometheus:v2.3.1", + PrometheusImage: "prom/prometheus:v2.4.0", GrafanaImage: fmt.Sprintf("%s/grafana:%s", options.dockerRegistry, options.linkerdVersion), ControllerReplicas: options.controllerReplicas, WebReplicas: options.webReplicas, diff --git a/cli/cmd/testdata/install_default.golden b/cli/cmd/testdata/install_default.golden index 238be3f53..acb5ca183 100644 --- a/cli/cmd/testdata/install_default.golden +++ b/cli/cmd/testdata/install_default.golden @@ -478,7 +478,7 @@ spec: - args: - --storage.tsdb.retention=6h - --config.file=/etc/prometheus/prometheus.yml - image: prom/prometheus:v2.3.1 + image: prom/prometheus:v2.4.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/grafana/Dockerfile b/grafana/Dockerfile index 94c71cbd2..a7c7f1fbe 100644 --- a/grafana/Dockerfile +++ b/grafana/Dockerfile @@ -1,4 +1,4 @@ -FROM grafana/grafana:5.1.3 +FROM grafana/grafana:5.2.4 COPY grafana/dashboards /var/lib/grafana/dashboards COPY grafana/dashboards/top-line.json /usr/share/grafana/public/dashboards/home.json