From 48decdeb0e650a89c9f5d498cd56c236d9b8327a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Ma=CC=88der?= <mail@cimnine.ch>
Date: Tue, 20 Oct 2020 09:07:19 +0200
Subject: [PATCH] Monitoring parts to docker-compose.monitorin.yml

---
 docker-compose.monitoring.yml | 63 +++++++++++++++++++++++++++++++++++
 docker-compose.yml            | 59 +-------------------------------
 2 files changed, 64 insertions(+), 58 deletions(-)
 create mode 100644 docker-compose.monitoring.yml

diff --git a/docker-compose.monitoring.yml b/docker-compose.monitoring.yml
new file mode 100644
index 0000000..dc47731
--- /dev/null
+++ b/docker-compose.monitoring.yml
@@ -0,0 +1,63 @@
+version: '3.4'
+services:
+  # nginx
+  nginx-exporter:
+    image: nginx/nginx-prometheus-exporter
+    depends_on:
+    - nginx
+    command:
+    - -nginx.scrape-uri
+    - http://nginx:8081/stub_status
+
+  # postgres
+  postgres-exporter:
+    image: wrouesnel/postgres_exporter:v0.8.0
+    depends_on:
+    - postgres
+    env_file: env/postgres-exporter.env
+
+  # redis
+  redis-worker-exporter:
+    image: oliver006/redis_exporter
+    depends_on:
+    - redis
+    env_file: env/redis-worker-exporter.env
+  redis-cache-exporter:
+    image: oliver006/redis_exporter
+    depends_on:
+    - redis-cache
+    env_file: env/redis-cache-exporter.env
+
+  # prometheus
+  prometheus:
+    image: prom/prometheus:v2.22.0
+    depends_on:
+    - postgres-exporter
+    - redis-cache-exporter
+    - redis-worker-exporter
+    - nginx-exporter
+    - netbox
+    ports:
+    - 9090
+    volumes:
+    - ./monitoring/prometheus/:/etc/prometheus/
+    - prometheus-data:/prometheus/data
+
+  # grafana
+  grafana:
+    image: grafana/grafana:7.2.1
+    depends_on:
+    - prometheus
+    ports:
+    - 3000
+    volumes:
+    - ./monitoring/grafana/plugins/:/var/lib/grafana/plugins/:z,ro
+    - ./monitoring/grafana/provisioning/:/etc/grafana/provisioning/:z,ro
+    - ./monitoring/grafana/dashboards/:/etc/grafana/dashboards/:z,ro
+    - grafana-data:/var/lib/grafana
+
+volumes:
+  prometheus-data:
+    driver: local
+  grafana-data:
+    driver: local
diff --git a/docker-compose.yml b/docker-compose.yml
index 3c0af7d..8ad3efe 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -43,14 +43,6 @@ services:
     - netbox-static-files:/opt/netbox/netbox/static:ro
     - netbox-nginx-config:/etc/netbox-nginx/:ro
 
-  nginx-exporter:
-    image: nginx/nginx-prometheus-exporter
-    depends_on:
-    - nginx
-    command:
-    - -nginx.scrape-uri
-    - http://nginx:8081/stub_status
-
   # postgres
   postgres:
     image: postgres:12-alpine
@@ -58,14 +50,8 @@ services:
     volumes:
     - netbox-postgres-data:/var/lib/postgresql/data
 
-  postgres-exporter:
-    image: wrouesnel/postgres_exporter:v0.8.0
-    depends_on:
-    - postgres
-    env_file: env/postgres-exporter.env
-
   # redis
-  redis: &redis
+  redis:
     image: redis:6-alpine
     command:
     - sh
@@ -82,45 +68,6 @@ services:
     - redis-server --appendonly yes --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose
     env_file: env/redis-cache.env
 
-  redis-worker-exporter:
-    image: oliver006/redis_exporter
-    depends_on:
-    - redis
-    env_file: env/redis-worker-exporter.env
-  redis-cache-exporter:
-    image: oliver006/redis_exporter
-    depends_on:
-    - redis-cache
-    env_file: env/redis-cache-exporter.env
-
-  # prometheus
-  prometheus:
-    image: prom/prometheus:v2.22.0
-    depends_on:
-    - postgres-exporter
-    - redis-cache-exporter
-    - redis-worker-exporter
-    - nginx-exporter
-    - netbox
-    ports:
-    - 9090
-    volumes:
-    - ./monitoring/prometheus/:/etc/prometheus/
-    - prometheus-data:/prometheus/data
-
-  # grafana
-  grafana:
-    image: grafana/grafana:7.2.1
-    depends_on:
-    - prometheus
-    ports:
-    - 3000
-    volumes:
-    - ./monitoring/grafana/plugins/:/var/lib/grafana/plugins/:z,ro
-    - ./monitoring/grafana/provisioning/:/etc/grafana/provisioning/:z,ro
-    - ./monitoring/grafana/dashboards/:/etc/grafana/dashboards/:z,ro
-    - grafana-data:/var/lib/grafana
-
 volumes:
   netbox-static-files:
     driver: local
@@ -132,7 +79,3 @@ volumes:
     driver: local
   netbox-redis-data:
     driver: local
-  prometheus-data:
-    driver: local
-  grafana-data:
-    driver: local