Skip to content

Commit 69c7793

Browse files
siggysiggy
authored
Merge pull request #47 from linkerd/siggy/prom-graf-updates
Prometheus 1.8.2, Grafana 4.6.2 updates
2 parents aebff98 + c24eaf8 commit 69c7793

File tree

8 files changed

+528
-500
lines changed

8 files changed

+528
-500
lines changed

‎CHANGES.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
## In the next release
22

3+
## 0.1.7 2017-12-08
4+
5+
* Updated Prometheus to 1.8.2
6+
* Updated Grafana to 4.6.2
7+
* Changed anonymous Grafana user's org role from Admin to Editor
8+
39
## 0.1.6 2017-10-17
410

511
* Update Prometheus version from 1.4.1 to 1.7.0

‎Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM grafana/grafana:3.1.1
1+
FROM grafana/grafana:4.6.2
22
MAINTAINER Buoyant, Inc. <hello@buoyant.io>
33

44
EXPOSE 3000 9191
55

6-
ARG prometheus_version=1.7.0
6+
ARG prometheus_version=1.8.2
77
ARG prometheus_archive_name=prometheus-$prometheus_version.linux-amd64
88

99
RUN apt-get update && \
@@ -16,7 +16,7 @@ RUN mkdir -p /etc/prometheus
1616

1717
# prometheus setup
1818

19-
RUN wget https://github.com/prometheus/prometheus/releases/download/v$prometheus_version/$prometheus_archive_name.tar.gz && \
19+
RUN wget -O $prometheus_archive_name.tar.gz https://github.com/prometheus/prometheus/releases/download/v$prometheus_version/$prometheus_archive_name.tar.gz && \
2020
tar -xf /$prometheus_archive_name.tar.gz && \
2121
cp /$prometheus_archive_name/prometheus /bin/ && \
2222
cp /$prometheus_archive_name/promtool /bin/ && \

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ for more information see [Running Consul Agent in Client Mode](https://hub.docke
8484
Boot `linkerd-viz` locally:
8585

8686
```bash
87-
docker run -d --net=host -p 3000:3000 -p 9191:9191 buoyantio/linkerd-viz:0.1.6 consul
87+
docker run -d --net=host -p 3000:3000 -p 9191:9191 buoyantio/linkerd-viz:0.1.7 consul
8888
```
8989

9090
View dashboard

‎dcos/linkerd-viz.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"container": {
99
"type": "DOCKER",
1010
"docker": {
11-
"image": "buoyantio/linkerd-viz:0.1.6",
11+
"image": "buoyantio/linkerd-viz:0.1.7",
1212
"forcePullImage": true,
1313
"network": "HOST",
1414
"privileged": true

‎k8s/linkerd-viz.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
spec:
1717
containers:
1818
- name: linkerd-viz
19-
image: buoyantio/linkerd-viz:0.1.6
19+
image: buoyantio/linkerd-viz:0.1.7
2020
args: ["k8s"]
2121
imagePullPolicy: Always
2222
env:

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy