public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into prometheus-heatmap

Browse Source
This commit is contained in:
Alexander Zobnin
2018-03-12 17:16:02 +03:00
parent 479209f483 1a781fcee1
commit 94cf560304
169 changed files with 3364 additions and 1521 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/blocks/prometheus2/Dockerfile
+1 -1
View File
@@ -1,3 +1,3 @@
FROM prom/prometheus:v2.0.0
FROM prom/prometheus:v2.2.0
ADD prometheus.yml /etc/prometheus/
ADD alert.rules /etc/prometheus/