From 5d224818b4651e8f58965e72b31878901bab2b41 Mon Sep 17 00:00:00 2001 From: lance Date: Fri, 7 Feb 2020 12:24:57 -0800 Subject: [PATCH] remove logstash dockerfile and use docker volumes for these finicky apps without on-fs requirements --- Docker/Dockerfile-logstash | 6 ------ Docker/docker-compose.deploy.yaml | 8 ++++++-- 2 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 Docker/Dockerfile-logstash diff --git a/Docker/Dockerfile-logstash b/Docker/Dockerfile-logstash deleted file mode 100644 index 3ea6198..0000000 --- a/Docker/Dockerfile-logstash +++ /dev/null @@ -1,6 +0,0 @@ -FROM docker.elastic.co/logstash/logstash:7.5.2 - -RUN rm -f /usr/share/logstash/pipeline/logstash.conf -RUN /usr/share/logstash/bin/logstash-plugin install logstash-output-elasticsearch - -ADD files/logstash.conf /usr/share/logstash/pipeline/logstash.conf diff --git a/Docker/docker-compose.deploy.yaml b/Docker/docker-compose.deploy.yaml index f07885b..a09cc7c 100644 --- a/Docker/docker-compose.deploy.yaml +++ b/Docker/docker-compose.deploy.yaml @@ -30,11 +30,15 @@ services: - ./Docker/files/grafana/dashboards.yaml:/etc/grafana/provisioning/dashboards/default.yaml:ro - ./Docker/files/grafana/prometheus.yaml:/etc/grafana/provisioning/datasources/prometheus.yaml:ro - ./Docker/files/grafana/xmrauctions_metrics.json:/var/lib/grafana/dashboards/xmrauctions_metrics.json:ro - - ./data/grafana:/var/lib/grafana + - grafana:/var/lib/grafana prometheus: image: prom/prometheus:v2.15.2 ports: - 9090:9090 volumes: - ./Docker/files/prometheus:/etc/prometheus - - ./data/prometheus/ + - prometheus:/prometheus + +volumes: + grafana: + prometheus: