openstack/kolla-ansible
Code Issues Proposed changes

Merge "fluentd: Configure td-agent only for x86_64"

Browse Source
This commit is contained in:
Zuul 2019-06-07 22:30:43 +00:00 committed by Gerrit Code Review
commit a7d7838689
9 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/common/templates/conf/input/00-global.conf.j2
View File

@ -1,5 +1,5 @@
#jinja2: trim_blocks: False #jinja2: trim_blocks: False
{% set fluentd_dir = 'td-agent' if kolla_base_distro in ['ubuntu', 'debian'] else 'fluentd' %} {% set fluentd_dir = 'td-agent' if (kolla_base_distro in ['ubuntu', 'debian'] and ansible_architecture == 'x86_64') else 'fluentd' %}
{% set services = [ {% set services = [
( 'aodh', enable_aodh ), ( 'aodh', enable_aodh ),
( 'barbican', enable_barbican ), ( 'barbican', enable_barbican ),

2
ansible/roles/common/templates/conf/input/02-mariadb.conf.j2
View File

@ -1,4 +1,4 @@
{% set fluentd_dir = 'td-agent' if kolla_base_distro in ['ubuntu', 'debian'] else 'fluentd' %} {% set fluentd_dir = 'td-agent' if (kolla_base_distro in ['ubuntu', 'debian'] and ansible_architecture == 'x86_64') else 'fluentd' %}
<source> <source>
@type tail @type tail
path /var/log/kolla/mariadb/mariadb.log path /var/log/kolla/mariadb/mariadb.log

2
ansible/roles/common/templates/conf/input/03-rabbitmq.conf.j2
View File

@ -1,4 +1,4 @@
{% set fluentd_dir = 'td-agent' if kolla_base_distro in ['ubuntu', 'debian'] else 'fluentd' %} {% set fluentd_dir = 'td-agent' if (kolla_base_distro in ['ubuntu', 'debian'] and ansible_architecture == 'x86_64') else 'fluentd' %}
<source> <source>
@type tail @type tail
path /var/log/kolla/rabbitmq/rabbit.log path /var/log/kolla/rabbitmq/rabbit.log

2
ansible/roles/common/templates/conf/input/04-openstack-wsgi.conf.j2
View File

@ -1,5 +1,5 @@
# Note (blallau): to manage Apache and WSGI log files # Note (blallau): to manage Apache and WSGI log files
{% set fluentd_dir = 'td-agent' if kolla_base_distro in ['ubuntu', 'debian'] else 'fluentd' %} {% set fluentd_dir = 'td-agent' if (kolla_base_distro in ['ubuntu', 'debian'] and ansible_architecture == 'x86_64') else 'fluentd' %}
<source> <source>
@type tail @type tail
path /var/log/kolla/*/*-access.log,/var/log/kolla/*/*-error.log path /var/log/kolla/*/*-access.log,/var/log/kolla/*/*-error.log

2
ansible/roles/common/templates/conf/input/05-libvirt.conf.j2
View File

@ -1,4 +1,4 @@
{% set fluentd_dir = 'td-agent' if kolla_base_distro in ['ubuntu', 'debian'] else 'fluentd' %} {% set fluentd_dir = 'td-agent' if (kolla_base_distro in ['ubuntu', 'debian'] and ansible_architecture == 'x86_64') else 'fluentd' %}
<source> <source>
@type tail @type tail
path /var/log/kolla/libvirt/libvirtd.log path /var/log/kolla/libvirt/libvirtd.log

2
ansible/roles/common/templates/conf/input/06-zookeeper.conf.j2
View File

@ -1,4 +1,4 @@
{% set fluentd_dir = 'td-agent' if kolla_base_distro in ['ubuntu', 'debian'] else 'fluentd' %} {% set fluentd_dir = 'td-agent' if (kolla_base_distro in ['ubuntu', 'debian'] and ansible_architecture == 'x86_64') else 'fluentd' %}
<source> <source>
@type tail @type tail
path /var/log/kolla/zookeeper/zookeeper.log path /var/log/kolla/zookeeper/zookeeper.log

2
ansible/roles/common/templates/conf/input/07-kafka.conf.j2
View File

@ -1,4 +1,4 @@
{% set fluentd_dir = 'td-agent' if kolla_base_distro in ['ubuntu', 'debian'] else 'fluentd' %} {% set fluentd_dir = 'td-agent' if (kolla_base_distro in ['ubuntu', 'debian'] and ansible_architecture == 'x86_64') else 'fluentd' %}
<source> <source>
@type tail @type tail
path /var/log/kolla/kafka/controller.log, /var/log/kolla/kafka/server.log, /var/log/kolla/kafka/state-change.log path /var/log/kolla/kafka/controller.log, /var/log/kolla/kafka/server.log, /var/log/kolla/kafka/state-change.log

2
ansible/roles/common/templates/conf/input/08-opendaylight.conf.j2
View File

@ -1,4 +1,4 @@
{% set fluentd_dir = 'td-agent' if kolla_base_distro in ['ubuntu', 'debian'] else 'fluentd' %} {% set fluentd_dir = 'td-agent' if (kolla_base_distro in ['ubuntu', 'debian'] and ansible_architecture == 'x86_64') else 'fluentd' %}
<source> <source>
@type tail @type tail
path /var/log/kolla/opendaylight/karaf.log path /var/log/kolla/opendaylight/karaf.log

19
ansible/roles/common/templates/fluentd.json.j2
View File

@ -1,7 +1,18 @@
{% set fluentd_cmd = '/usr/sbin/td-agent' if kolla_base_distro in ['ubuntu', 'debian'] else '/usr/bin/fluentd -c /etc/fluentd/fluent.conf' %} {% if kolla_base_distro in ['ubuntu', 'debian'] and ansible_architecture == 'x86_64' %}
{% set fluentd_dir = '/etc/td-agent' if kolla_base_distro in ['ubuntu', 'debian'] else '/etc/fluentd' %} {% set fluentd_cmd = '/usr/sbin/td-agent' %}
{% set fluentd_conf = 'td-agent.conf' if kolla_base_distro in ['ubuntu', 'debian'] else 'fluent.conf' %} {% set fluentd_dir = '/etc/td-agent' %}
{% set fluentd_user = 'td-agent' if kolla_base_distro in ['ubuntu', 'debian'] else 'fluentd' %} {% set fluentd_conf = 'td-agent.conf' %}
{% set fluentd_user = 'td-agent' %}
{% else %}
{% if kolla_base_distro in ['ubuntu', 'debian'] %}
{% set fluentd_cmd = '/usr/local/bin/fluentd -c /etc/fluentd/fluent.conf' %}
{% else %}
{% set fluentd_cmd = '/usr/bin/fluentd -c /etc/fluentd/fluent.conf' %}
{% endif %}
{% set fluentd_dir = '/etc/fluentd' %}
{% set fluentd_conf = 'fluent.conf' %}
{% set fluentd_user = 'fluentd' %}
{% endif %}
{ {
"command": "{{ fluentd_cmd }}", "command": "{{ fluentd_cmd }}",
"config_files": [ "config_files": [