1 files changed, 43 insertions, 13 deletions
diff --git a/elk/docker-compose.yaml b/elk/docker-compose.yaml
index aeb2694..21380b7 100644
--- a/elk/docker-compose.yaml
+++ b/elk/docker-compose.yaml
@@ -8,6 +8,10 @@ services:
       resources:
         limits:
           memory: 3072M
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "250m"
     networks:
       - lognet
     ports:
@@ -23,6 +27,10 @@ services:
       resources:
         limits:
           memory: 1024M
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "250m"
     networks:
       - lognet
     depends_on:
@@ -31,13 +39,21 @@ services:
       - MONITORING_ENABLED=true
       - LS_JAVA_OPTS=-Xms256m -Xmx256m
     ports:
-      - "127.0.0.1:5103:5000"
+      - "127.0.0.1:5044:5044"
+      - "127.0.0.1:50000:50000"
+    volumes:
+      - ./logstash.yml:/usr/share/logstash/config/logstash.yml:ro
+      - ./logstash.conf:/usr/share/logstash/pipline/logstash.conf:ro
   kibana:
     image: kibana:8.10.1
     deploy:
       resources:
         limits:
           memory: 1024M
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "250m"
     environment:
       - ELASTICSEARCH_URL=http://elastic:9200
     networks:
@@ -48,18 +64,32 @@ services:
       - elasticsearch
     volumes:
       - kibana-data:/usr/share/elasticsearch/data
-  # filebeat:
-  #   image: docker.elastic.co/beats/filebeat:7.10.1
-  #   networks:
-  #     - lognet
-  #   depends_on:
-  #     - elasticsearch
-  #   environment:
-  #     - setup.kibana.host=kibana:5601
-  #     - output.elasticsearch.hosts=["elasticsearch:9200"]
-  #   volumes:
-  #     - log-data:/logs/
-  #     - ./filebeat/config/filebeat.yml:/usr/share/filebeat/filebeat.yml
+  filebeat:
+    image: docker.elastic.co/beats/filebeat:8.10.1
+    deploy:
+      resources:
+        limits:
+          memory: 256M
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "250m"
+    user: root
+    command:
+      - -e
+      - --strict.perms=false
+    networks:
+      - lognet
+    depends_on:
+      - elasticsearch
+    environment:
+      - setup.kibana.host=kibana:5601
+      - output.elasticsearch.hosts=["http://elasticsearch:9200"]
+    volumes:
+      - log-data:/logs/
+      - /var/lib/docker/containers:/usr/share/dockerlogs/data:ro
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - ./filebeat.yml:/usr/share/filebeat/filebeat.yml:ro
 volumes:
   elk-data:
   log-data: