linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <siggy@buoyant.io>
This commit is contained in:
Andrew Seigner 2018-09-11 14:45:55 -07:00 committed by GitHub
parent c4a0278a75
commit bae05410fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/cmd/install.go
View File

@ -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,

2
cli/cmd/testdata/install_default.golden vendored
View File

@ -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:

2
grafana/Dockerfile
View File

@ -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