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
-
- timekey 1d
- flush_mode interval
- flush_interval 1s
-
+ logstash_format true
+ logstash_prefix fluentd.${tag}