Merge "Add elasticsearch output & memory buffer"
diff --git a/fluentd/files/filter/record_transformer.conf b/fluentd/files/filter/record_transformer.conf
index 21f2198..60f17c5 100644
--- a/fluentd/files/filter/record_transformer.conf
+++ b/fluentd/files/filter/record_transformer.conf
@@ -9,7 +9,7 @@
{%- if values.get('record') %}
<record>
{%- for record in values.record %}
- {{ record.name }} ${ {{ record.value }} }
+ {{ record.name }} {{ record.value }}
{%- endfor %}
</record>
{%- endif %}
diff --git a/fluentd/files/input/tail.conf b/fluentd/files/input/tail.conf
index b836521..af3a38c 100644
--- a/fluentd/files/input/tail.conf
+++ b/fluentd/files/input/tail.conf
@@ -16,10 +16,12 @@
{%- if values.get('exclude_path') %}{# Replace 'for-if-else' with 'tojson' after updating to jinja 2.9 #}
exclude_path [{%- for path in values.exclude_path %}"{{ path }}"{{ ", " if not loop.last else '' }} {%- endfor %}]
{%- endif %}
+{%- if values.get('parser') %}
<parse>
{%- with values=values.get('parser') %}
@type {{ values.get('type') }}
{% include 'fluentd/files/parser/' + values.get('type') + '.conf' %}
{%- endwith %}
</parse>
-</source>
\ No newline at end of file
+{%- endif %}
+</source>