From a6a8578631ac7691e567baed05a348ad8f7dcd42 Mon Sep 17 00:00:00 2001 From: Ilya Braude Date: Fri, 4 Aug 2017 00:59:20 -0400 Subject: [PATCH 1/3] fixed prometheus data persistence, see #580 --- templates/Prometheus/5/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/Prometheus/5/docker-compose.yml b/templates/Prometheus/5/docker-compose.yml index edc8d6f..1d7776b 100644 --- a/templates/Prometheus/5/docker-compose.yml +++ b/templates/Prometheus/5/docker-compose.yml @@ -35,7 +35,7 @@ prometheus: volumes_from: - prom-conf volumes: - - /data/ + - /prometheus links: - cadvisor:cadvisor - node-exporter:node-exporter From 433f445400c804093e54fd13bed26491974bbd9d Mon Sep 17 00:00:00 2001 From: Ilya Braude Date: Fri, 4 Aug 2017 01:34:33 -0400 Subject: [PATCH 2/3] update that actually persists grafana and prometheus data in a named volume --- templates/Prometheus/5/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/Prometheus/5/docker-compose.yml b/templates/Prometheus/5/docker-compose.yml index 1d7776b..95bb378 100644 --- a/templates/Prometheus/5/docker-compose.yml +++ b/templates/Prometheus/5/docker-compose.yml @@ -35,7 +35,7 @@ prometheus: volumes_from: - prom-conf volumes: - - /prometheus + - prometheus-data:/prometheus links: - cadvisor:cadvisor - node-exporter:node-exporter @@ -48,7 +48,7 @@ graf-db: image: infinityworks/graf-db:11 command: cat volumes: - - /var/lib/grafana/ + - prometheus-grafana:/var/lib/grafana/ net: none grafana: From 70eaa8f6534c027b1174a8a7a1a40f2fba846388 Mon Sep 17 00:00:00 2001 From: Ilya Braude Date: Fri, 4 Aug 2017 01:43:07 -0400 Subject: [PATCH 3/3] reverted grafana volume change because it needs to read the pre-configured db from the image --- templates/Prometheus/5/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/Prometheus/5/docker-compose.yml b/templates/Prometheus/5/docker-compose.yml index 95bb378..69d9481 100644 --- a/templates/Prometheus/5/docker-compose.yml +++ b/templates/Prometheus/5/docker-compose.yml @@ -48,7 +48,7 @@ graf-db: image: infinityworks/graf-db:11 command: cat volumes: - - prometheus-grafana:/var/lib/grafana/ + - /var/lib/grafana/ net: none grafana: