From 3611f053ef4a90c56e2c5e41d03a6a83894fff4b Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Fri, 15 May 2020 17:20:47 +0200
Subject: [PATCH] Fix deprecation warnings in fluentd
Change-Id: I812665059783617d581d748e619b29426f89b353
---
.../common/templates/conf/input/01-syslog.conf.j2 | 2 +-
.../common/templates/conf/output/00-local.conf.j2 | 12 +++++++++---
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ansible/roles/common/templates/conf/input/01-syslog.conf.j2 b/ansible/roles/common/templates/conf/input/01-syslog.conf.j2
index 847c0c451..4f00792f1 100644
--- a/ansible/roles/common/templates/conf/input/01-syslog.conf.j2
+++ b/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>
diff --git a/ansible/roles/common/templates/conf/output/00-local.conf.j2 b/ansible/roles/common/templates/conf/output/00-local.conf.j2
index 9b42b3085..4f417108f 100644
--- a/ansible/roles/common/templates/conf/output/00-local.conf.j2
+++ b/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>
--
GitLab