From 2b649e0dc5b5027c10c5148c8c2a49046ef48751 Mon Sep 17 00:00:00 2001
From: Adam Bem <adam.bem@zoho.eu>
Date: Thu, 16 Mar 2023 14:47:48 +0100
Subject: [PATCH 1/4] Basic Filebeat config

---
 Filebeat/Dockerfile          |  2 ++
 Filebeat/filebeat.docker.yml | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 Filebeat/Dockerfile
 create mode 100644 Filebeat/filebeat.docker.yml

diff --git a/Filebeat/Dockerfile b/Filebeat/Dockerfile
new file mode 100644
index 0000000..af42363
--- /dev/null
+++ b/Filebeat/Dockerfile
@@ -0,0 +1,2 @@
+FROM docker.elastic.co/beats/filebeat:8.6.2
+COPY --chown=root:filebeat filebeat.docker.yml /usr/share/filebeat/filebeat.yml
\ No newline at end of file
diff --git a/Filebeat/filebeat.docker.yml b/Filebeat/filebeat.docker.yml
new file mode 100644
index 0000000..9176ace
--- /dev/null
+++ b/Filebeat/filebeat.docker.yml
@@ -0,0 +1,22 @@
+filebeat.config:
+  modules:
+    path: ${path.config}/modules.d/*.yml
+    reload.enabled: false
+
+filebeat.autodiscover:
+  providers:
+    - type: docker
+      hints.enabled: true
+
+processors:
+- add_cloud_metadata: ~
+
+output.elasticsearch:
+  hosts: '${ELASTICSEARCH_HOSTS:elc-0.zipper.release11.com:9200}'
+  index: 'xmltools-dev-%{+yyyy.MM}'
+
+
+setup.template:
+  name: 'xmltools-dev'
+  pattern: 'xmltools-*'
+  enabled: false
\ No newline at end of file
-- 
2.51.0


From 52d8e6e6ee405891a61b9a22eedcaa043c2aae62 Mon Sep 17 00:00:00 2001
From: Adam Bem <adam.bem@zoho.eu>
Date: Thu, 16 Mar 2023 15:37:07 +0100
Subject: [PATCH 2/4] Filebeat now reads index from env variable

---
 Filebeat/filebeat.docker.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Filebeat/filebeat.docker.yml b/Filebeat/filebeat.docker.yml
index 9176ace..45def6d 100644
--- a/Filebeat/filebeat.docker.yml
+++ b/Filebeat/filebeat.docker.yml
@@ -13,10 +13,20 @@ processors:
 
 output.elasticsearch:
   hosts: '${ELASTICSEARCH_HOSTS:elc-0.zipper.release11.com:9200}'
-  index: 'xmltools-dev-%{+yyyy.MM}'
+  index: 'xmltools-${ENV_TYPE}-%{+yyyy.MM}'
 
 
 setup.template:
   name: 'xmltools-dev'
   pattern: 'xmltools-*'
+  enabled: false
+
+setup.template:
+  name: 'xmltools-test'
+  pattern: 'xmltools-*'
+  enabled: false
+
+setup.template:
+  name: 'xmltools-prod'
+  pattern: 'xmltools-*'
   enabled: false
\ No newline at end of file
-- 
2.51.0


From 0147bedd84e77fb3a590a3bea7e20099cc5fe4dc Mon Sep 17 00:00:00 2001
From: Adam Bem <adam.bem@zoho.eu>
Date: Mon, 20 Mar 2023 11:16:01 +0100
Subject: [PATCH 3/4] Filebeat now runs from docker-compose

---
 Filebeat/filebeat.docker.yml | 19 +------------------
 docker-compose.yml           | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/Filebeat/filebeat.docker.yml b/Filebeat/filebeat.docker.yml
index 45def6d..a44474e 100644
--- a/Filebeat/filebeat.docker.yml
+++ b/Filebeat/filebeat.docker.yml
@@ -12,21 +12,4 @@ processors:
 - add_cloud_metadata: ~
 
 output.elasticsearch:
-  hosts: '${ELASTICSEARCH_HOSTS:elc-0.zipper.release11.com:9200}'
-  index: 'xmltools-${ENV_TYPE}-%{+yyyy.MM}'
-
-
-setup.template:
-  name: 'xmltools-dev'
-  pattern: 'xmltools-*'
-  enabled: false
-
-setup.template:
-  name: 'xmltools-test'
-  pattern: 'xmltools-*'
-  enabled: false
-
-setup.template:
-  name: 'xmltools-prod'
-  pattern: 'xmltools-*'
-  enabled: false
\ No newline at end of file
+  hosts: '${ELASTICSEARCH_HOSTS:elc-0.zipper.release11.com:9200}'
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index fa20468..980e095 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -50,6 +50,20 @@ services:
         volumes:
             - ./Swagger:/Swagger
 
+    filebeat:
+        build: ./Filebeat
+        container_name: xmltools-filebeat
+        user: root
+        volumes:
+            - "./Filebeat/filebeat.docker.yml:/usr/share/filebeat/filebeat.yml:ro"
+            - "/var/lib/docker/containers:/var/lib/docker/containers:ro"
+            - "/var/run/docker.sock:/var/run/docker.sock:ro"
+        environment:
+            - ENV_TYPE=dev
+        command:
+            - "-e"
+            - "--strict.perms=false"
+
 networks:
     default:
         name: tools_network
-- 
2.51.0


From e346d51af8433506a821ce51ea176f3140ab0739 Mon Sep 17 00:00:00 2001
From: Adam Bem <adam.bem@zoho.eu>
Date: Mon, 20 Mar 2023 15:30:19 +0100
Subject: [PATCH 4/4] Added selection of index from env var

---
 Filebeat/filebeat.docker.yml | 8 +++++++-
 docker-compose.yml           | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Filebeat/filebeat.docker.yml b/Filebeat/filebeat.docker.yml
index a44474e..c9bbfda 100644
--- a/Filebeat/filebeat.docker.yml
+++ b/Filebeat/filebeat.docker.yml
@@ -12,4 +12,10 @@ processors:
 - add_cloud_metadata: ~
 
 output.elasticsearch:
-  hosts: '${ELASTICSEARCH_HOSTS:elc-0.zipper.release11.com:9200}'
\ No newline at end of file
+  hosts: '${ELASTICSEARCH_HOSTS:elc-0.zipper.release11.com:9200}'
+  index: 'xmltools-${ENV_TYPE:dev}-%{+YYYY.MM}'
+
+
+setup.template:
+  name: "xmltools"
+  pattern: "xmltools-*"
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 980e095..6a620bb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -59,7 +59,7 @@ services:
             - "/var/lib/docker/containers:/var/lib/docker/containers:ro"
             - "/var/run/docker.sock:/var/run/docker.sock:ro"
         environment:
-            - ENV_TYPE=dev
+            - ENV_TYPE
         command:
             - "-e"
             - "--strict.perms=false"
-- 
2.51.0