From 19b345de3eae2266f13dcb3c3efa1b3c49fe892a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= <radoslaw.piliszek@gmail.com>
Date: Tue, 30 Jul 2019 12:43:20 +0200
Subject: [PATCH] Fix fluentd monasca pos path for Debian/Ubuntu x86_64
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Change-Id: I6d205fe327f198e699519ebe9d589b9ee77a62d2
Closes-Bug: #1837274
Signed-off-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
---
.../roles/common/templates/conf/input/09-monasca.conf.j2 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ansible/roles/common/templates/conf/input/09-monasca.conf.j2 b/ansible/roles/common/templates/conf/input/09-monasca.conf.j2
index d455a7bfe7..0d3c153831 100644
--- a/ansible/roles/common/templates/conf/input/09-monasca.conf.j2
+++ b/ansible/roles/common/templates/conf/input/09-monasca.conf.j2
@@ -1,7 +1,8 @@
+{% set fluentd_dir = 'td-agent' if (kolla_base_distro in ['ubuntu', 'debian'] and ansible_architecture == 'x86_64') else 'fluentd' %}
<source>
@type tail
path /var/log/kolla/monasca/agent*.log
- pos_file /var/run/fluentd/monasca-agent.pos
+ pos_file /var/run/{{ fluentd_dir }}/monasca-agent.pos
tag kolla.*
format multiline
format_firstline /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} \S+ \| \S+ \| \S+ \| .*$/
@@ -12,11 +13,10 @@
<source>
@type tail
path /var/log/kolla/monasca/grafana.log
- pos_file /var/run/fluentd/monasca-grafana.pos
+ pos_file /var/run/{{ fluentd_dir }}/monasca-grafana.pos
tag infra.*
format multiline
format_firstline /^t=\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{4} lvl=\S+ msg=.*$/
format1 /^t=(?<Timestamp>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{4}) lvl=(?<log_level>\S+) msg=(?<Payload>.*)$/
time_key Timestamp
</source>
-