From 34a1e989c745b451e1ae140b3f204b43713ff658 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Tue, 9 Apr 2013 14:10:36 -0700
Subject: [PATCH] Handle mulitline console log lines.

* modules/openstack_project/templates/logstash/agent.conf.erb: Add
multiline filters to properly capture multiline log lines that do not
include their own timestamp.

Change-Id: I127e327cf6bdde580dcdfbe185f77fae3bd8d2c5
Reviewed-on: https://review.openstack.org/26530
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Tested-by: Jenkins
---
 agent.conf.erb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/agent.conf.erb b/agent.conf.erb
index 7bf8246..e3182d0 100644
--- a/agent.conf.erb
+++ b/agent.conf.erb
@@ -16,6 +16,16 @@ filter {
     negate => true
     match => ["@message", "^</?pre>$"]
   }
+  multiline {
+    type => "jenkins_console"
+    pattern => "^\"'$"
+    what => "previous"
+  }
+  multiline {
+    type => "jenkins_console"
+    pattern => "^Extracting templates from packages"
+    what => "previous"
+  }
   grok {
     type => "jenkins_console"
     pattern => [ "%{DATESTAMP:logdate} \| %{GREEDYDATA:logmessage}" ]