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' %} @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 @@ @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=(?\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{4}) lvl=(?\S+) msg=(?.*)$/ time_key Timestamp -