Merge branch 'dev' into 'master'

</filter>

<match **>

	@type elasticsearch_dynamic

	@type elasticsearch

	@id elasticsearch-output

	id_key _hash

	remove_keys _hash

	hosts "#{ENV['ES_HOSTS']}"

	user "#{ENV['ES_USER']}"

	password "#{ENV['ES_PASS']}"

	type_name fluentd

	logstash_format true

	logstash_prefix fluentd-${tag_parts[0]}

	logstash_prefix fluentd

	logstash_dateformat %Y%m

	request_timeout 15s

	reconnect_on_error true

	reload_on_failure true

	reload_connections false

	<buffer>

		total_limit_size 128MB

		compress gzip

		flush_mode interval

		flush_interval 30s

		flush_thread_count 4