From 8398975132e7128d7afd13c3b444b7717a8ef51b Mon Sep 17 00:00:00 2001
From: Pim Kunis <pim@kunis.nl>
Date: Wed, 9 Aug 2023 11:04:15 +0200
Subject: [PATCH] fix fluentd buffering change ES index format to logstash
 format

---
 ansible/roles/monitoring/elasticsearch.yml.j2 | 4 ++--
 ansible/roles/monitoring/fluent.conf.j2       | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/ansible/roles/monitoring/elasticsearch.yml.j2 b/ansible/roles/monitoring/elasticsearch.yml.j2
index 780acb9..c2aa853 100644
--- a/ansible/roles/monitoring/elasticsearch.yml.j2
+++ b/ansible/roles/monitoring/elasticsearch.yml.j2
@@ -7,7 +7,7 @@ datasources:
     access: proxy
     url: http://maestro.dmz:{{ elasticsearch_port }}
     jsonData:
-      index: 'fluentd.cpu.*'
+      index: 'fluentd.cpu-*'
       timeField: '@timestamp'
 
   - name: memory
@@ -15,5 +15,5 @@ datasources:
     access: proxy
     url: http://maestro.dmz:{{ elasticsearch_port }}
     jsonData:
-      index: 'fluentd.memory.*'
+      index: 'fluentd.memory-*'
       timeField: '@timestamp'
diff --git a/ansible/roles/monitoring/fluent.conf.j2 b/ansible/roles/monitoring/fluent.conf.j2
index 2504554..61b52b3 100644
--- a/ansible/roles/monitoring/fluent.conf.j2
+++ b/ansible/roles/monitoring/fluent.conf.j2
@@ -11,12 +11,8 @@
   host maestro.dmz
   port {{ elasticsearch_port }}
   include_timestamp true
-  index_name fluentd.${tag}.%Y%m%d
-  <buffer tag, time>
-    timekey 1d
-    flush_mode interval
-    flush_interval 1s
-  </buffer>
+  logstash_format true
+  logstash_prefix fluentd.${tag}
 </match>
 
 <system>