openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fluentd: fix duplicate log level naming"

Browse Source
This commit is contained in:
Jenkins 2017-09-26 07:11:36 +00:00 committed by Gerrit Code Review
commit aa3d644f99
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/common/templates/conf/format/apache_access.conf.j2
View File

@ -12,7 +12,7 @@
<filter apache_access> <filter apache_access>
@type record_transformer @type record_transformer
<record> <record>
severity_label INFO log_level INFO
Severity 6 Severity 6
</record> </record>
</filter> </filter>

2
ansible/roles/common/templates/conf/format/wsgi_python.conf.j2
View File

@ -3,7 +3,7 @@
reserve_data true reserve_data true
format grok format grok
key_name message key_name message
grok_pattern %{TIMESTAMP_ISO8601:Timestamp} %{NUMBER:Pid} %{LOGLEVEL:severity_label} %{NOTSPACE:python_module} \[(?:req-(?:%{NOTSPACE:request_id}) (?:%{NOTSPACE:user_id}) (?:%{NOTSPACE:tenant_id}) (?:%{NOTSPACE:domain_id}) (?:%{NOTSPACE:user_domain}) (?:%{NOTSPACE:project_domain})|-)\] %{GREEDYDATA:Payload} grok_pattern %{TIMESTAMP_ISO8601:Timestamp} %{NUMBER:Pid} %{LOGLEVEL:log_level} %{NOTSPACE:python_module} \[(?:req-(?:%{NOTSPACE:request_id}) (?:%{NOTSPACE:user_id}) (?:%{NOTSPACE:tenant_id}) (?:%{NOTSPACE:domain_id}) (?:%{NOTSPACE:user_domain}) (?:%{NOTSPACE:project_domain})|-)\] %{GREEDYDATA:Payload}
time_format "%Y-%m-%d %H:%M:%S.%L" time_format "%Y-%m-%d %H:%M:%S.%L"
time_key Timestamp time_key Timestamp
keep_time_key true keep_time_key true

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

@ -6,7 +6,7 @@
tag infra.mariadb tag infra.mariadb
format multiline format multiline
format_firstline /^\d{6}/ format_firstline /^\d{6}/
format1 /^(?<time>\d{6} \d{1,2}:\d{1,2}:\d{1,2}) \[(?<severity_label>\S+)\] (?<Payload>.*)/ format1 /^(?<time>\d{6} \d{1,2}:\d{1,2}:\d{1,2}) \[(?<log_level>\S+)\] (?<Payload>.*)/
time_format %y%m%d %k:%M:%S time_format %y%m%d %k:%M:%S
enable_watch_timer false enable_watch_timer false
</source> </source>