From 4c4e8471e0926ffa995a68da3fbf7a1ea340ab1b Mon Sep 17 00:00:00 2001
From: Arseniy Kuznetsov <k.arseniy@gmail.com>
Date: Tue, 27 Dec 2022 16:35:52 +0100
Subject: [PATCH] fs-based logs

---
 docker-compose-mktxp-stack-fs.yml      | 21 ++++++++++++++++++---
 docker-compose-mktxp-stack-no-logs.yml |  6 +++++-
 docker-compose-mktxp-stack.yml         | 10 +++++++++-
 syslog-ng/logs/.gitkeep                |  0
 4 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 syslog-ng/logs/.gitkeep

diff --git a/docker-compose-mktxp-stack-fs.yml b/docker-compose-mktxp-stack-fs.yml
index 0bcda0e..9d59531 100644
--- a/docker-compose-mktxp-stack-fs.yml
+++ b/docker-compose-mktxp-stack-fs.yml
@@ -1,5 +1,15 @@
+version: '3.4'
+
 networks:
   mktxp: {}
+
+volumes:
+  mktxp-logs:
+    driver_opts:
+       o: bind
+       type: none
+       device: $PWD/syslog-ng/logs
+
 services:
   mktxp:
     container_name: mktxp
@@ -9,6 +19,7 @@ services:
     networks:
       mktxp: null
     restart: unless-stopped  
+
   grafana:
     container_name: grafana
     environment:
@@ -31,6 +42,7 @@ services:
     - ./grafana/provisioning/datasources:/etc/grafana/provisioning/datasources:ro
     - ./grafana/provisioning/dashboards:/etc/grafana/provisioning/dashboards:ro
     - ./grafana/dashboards:/var/lib/grafana/dashboards
+
   loki:
     command: -config.file=/etc/loki/loki-config.yml
     container_name: loki
@@ -44,6 +56,7 @@ services:
     restart: always
     volumes:
     - ./loki/loki-config.yml:/etc/loki/loki-config.yml
+
   prometheus:
     command:
     - --config.file=/etc/prometheus/prometheus.yml
@@ -60,6 +73,7 @@ services:
     restart: always
     volumes:
     - ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml:ro
+
   promtail:
     command: -config.file=/etc/promtail/promtail-config.yml
     container_name: promtail
@@ -76,7 +90,8 @@ services:
     restart: always
     volumes:
     - ./promtail/promtail-config-fs.yml:/etc/promtail/promtail-config.yml:ro
-    - ./syslog-ng/logs:/var/log:ro
+    - mktxp-logs:/var/log:ro
+
   syslog-ng:
     command: -edv
     container_name: syslog-ng
@@ -95,5 +110,5 @@ services:
     restart: always
     volumes:
     - ./syslog-ng/syslog-ng-fs.conf:/etc/syslog-ng/syslog-ng.conf:ro
-    - ./syslog-ng/logs:/var/log/syslog-ng
-version: '3.3'
+    - mktxp-logs:/var/log/syslog-ng
+
diff --git a/docker-compose-mktxp-stack-no-logs.yml b/docker-compose-mktxp-stack-no-logs.yml
index bd55b07..812d14e 100644
--- a/docker-compose-mktxp-stack-no-logs.yml
+++ b/docker-compose-mktxp-stack-no-logs.yml
@@ -1,5 +1,8 @@
+version: '3.4'
+
 networks:
   mktxp: {}
+
 services:
   mktxp:
     container_name: mktxp
@@ -9,6 +12,7 @@ services:
     networks:
       mktxp: null
     restart: unless-stopped  
+
   grafana:
     container_name: grafana
     environment:
@@ -31,6 +35,7 @@ services:
     - ./grafana/provisioning/datasources:/etc/grafana/provisioning/datasources:ro
     - ./grafana/provisioning/dashboards:/etc/grafana/provisioning/dashboards:ro
     - ./grafana/dashboards:/var/lib/grafana/dashboards
+
   prometheus:
     command:
     - --config.file=/etc/prometheus/prometheus.yml
@@ -47,4 +52,3 @@ services:
     restart: always
     volumes:
     - ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml:ro
-version: '3.3'
diff --git a/docker-compose-mktxp-stack.yml b/docker-compose-mktxp-stack.yml
index bb93b14..5c9e7dc 100644
--- a/docker-compose-mktxp-stack.yml
+++ b/docker-compose-mktxp-stack.yml
@@ -1,5 +1,8 @@
+version: '3.4'
+
 networks:
   mktxp: {}
+
 services:
   mktxp:
     container_name: mktxp
@@ -9,6 +12,7 @@ services:
     networks:
       mktxp: null
     restart: unless-stopped  
+
   grafana:
     container_name: grafana
     environment:
@@ -31,6 +35,7 @@ services:
     - ./grafana/provisioning/datasources:/etc/grafana/provisioning/datasources:ro
     - ./grafana/provisioning/dashboards:/etc/grafana/provisioning/dashboards:ro
     - ./grafana/dashboards:/var/lib/grafana/dashboards
+
   loki:
     command: -config.file=/etc/loki/loki-config.yml
     container_name: loki
@@ -44,6 +49,7 @@ services:
     restart: always
     volumes:
     - ./loki/loki-config.yml:/etc/loki/loki-config.yml
+
   prometheus:
     command:
     - --config.file=/etc/prometheus/prometheus.yml
@@ -60,6 +66,7 @@ services:
     restart: always
     volumes:
     - ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml:ro
+
   promtail:
     command: -config.file=/etc/promtail/promtail-config.yml
     container_name: promtail
@@ -76,6 +83,7 @@ services:
     restart: always
     volumes:
     - ./promtail/promtail-config.yml:/etc/promtail/promtail-config.yml:ro
+
   syslog-ng:
     command: -edv
     container_name: syslog-ng
@@ -94,4 +102,4 @@ services:
     restart: always
     volumes:
     - ./syslog-ng/syslog-ng.conf:/etc/syslog-ng/syslog-ng.conf:ro
-version: '3.3'
+
diff --git a/syslog-ng/logs/.gitkeep b/syslog-ng/logs/.gitkeep
new file mode 100644
index 0000000..e69de29