openstack/kolla-ansible
Code Issues Proposed changes

Merge "Set log message field name in Monasca Fluentd plugin"

Browse Source
This commit is contained in:
Zuul 2019-06-11 12:43:40 +00:00 committed by Gerrit Code Review
commit 806e6be181
3 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ansible/roles/common/templates/conf/filter/00-record_transformer.conf.j2
View File

@ -37,20 +37,6 @@
</filter> </filter>
{% if enable_monasca | bool %} {% if enable_monasca | bool %}
# Kolla Fluentd input config configures Fluentd to save all log messages
# under the 'Payload' field, however the fluentd-monasca plugin assumes
# that log messages are saved under the 'message' field. Here we map the
# 'Payload' field to the 'message' field so that log can be forwarded to
# Monasca.
<filter *.**>
@type record_transformer
enable_ruby true
<record>
message ${record["Payload"]}
</record>
remove_keys Payload
</filter>
# Kolla configures Fluentd to extract timestamps from OpenStack service # Kolla configures Fluentd to extract timestamps from OpenStack service
# logs, however these timestamps are not saved in the event and are not # logs, however these timestamps are not saved in the event and are not
# forwarded to Monasca. Here we save the timestamp which has been # forwarded to Monasca. Here we save the timestamp which has been

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

@ -39,6 +39,7 @@
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
</store> </store>
{% endif %} {% endif %}
</match> </match>
@ -86,6 +87,7 @@
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
</store> </store>
{% endif %} {% endif %}
</match> </match>

1
ansible/roles/common/templates/conf/output/02-monasca.conf.j2
View File

@ -9,5 +9,6 @@
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
</store> </store>
</match> </match>