From dc8f124b589ae91b3b401bb1125636b396260a2f Mon Sep 17 00:00:00 2001 From: root Date: Tue, 18 Aug 2015 16:58:23 +0200 Subject: [PATCH] still broke --- docker-compose.yml | 22 +++++++++++++--------- prom/Dockerfile | 2 +- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index c633e8f..5f15506 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,17 +1,21 @@ prometheus: - image: "prom/prometheus" + build: "prom/" + ports: + - "9090:9090" expose: - "9090" - environment: - - "config.file=documentation/examples/prometheus.yml" + volumes: + - "$PWD/prometheus.yml:/etc/prometheus/prometheus.yml" + exporter: image: "prom/container-exporter" volumes: - - "/sys/fs/cgroup:/cgroup" - - "/var/run/docker.sock:/var/run/docker.sock prom/container-exporter" + - /sys/fs/cgroup:/cgroup + - /var/run/docker.sock:/var/run/docker.sock prom/container-exporter + ports: + - "9104:9104" expose: - "9104" - command: "-storage_driver=influxdb -storage_driver_db=cadvisor -storage_driver_host=influxsrv:8086" sqlite3: image: "prom/promdash" @@ -19,16 +23,16 @@ sqlite3: - "./bin/rake db:migrate" volumes: - "/tmp/prom:/tmp/prom" - environment: - "DATABASE_URL=sqlite3:/tmp/prom/file.sqlite3" promdash: image: "prom/promdash" + ports: + - "3000:3000" expose: - "3000" volumes: - - "/tmp/prom:/tmp/prom" - + - /tmp/prom:/tmp/prom environment: - "DATABASE_URL=sqlite3:/tmp/prom/file.sqlite3" diff --git a/prom/Dockerfile b/prom/Dockerfile index 2179ff2..4b0bc92 100644 --- a/prom/Dockerfile +++ b/prom/Dockerfile @@ -8,7 +8,7 @@ RUN apk add --update -t build-deps git mercurial bzr make \ && make build \ && cp prometheus promtool /bin/ \ && mkdir -p /etc/prometheus \ - && mv ./documentation/examples/prometheus.yml /etc/prometheus/prometheus.yml \ + #&& mv ./documentation/examples/prometheus.yml /etc/prometheus/prometheus.yml \ && mv ./console_libraries/ ./consoles/ /etc/prometheus/ \ && apk del --purge build-deps \ && rm -rf /app /var/cache/apk/*