Add configuration for logging which works in swarm environments

docker-compose.efk.dev.yml

+version: "3.6"
+services:
+  fluentd:
+    image: registry.gitlab.eox.at/esa/prism/vs/fluentd:0.0.0-test
+    configs:
+      - source: fluentd-conf
+        target: /fluentd/etc/fluent.conf
+    ports:
+      - "24224:24224"
+      - "24224:24224/udp"
+    networks:
+      - intnet
+    deploy:
+      # fluentd doesn't need to be deployed globally, but it might be a good
+      # default to have it everywhere
+      mode: global
+  elasticsearch:
+    image: elasticsearch:7.9.0
+    ports:
+      - "9200:9200"
+    networks:
+      - intnet
+    environment:
+      - bootstrap.memory_lock=true
+      - "ES_JAVA_OPTS=-Xms256m -Xmx256m"
+      - "discovery.type=single-node"
+    deploy:
+      replicas: 1
+      placement:
+        constraints: [node.role == manager]
+      resources:
+        limits:
+          memory: 500M
+    volumes:
+      - es-data:/usr/share/elasticsearch/data
+  kibana:
+    image: kibana:7.9.0
+    ports:
+      - "5601:5601"
+    networks:
+      - intnet
+    deploy:
+      mode: replicated
+      replicas: 1
+      placement:
+        constraints: [node.role == manager]
+configs:
+  fluentd-conf:
+    file: ./fluentd/conf/fluent.conf
+volumes:
+  es-data:
+networks:
+  intnet:

docker-compose.efk.yml

-version: "3.6"
-
-services:
-  whoami:
-    image: tutum/hello-world
-    networks:
-      - net
-    ports:
-      - "8888:80"
-    logging:
-      driver: "fluentd"# Logging Driver
-      options:
-        tag: tutum    # TAG 
-    deploy:
-      restart_policy:
-           condition: on-failure
-           delay: 20s
-           max_attempts: 3
-           window: 120s
-      mode: replicated
-      replicas: 1
-      placement:
-        constraints: [node.role == manager]
-      update_config:
-        delay: 2s
- 
-  vizualizer:
-      image: dockersamples/visualizer
-      volumes:
-         - /var/run/docker.sock:/var/run/docker.sock
-      ports:
-        - "8080:8080"
-      networks:
-        - net
-      logging:
-        driver: "fluentd"
-        options:
-         tag: visualizer   #TAG 
-      deploy:
-          restart_policy:
-             condition: on-failure
-             delay: 20s
-             max_attempts: 3
-             window: 120s
-          mode: replicated # one container per manager node
-          replicas: 1
-          update_config:
-            delay: 2s
-          placement:
-             constraints: [node.role == manager]
- 
-        
-  fluentd:
-    image: fluentd-bm:1
-    volumes:
-      - ./fluentd/conf:/fluentd/etc
-    ports:
-      - "24224:24224"
-      - "24224:24224/udp"
-    networks:
-      - net
-    deploy:
-      restart_policy:
-           condition: on-failure
-           delay: 20s
-           max_attempts: 3
-           window: 120s
-      mode: replicated
-      replicas: 1
-      placement:
-        constraints: [node.role == manager]
-      update_config:
-        delay: 2s
- 
-  elasticsearch:
-    image: elasticsearch:7.9.0
-    ports:
-      - "9200:9200"
-    networks:
-      - net
-    environment:
-      - bootstrap.memory_lock=true
-      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
-      - "discovery.type=single-node"
-    logging:
-        driver: "json-file"
-        options:
-          max-size: 10M
-          max-file: 1  
-    deploy:
-      restart_policy:
-        condition: on-failure
-        delay: 20s
-        max_attempts: 3
-        window: 120s
-      mode: replicated
-      replicas: 1
-      placement:
-        constraints: [node.role == manager]
-      update_config:
-        delay: 2s
-      resources:
-        limits:
-          memory: 1000M
-    volumes:
-      - ./esdata:/usr/share/elasticsearch/data    
-      
-  kibana:
-    image: kibana:7.9.0
-    ports:
-      - "5601:5601"
-    networks:
-      - net
-    logging:
-        driver: "json-file"
-        options:
-           max-size: 10M
-           max-file: 1        
-    deploy:
-      restart_policy:
-        condition: on-failure
-        delay: 20s
-        max_attempts: 3
-        window: 120s
-      mode: replicated
-      replicas: 1
-      placement:
-        constraints: [node.role == manager]
-      update_config:
-        delay: 2s  
- 
-networks:
-  net:

docker-compose.logging-test.yml

+version: "3.6"
+
+services:
+  whoami:
+    image: tutum/hello-world
+    ports:
+      - "8888:80"
+    logging:
+      driver: "fluentd"# Logging Driver
+      options:
+        tag: tutum    # TAG 
+    deploy:
+      restart_policy:
+           condition: on-failure
+           delay: 20s
+           max_attempts: 3
+           window: 120s
+      mode: replicated
+      replicas: 2
+      update_config:
+        delay: 2s

docker-compose.vhr18.yml

@@ -167,49 +167,6 @@ services:
     image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:latest
     deploy:
       replicas: 1
-  fluentd:
-    image: fluentd-bm:2
-    volumes:
-      - ./fluentd/conf:/fluentd/etc
-    ports:
-      - "24224:24224"
-      - "24224:24224/udp"
-    networks:
-      - intnet
-    deploy:
-      replicas: 1
-      placement:
-        constraints: [node.role == manager]
-  elasticsearch:
-    image: elasticsearch:7.9.0
-    ports:
-      - "9200:9200"
-    networks:
-      - intnet
-    environment:
-      - bootstrap.memory_lock=true
-      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
-      - "discovery.type=single-node"
-    deploy:
-      replicas: 1
-      placement:
-        constraints: [node.role == manager]
-      resources:
-        limits:
-          memory: 1000M
-    volumes:
-      - ./esdata:/usr/share/elasticsearch/data
-  kibana:
-    image: kibana:7.9.0
-    ports:
-      - "5601:5601"
-    networks:
-      - intnet
-    deploy:
-      mode: replicated
-      replicas: 1
-      placement:
-        constraints: [node.role == manager]
 configs:
   init-db:
     file: ./config/vhr18_init-db.sh