Merge pull request #239 from deNBI/dev

Dev

.env.in

@@ -1,2 +1,5 @@
 CLOUD_CLIENT_TAG=
-FORC_API_KEY=
+FORC_API_KEY=
+ELASTIC_USER=
+ELASTIC_PASSWORD=
+FILEBEAT_TAG=7.1.0

CHANGELOG.md

@@ -1,3 +1,15 @@
+##  (2020-02-27)
+
+
+#### Bug Fixes
+
+* **filebeat:**  elastic output url as variable ([423dbfc0](423dbfc0))
+
+#### Features
+
+* **filebeat:**  container harvesting client logs ([87d46a57](87d46a57))
+
+
 ##  (2020-02-23)
 
 

docker-compose.dev.yml

@@ -31,7 +31,6 @@ services:
     networks:
       - portal
 
-
 networks:
   portal:
     name: portal_default

docker-compose.yml

@@ -18,6 +18,7 @@ services:
     volumes:
       - ./VirtualMachineService/config/config.yml:/code/VirtualMachineService/config.yml
       - ./VirtualMachineService/keys/localhost/server.pem:/code/VirtualMachineService/keys/server.pem
+      - ./logs/client:/code/VirtualMachineService/log:rw
     command: python3 VirtualMachineServer.py /code/VirtualMachineService/config.yml
     networks:
      - portal
@@ -29,6 +30,20 @@ services:
     networks:
       - portal
 
+  # filebeat
+  filebeat:
+    image: docker.elastic.co/beats/filebeat:${FILEBEAT_TAG}
+    environment:
+      - ELASTIC_USER
+      - ELASTIC_PASSWORD
+    volumes:
+      - ./filebeat/filebeat.yml:/usr/share/filebeat/filebeat.yml
+      - ./logs:/usr/share/filebeat/log:ro
+      - ./filebeat/data:/usr/share/filebeat/data:rw
+    command: [sh, -c, "chmod go-w /usr/share/filebeat/filebeat.yml && filebeat run -e"]
+    networks:
+      - portal
+
 networks:
   portal:
     name: portal_default

filebeat/filebeat.yml

@@ -0,0 +1,19 @@
+output.elasticsearch:
+    hosts:
+      - https://cloud.denbi.de:443
+    path: /elasticsearch/
+    username: "${ELASTIC_USER}"
+    password: "${ELASTIC_PASSWORD}"
+    ssl:
+      verification_mode: none
+    timeout: 15
+
+filebeat.inputs:
+  - type: log
+    enabled: true
+    paths:
+      - /usr/share/filebeat/log/client/*.log
+    multiline:
+      pattern: '^\d{4}-\d{2}-\d{2}'
+      negate: true
+      match: after