opendev/system-config
Code Issues Proposed changes

Merge "Move keystone logs over to oslofrmt"

Browse Source
This commit is contained in:
Jenkins 2014-09-07 20:43:24 +00:00 committed by Gerrit Code Review
commit ed90813411
2 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/openstack_project/files/logstash/jenkins-log-client.yaml
View File

@ -105,7 +105,7 @@ source-files:
- name: logs/screen-key.txt - name: logs/screen-key.txt
tags: tags:
- screen - screen
- keystonefmt - oslofmt
- name: logs/screen-n-api.txt - name: logs/screen-n-api.txt
tags: tags:
- screen - screen
@ -229,7 +229,7 @@ source-files:
- name: logs/new/screen-key.txt - name: logs/new/screen-key.txt
tags: tags:
- screen - screen
- keystonefmt - oslofmt
job-filter: '.*grenade.*' job-filter: '.*grenade.*'
- name: logs/new/screen-n-api.txt - name: logs/new/screen-n-api.txt
tags: tags:
@ -355,7 +355,7 @@ source-files:
- name: logs/old/screen-key.txt - name: logs/old/screen-key.txt
tags: tags:
- screen - screen
- keystonefmt - oslofmt
job-filter: '.*grenade.*' job-filter: '.*grenade.*'
- name: logs/old/screen-n-api.txt - name: logs/old/screen-n-api.txt
tags: tags:

17
modules/openstack_project/templates/logstash/indexer.conf.erb
View File

@ -48,23 +48,6 @@ filter {
match => { "message" => "(?m)^%{TIMESTAMP_ISO8601:logdate}%{SPACE}%{NUMBER:pid}?%{SPACE}?(?<loglevel>AUDIT|CRITICAL|DEBUG|INFO|TRACE|WARNING|ERROR) \[?\b%{NOTSPACE:module}\b\]?%{SPACE}?%{GREEDYDATA:logmessage}?" } match => { "message" => "(?m)^%{TIMESTAMP_ISO8601:logdate}%{SPACE}%{NUMBER:pid}?%{SPACE}?(?<loglevel>AUDIT|CRITICAL|DEBUG|INFO|TRACE|WARNING|ERROR) \[?\b%{NOTSPACE:module}\b\]?%{SPACE}?%{GREEDYDATA:logmessage}?" }
add_field => { "received_at" => "%{@timestamp}" } add_field => { "received_at" => "%{@timestamp}" }
} }
} else if "keystonefmt" in [tags] {
if [message] == "" {
drop {}
}
multiline {
negate => true
pattern => "^\(\b%{NOTSPACE}\b\):"
what => "previous"
stream_identity => "%{host}.%{filename}"
}
grok {
# Do multiline matching as the above mutliline filter may add newlines
# to the log messages.
# TODO move the LOGLEVELs into a proper grok pattern.
match => { "message" => "(?m)^\(\b%{NOTSPACE:module}\b\):%{SPACE}%{TIMESTAMP_ISO8601:logdate}%{SPACE}(?<loglevel>AUDIT|CRITICAL|DEBUG|INFO|TRACE|WARNING|ERROR)%{SPACE}%{GREEDYDATA:logmessage}" }
add_field => { "received_at" => "%{@timestamp}" }
}
} else if "apachecombined" in [tags] { } else if "apachecombined" in [tags] {
grok { grok {
match => { "message" => "%{COMBINEDAPACHELOG}" } match => { "message" => "%{COMBINEDAPACHELOG}" }