Added option to set docker max log size

elkserver/.env.tmpl

@@ -15,7 +15,9 @@ REDELKREPO=outflanknl
 
 ## Docker generic variables
 COMPOSE_PROJECT_NAME=redelk
-
+# Defines the maximum log size per container (https://docs.docker.com/compose/compose-file/compose-file-v3/#logging)
+LOG_MAX_SIZE=200m
+LOG_MAX_FILE=1
 
 ## Variables for ES, Logstash and Kibana
 CERTS_DIR_ES=/usr/share/elasticsearch/config/certificates

elkserver/redelk-dev.yml

@@ -64,6 +64,11 @@ services:
       - CREDS_redelk=${CREDS_redelk}
       - ES_URL=${ES_URL}
     restart: always
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "${LOG_MAX_SIZE}"
+        max-file: "${LOG_MAX_FILE}"
 
   logstash:
     container_name: redelk-logstash
@@ -101,6 +106,11 @@ services:
       - XPACK_MONITORING_ELASTICSEARCH_PASSWORD=${CREDS_logstash_system}
       - XPACK_MONITORING_ELASTICSEARCH_SSL_CERTIFICATE_AUTHORITY=${CERTS_LOGSTASH_OUTPUT_CA}
     restart: always
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "${LOG_MAX_SIZE}"
+        max-file: "${LOG_MAX_FILE}"
     depends_on:
       - elasticsearch
 
@@ -129,11 +139,14 @@ services:
       - SERVER_SSL_KEY=${CERTS_DIR_KBN}/redelk-kibana/redelk-kibana.key
       - XPACK_ENCRYPTEDSAVEDOBJECTS_ENCRYPTIONKEY=${KBN_XPACK_ENCRYPTEDSAVEDOBJECTS}
     restart: always
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "${LOG_MAX_SIZE}"
+        max-file: "${LOG_MAX_FILE}"
     depends_on:
       - logstash
 
-    restart: always
-
   nginx:
     container_name: redelk-nginx
     image: nginx:latest
@@ -155,6 +168,11 @@ services:
       - TLS_NGINX_CA_PATH=${TLS_NGINX_CA_PATH}
     command: "/bin/sh -c 'while :; do sleep 6h & wait $${!}; nginx -s reload; done & /docker-entrypoint.d/20-envsubst-on-templates.sh; nginx -g \"daemon off;\"'"
     restart: always
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "${LOG_MAX_SIZE}"
+        max-file: "${LOG_MAX_FILE}"
 
   certbot:
     container_name: redelk-certbot
@@ -166,6 +184,11 @@ services:
       - ./mounts/certbot/www:/var/www/certbot
     entrypoint: "/bin/sh -c 'trap exit TERM; while :; do certbot renew; sleep 12h & wait $${!}; done;'"
     restart: always
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "${LOG_MAX_SIZE}"
+        max-file: "${LOG_MAX_FILE}"
     depends_on:
       - nginx
 
@@ -184,6 +207,11 @@ services:
     environment:
       - ELASTIC_PASSWORD=${ELASTIC_PASSWORD}
     restart: always
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "${LOG_MAX_SIZE}"
+        max-file: "${LOG_MAX_FILE}"
     depends_on:
       - nginx
 
@@ -197,6 +225,11 @@ services:
     volumes:
       - ./mounts/jupyter-workbooks:/home/jovyan/work
     restart: always
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "${LOG_MAX_SIZE}"
+        max-file: "${LOG_MAX_FILE}"
     depends_on:
       - base
 
@@ -216,6 +249,11 @@ services:
       - NEO4J_dbms_memory_heap_max__size=${NEO4J_dbms_memory_heap_max__size}
       - NEO4J_dbms_memory_pagecache_size=${NEO4J_dbms_memory_pagecache_size}
     restart: always
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "${LOG_MAX_SIZE}"
+        max-file: "${LOG_MAX_FILE}"
     depends_on:
       - jupyter
 
@@ -229,5 +267,10 @@ services:
       - ./mounts/sample-data/logs:/var/log/sample-data:ro
       - ./mounts/certs:/usr/share/filebeat/certs:ro
     command: ['filebeat', '-e', '-strict.perms=false']
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "${LOG_MAX_SIZE}"
+        max-file: "${LOG_MAX_FILE}"
     depends_on:
       - logstash

elkserver/redelk-full.yml

@@ -29,7 +29,7 @@ services:
     networks:
       - net
     ports:
-      - "127.0.0.01:9200:9200"
+      - "127.0.0.1:9200:9200"
     expose:
       - "9200"
     volumes:
@@ -64,6 +64,11 @@ services:
       - CREDS_redelk=${CREDS_redelk}
       - ES_URL=${ES_URL}
     restart: always
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "${LOG_MAX_SIZE}"
+        max-file: "${LOG_MAX_FILE}"
 
   logstash:
     container_name: redelk-logstash
@@ -101,6 +106,11 @@ services:
       - XPACK_MONITORING_ELASTICSEARCH_PASSWORD=${CREDS_logstash_system}
       - XPACK_MONITORING_ELASTICSEARCH_SSL_CERTIFICATE_AUTHORITY=${CERTS_LOGSTASH_OUTPUT_CA}
     restart: always
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "${LOG_MAX_SIZE}"
+        max-file: "${LOG_MAX_FILE}"
     depends_on:
       - elasticsearch
 
