openstack/kolla-ansible
Code Issues Proposed changes

Fix fluentd warnings caused by "type copy"

Browse Source 
A "@type copy" statement is already present at the beginning of each
match element, so extra "type copy" are not needed. They are causing the
following warnings in fluentd logs:

[warn]: parameter 'type' in <match syslog.local0.**>
[warn]: parameter 'type' in <match syslog.local1.**>

This commit also harmonizes indentation of the Monasca config block.

Change-Id: I779c2b942d007acbdd43d999f2fc0cdc131d431f
Related-Bug: #1885873
This commit is contained in:
Pierre Riteau 2020-07-21 14:35:43 +02:00
parent 376988125a
commit 5b05781241
1 changed files with 54 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
ansible/roles/common/templates/conf/output/00-local.conf.j2
View File

@ -37,25 +37,24 @@
buffer_path /var/lib/fluentd/data/elasticsearch.buffer/{{ syslog_swift_facility }}.* buffer_path /var/lib/fluentd/data/elasticsearch.buffer/{{ syslog_swift_facility }}.*
</store> </store>
{% elif enable_monasca | bool %} {% elif enable_monasca | bool %}
type copy <store>
<store> @type monasca
@type monasca keystone_url {{ keystone_internal_url }}
keystone_url {{ keystone_internal_url }} monasca_api {{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ monasca_log_api_port }}
monasca_api {{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ monasca_log_api_port }} monasca_api_version v2.0
monasca_api_version v2.0 username {{ monasca_agent_user }}
username {{ monasca_agent_user }} password {{ monasca_agent_password }}
password {{ monasca_agent_password }} domain_id default
domain_id default project_name {{ monasca_control_plane_project }}
project_name {{ monasca_control_plane_project }} message_field_name Payload
message_field_name Payload buffer_type file
buffer_type file buffer_path /var/lib/fluentd/data/monasca.buffer/{{ syslog_swift_facility }}.*
buffer_path /var/lib/fluentd/data/monasca.buffer/{{ syslog_swift_facility }}.* max_retry_wait 1800s
max_retry_wait 1800s disable_retry_limit true
disable_retry_limit true <buffer>
<buffer> chunk_limit_size 8m
chunk_limit_size 8m </buffer>
</buffer> </store>
</store>
{% endif %} {% endif %}
</match> </match>
@ -100,25 +99,24 @@
buffer_path /var/lib/fluentd/data/elasticsearch.buffer/{{ syslog_haproxy_facility }}.* buffer_path /var/lib/fluentd/data/elasticsearch.buffer/{{ syslog_haproxy_facility }}.*
</store> </store>
{% elif enable_monasca | bool %} {% elif enable_monasca | bool %}
type copy <store>
<store> @type monasca
@type monasca keystone_url {{ keystone_internal_url }}
keystone_url {{ keystone_internal_url }} monasca_api {{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ monasca_log_api_port }}
monasca_api {{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ monasca_log_api_port }} monasca_api_version v2.0
monasca_api_version v2.0 username {{ monasca_agent_user }}
username {{ monasca_agent_user }} password {{ monasca_agent_password }}
password {{ monasca_agent_password }} domain_id default
domain_id default project_name {{ monasca_control_plane_project }}
project_name {{ monasca_control_plane_project }} message_field_name Payload
message_field_name Payload buffer_type file
buffer_type file buffer_path /var/lib/fluentd/data/monasca.buffer/{{ syslog_haproxy_facility }}.*
buffer_path /var/lib/fluentd/data/monasca.buffer/{{ syslog_haproxy_facility }}.* max_retry_wait 1800s
max_retry_wait 1800s disable_retry_limit true
disable_retry_limit true <buffer>
<buffer> chunk_limit_size 8m
chunk_limit_size 8m </buffer>
</buffer> </store>
</store>
{% endif %} {% endif %}
</match> </match>
@ -160,24 +158,23 @@
buffer_path /var/lib/fluentd/data/elasticsearch.buffer/{{ syslog_glance_tls_proxy_facility }}.* buffer_path /var/lib/fluentd/data/elasticsearch.buffer/{{ syslog_glance_tls_proxy_facility }}.*
</store> </store>
{% elif enable_monasca | bool %} {% elif enable_monasca | bool %}
type copy <store>
<store> @type monasca
@type monasca keystone_url {{ keystone_internal_url }}
keystone_url {{ keystone_internal_url }} monasca_api {{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ monasca_log_api_port }}
monasca_api {{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ monasca_log_api_port }} monasca_api_version v2.0
monasca_api_version v2.0 username {{ monasca_agent_user }}
username {{ monasca_agent_user }} password {{ monasca_agent_password }}
password {{ monasca_agent_password }} domain_id default
domain_id default project_name {{ monasca_control_plane_project }}
project_name {{ monasca_control_plane_project }} message_field_name Payload
message_field_name Payload buffer_type file
buffer_type file buffer_path /var/lib/fluentd/data/monasca.buffer/{{ syslog_glance_tls_proxy_facility }}.*
buffer_path /var/lib/fluentd/data/monasca.buffer/{{ syslog_glance_tls_proxy_facility }}.* max_retry_wait 1800s
max_retry_wait 1800s disable_retry_limit true
disable_retry_limit true <buffer>
<buffer> chunk_limit_size 8m
chunk_limit_size 8m </buffer>
</buffer> </store>
</store>
{% endif %} {% endif %}
</match> </match>