Merge "Stop fluentd deprecation warnings of type vs @type" into stable/victoria

Author: Zuul

ansible/roles/common/templates/conf/output/00-local.conf.j2

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