From b1379542467ff0ea84aa4a83ea9306381c30676d Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Tue, 21 May 2013 12:00:29 -0700
Subject: [PATCH] Make logstash GREEDYDATA accept newlines.

* modules/openstack_project/templates/logstash/indexer.conf.erb: The
mutliline filter can add newlines to the @message field of events. Make
the grok filter consume the newlines.

Change-Id: I8353a482baf83ec1e728e4852c59c37b5e078e8a
Reviewed-on: https://review.openstack.org/29984
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
---
 modules/openstack_project/templates/logstash/indexer.conf.erb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/openstack_project/templates/logstash/indexer.conf.erb b/modules/openstack_project/templates/logstash/indexer.conf.erb
index 54c200ee6a..12cedb7910 100644
--- a/modules/openstack_project/templates/logstash/indexer.conf.erb
+++ b/modules/openstack_project/templates/logstash/indexer.conf.erb
@@ -27,7 +27,9 @@ filter {
   grok {
     type => "jenkins"
     tags => ["console.html"]
-    pattern => [ "^%{DATESTAMP:logdate} \| %{GREEDYDATA:logmessage}" ]
+    # Do multiline matching as the above mutliline filter may add newlines
+    # to the log messages.
+    pattern => [ "(?m)^%{DATESTAMP:logdate} \| %{GREEDYDATA:logmessage}" ]
     add_field => [ "received_at", "%{@timestamp}" ]
   }
   date {