@@ -126,6 +136,11 @@ services:
       - SERVER_SSL_KEY=${CERTS_DIR_KBN}/redelk-kibana/redelk-kibana.key
       - XPACK_ENCRYPTEDSAVEDOBJECTS_ENCRYPTIONKEY=${KBN_XPACK_ENCRYPTEDSAVEDOBJECTS}
     restart: always
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "${LOG_MAX_SIZE}"
+        max-file: "${LOG_MAX_FILE}"
     depends_on:
       - logstash
 
@@ -150,17 +165,27 @@ services:
       - TLS_NGINX_CA_PATH=${TLS_NGINX_CA_PATH}
     command: "/bin/sh -c 'while :; do sleep 6h & wait $${!}; nginx -s reload; done & /docker-entrypoint.d/20-envsubst-on-templates.sh; nginx -g \"daemon off;\"'"
     restart: always
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "${LOG_MAX_SIZE}"
+        max-file: "${LOG_MAX_FILE}"
 
   certbot:
     container_name: redelk-certbot
     image: certbot/certbot
     networks:
-      - net  
+      - net
     volumes:
       - ./mounts/certbot/conf:/etc/letsencrypt
       - ./mounts/certbot/www:/var/www/certbot
     entrypoint: "/bin/sh -c 'trap exit TERM; while :; do certbot renew; sleep 12h & wait $${!}; done;'"
     restart: always
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "${LOG_MAX_SIZE}"
+        max-file: "${LOG_MAX_FILE}"
     depends_on:
       - nginx
 
@@ -178,6 +203,11 @@ services:
     environment:
       - ELASTIC_PASSWORD=${ELASTIC_PASSWORD}
     restart: always
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "${LOG_MAX_SIZE}"
+        max-file: "${LOG_MAX_FILE}"
     depends_on:
       - nginx
 
@@ -210,5 +240,10 @@ services:
       - NEO4J_dbms_memory_heap_max__size=${NEO4J_dbms_memory_heap_max__size}
       - NEO4J_dbms_memory_pagecache_size=${NEO4J_dbms_memory_pagecache_size}
     restart: always
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "${LOG_MAX_SIZE}"
+        max-file: "${LOG_MAX_FILE}"
     depends_on:
       - jupyter

elkserver/redelk-limited.yml

@@ -62,6 +62,11 @@ services:
       - CREDS_redelk=${CREDS_redelk}
       - ES_URL=${ES_URL}
     restart: always
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "${LOG_MAX_SIZE}"
+        max-file: "${LOG_MAX_FILE}"
 
   logstash:
     container_name: redelk-logstash
@@ -99,6 +104,11 @@ services:
       - XPACK_MONITORING_ELASTICSEARCH_PASSWORD=${CREDS_logstash_system}
       - XPACK_MONITORING_ELASTICSEARCH_SSL_CERTIFICATE_AUTHORITY=${CERTS_LOGSTASH_OUTPUT_CA}
     restart: always
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "${LOG_MAX_SIZE}"
+        max-file: "${LOG_MAX_FILE}"
     depends_on:
       - elasticsearch
 
@@ -124,6 +134,11 @@ services:
       - SERVER_SSL_KEY=${CERTS_DIR_KBN}/redelk-kibana/redelk-kibana.key
       - XPACK_ENCRYPTEDSAVEDOBJECTS_ENCRYPTIONKEY=${KBN_XPACK_ENCRYPTEDSAVEDOBJECTS}
     restart: always
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "${LOG_MAX_SIZE}"
+        max-file: "${LOG_MAX_FILE}"
     depends_on:
       - logstash
 
@@ -148,15 +163,27 @@ services:
       - TLS_NGINX_CA_PATH=${TLS_NGINX_CA_PATH}
     command: "/bin/sh -c 'while :; do sleep 6h & wait $${!}; nginx -s reload; done & /docker-entrypoint.d/20-envsubst-on-templates.sh; nginx -g \"daemon off;\"'"
     restart: always
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "${LOG_MAX_SIZE}"
+        max-file: "${LOG_MAX_FILE}"
 
   certbot:
     container_name: redelk-certbot
     image: certbot/certbot
+    networks:
+      - net
     volumes:
       - ./mounts/certbot/conf:/etc/letsencrypt
       - ./mounts/certbot/www:/var/www/certbot
     entrypoint: "/bin/sh -c 'trap exit TERM; while :; do certbot renew; sleep 12h & wait $${!}; done;'"
     restart: always
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "${LOG_MAX_SIZE}"
+        max-file: "${LOG_MAX_FILE}"
     depends_on:
       - nginx
 
@@ -174,5 +201,10 @@ services:
     environment:
       - ELASTIC_PASSWORD=${ELASTIC_PASSWORD}
     restart: always
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "${LOG_MAX_SIZE}"
+        max-file: "${LOG_MAX_FILE}"
     depends_on:
       - nginx