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