openstack/kolla-ansible
Code Issues Proposed changes

Fix fluentd monasca pos path for Debian/Ubuntu x86_64

Browse Source 
Change-Id: I6d205fe327f198e699519ebe9d589b9ee77a62d2
Closes-Bug: #1837274
Signed-off-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
This commit is contained in:
Radosław Piliszek 2019-07-30 12:43:20 +02:00
parent 5a9ec1a773
commit 19b345de3e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/roles/common/templates/conf/input/09-monasca.conf.j2
View File

@ -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>