Merge "Stop fluentd deprecation warnings of type vs @type"

This commit is contained in:
Zuul 2021-06-20 11:46:30 +00:00 committed by Gerrit Code Review
commit 5665d5e619

View File

@ -136,7 +136,7 @@
</store> </store>
{% if log_direct_to_elasticsearch %} {% if log_direct_to_elasticsearch %}
<store> <store>
type elasticsearch @type elasticsearch
host {{ elasticsearch_address }} host {{ elasticsearch_address }}
port {{ elasticsearch_port }} port {{ elasticsearch_port }}
scheme {{ fluentd_elasticsearch_scheme }} scheme {{ fluentd_elasticsearch_scheme }}
@ -197,7 +197,7 @@
</store> </store>
{% if log_direct_to_elasticsearch %} {% if log_direct_to_elasticsearch %}
<store> <store>
type elasticsearch @type elasticsearch
host {{ elasticsearch_address }} host {{ elasticsearch_address }}
port {{ elasticsearch_port }} port {{ elasticsearch_port }}
scheme {{ fluentd_elasticsearch_scheme }} scheme {{ fluentd_elasticsearch_scheme }}