HPC/prometheus
11
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wow a lot of changes happend since I set this up in October. I locked down the Prometheus version to 0.16.1, fixed the docker-compose to align the new config commands, and updated the prometheus.yml format to the new standard.

Browse Source
This commit is contained in:
vegasbrianc 2015-11-18 10:52:09 +01:00
commit 1129344fd8
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker-compose.yml
View File

@ -37,7 +37,11 @@ promdash:
- /tmp/prom:/tmp/prom - /tmp/prom:/tmp/prom
environment: environment:
- "DATABASE_URL=sqlite3:/tmp/prom/file.sqlite3" - "DATABASE_URL=sqlite3:/tmp/prom/file.sqlite3"
<<<<<<< HEAD
name: "promdash" name: "promdash"
=======
name: promdash
>>>>>>> 8fd61f32ac17388fe8505e41ddbd2fb91babe945
cadvisor: cadvisor:
image: "google/cadvisor" image: "google/cadvisor"
@ -50,4 +54,8 @@ cadvisor:
- "8080:8080" - "8080:8080"
expose: expose:
- "8080" - "8080"
<<<<<<< HEAD
name: "cadvisor" name: "cadvisor"
=======
name: cadvisor
>>>>>>> 8fd61f32ac17388fe8505e41ddbd2fb91babe945