Merge "Fix deprecation warnings in fluentd"

ansible/roles/common/templates/conf/input/01-syslog.conf.j2

@@ -3,7 +3,7 @@
   port {{ fluentd_syslog_port }}
   bind {{ api_interface_address }}
   tag syslog
-  priority_key log_level
+  severity_key log_level
   source_hostname_key Hostname
   format /^(?<Payload>.*)$/
 </source>

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

@@ -3,9 +3,11 @@
   <store>
     @type file
     path /var/log/kolla/swift/swift_latest.*.log
-    utc
     append true
     compress gzip
+    <buffer>
+      timekey_use_utc
+    </buffer>
   </store>
 {% if log_direct_to_elasticsearch %}
   <store>
@@ -58,9 +60,11 @@
     path /var/log/kolla/haproxy/haproxy_latest.*.log
     output_tag false
     output_time false
-    utc
     append true
     compress gzip
+    <buffer>
+      timekey_use_utc
+    </buffer>
   </store>
 {% if log_direct_to_elasticsearch %}
   <store>
@@ -113,9 +117,11 @@
     path /var/log/kolla/glance-tls-proxy/glance-tls-proxy.*.log
     output_tag false
     output_time false
-    utc
     append true
     compress gzip
+    <buffer>
+      timekey_use_utc
+    </buffer>
   </store>
 {% if log_direct_to_elasticsearch %}
   <store>