opendev/system-config
Code Issues Proposed changes

Better multiline handling for Jenkins console logs

Browse Source 
* modules/openstack_project/templates/logstash/agent.conf.erb: Treat any
line not beginning with a timestamp in Jenkins console logs as belonging
to the previous log message. This keeps timestamps sane for messages
that do not have timestamps.

Change-Id: I5959e766c28efebbd6c44567262beb63ad3a0a8e
Reviewed-on: https://review.openstack.org/26777
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Tested-by: Jenkins
This commit is contained in:
Clark Boylan 2013-04-11 12:06:21 -07:00 committed by Jenkins
parent f6ae11e3b5
commit 4fcc68924c
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/openstack_project/templates/logstash/agent.conf.erb
View File

@ -18,17 +18,13 @@ filter {
} }
multiline { multiline {
type => "jenkins_console" type => "jenkins_console"
pattern => "^\"'$" negate => true
what => "previous" pattern => "^%{DATESTAMP} \|"
}
multiline {
type => "jenkins_console"
pattern => "^Extracting templates from packages"
what => "previous" what => "previous"
} }
grok { grok {
type => "jenkins_console" type => "jenkins_console"
pattern => [ "%{DATESTAMP:logdate} \| %{GREEDYDATA:logmessage}" ] pattern => [ "^%{DATESTAMP:logdate} \| %{GREEDYDATA:logmessage}" ]
add_field => [ "received_at", "%{@timestamp}" ] add_field => [ "received_at", "%{@timestamp}" ]
} }
date { date {