commit 5ec5dddfce44282f92c5d0224a9a9de64b152550
author Richard Felkl <rfelkl@mirantis.com> Tue Mar 06 13:26:05 2018 +0000
committer Gerrit Code Review <gerrit2@56fc70e46927> Tue Mar 06 13:26:05 2018 +0000
tree 9a8db3a9d8bc668ec0a345c9589029af519b4edf
parent 1b444a663c8279fc7937a064e99d4d63ba37c155
parent d810ad64ff7f281965eb5767d750ad4ba22321a5

Merge "changed dateformat for %Y.%m.%d"

fluentd/files/buffer/file.conf

diff --git a/fluentd/files/buffer/file.conf b/fluentd/files/buffer/file.conf
new file mode 100644
index 0000000..aaa9691
--- /dev/null
+++ b/fluentd/files/buffer/file.conf
@@ -0,0 +1 @@
+    path {{ values.get("path", "/var/lib/fluentd/default.buffer") }}

fluentd/files/match/elasticsearch.conf

diff --git a/fluentd/files/match/elasticsearch.conf b/fluentd/files/match/elasticsearch.conf
index f5024c5..f69d998 100644
--- a/fluentd/files/match/elasticsearch.conf
+++ b/fluentd/files/match/elasticsearch.conf
@@ -14,8 +14,8 @@
 {%- if values.get("buffer") %}
   <buffer>
   {%- with values=values.get("buffer") %}
-    @type {{ values.get("type") }}
-{% include 'fluentd/files/buffer/' + values.get('type') + '.conf' %}
+    @type {{ values.get("type", "file") }}
+{% include "fluentd/files/buffer/" + values.get("type", "file") + ".conf" %}
   {%- endwith %}
   </buffer>
 {%- endif %}