Merge pull request #8 from pieterbrandsen/develop

Added logging var
pieterbrandsen · Jul 28, 2023 · 0f6de6f · 0f6de6f
2 parents b9aed18 + 9338e96
commit 0f6de6f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/docker-compose.example.yml b/docker-compose.example.yml
@@ -14,6 +14,12 @@ networks:
   #t#htraefik-net:
   #t#h  external: true
 
+x-logging: &default-logging
+  driver: "local"
+  options:
+    max-size: "50m"
+    max-file: "1"
+
 services:
   carbon-relay-ng:
     image: grafana/carbon-relay-ng
@@ -25,6 +31,7 @@ services:
       - 127.0.0.1:2003:2003
     networks:
       - internal
+    logging: *default-logging
   go-carbon:
     image: ghcr.io/go-graphite/go-carbon
     volumes:
@@ -34,6 +41,7 @@ services:
       #- ./logs/goCarbon:/var/log/go-carbon
     networks:
       - internal
+    logging: *default-logging
   carbon-api:
     image: pieterbrandsen/carbonapi-0.15.6
     volumes:
@@ -49,6 +57,7 @@ services:
       retries: 3
     networks:
       - internal
+    logging: *default-logging
   grafana:
     #t  container_name: grafana
     image: grafana/grafana-oss:9.3.6-ubuntu
@@ -66,6 +75,7 @@ services:
     networks:
       - external
       #t#h- traefik-net
+    logging: *default-logging
   #t  labels:
   #t    - "traefik.enable=true"
   #t    - "traefik.http.routers.grafana.rule=Host(`grafana.localhost`)"
@@ -91,3 +101,4 @@ services:
   #t    - 80:80
   #t    - 443:443
   #t    - 8080:8080
+  #t  logging: *default-logging
diff --git a/src/setup/setup.js b/src/setup/setup.js
@@ -70,7 +70,7 @@ async function UpdateDockerComposeFile() {
     exampleDockerComposeText = exampleDockerComposeText.replace('#t    - "traefik.enable=true"', '    - "traefik.enable=true"');
     exampleDockerComposeText = exampleDockerComposeText.replace('#t    - "traefik.http.routers.grafana.rule=Host(`grafana.localhost`)"', '    - "traefik.http.routers.grafana.rule=Host(`grafana.localhost`)"');
     exampleDockerComposeText = exampleDockerComposeText.replace('#t    - "traefik.http.services.grafana.loadbalancer.server.port=3000"', `    - "traefik.http.services.grafana.loadbalancer.server.port=${grafanaPort}"`);
-    exampleDockerComposeText = exampleDockerComposeText.replace(/\#t\#h/g, '');
+    exampleDockerComposeText = exampleDockerComposeText.replace(/#t#h/g, '');
     exampleDockerComposeText = exampleDockerComposeText.replace(/grafana.localhost/g, argv.grafanaDomain);
   }