From c09d6695d8633235dffbb60e60259573624fb3af Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Fri, 13 Sep 2013 17:02:41 -0700
Subject: [PATCH] Put build UUID, log_url and project in log events.

Change-Id: I8d6ee94eb94e8fcdb082cad52654fcf0f7d9b3de
---
 .../openstack_project/files/logstash/log-gearman-client.py    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/openstack_project/files/logstash/log-gearman-client.py b/modules/openstack_project/files/logstash/log-gearman-client.py
index 418d92848a..48ca04ce88 100644
--- a/modules/openstack_project/files/logstash/log-gearman-client.py
+++ b/modules/openstack_project/files/logstash/log-gearman-client.py
@@ -85,8 +85,9 @@ class EventProcessor(threading.Thread):
         fields["filename"] = filename
         fields["build_name"] = event.get("name", "UNKNOWN")
         fields["build_status"] = event["build"].get("status", "UNKNOWN")
-        fields["build_number"] = event["build"].get("number", "UNKNOWN")
         parameters = event["build"].get("parameters", {})
+        fields["project"] = parameters.get("ZUUL_PROJECT", "UNKNOWN")
+        fields["build_uuid"] = parameters.get("ZUUL_UUID", "UNKNOWN")
         fields["build_queue"] = parameters.get("ZUUL_PIPELINE", "UNKNOWN")
         fields["build_ref"] = parameters.get("ZUUL_REF", "UNKNOWN")
         if parameters.get("ZUUL_CHANGE"):
@@ -103,6 +104,7 @@ class EventProcessor(threading.Thread):
         log_dir = self._get_log_dir(event)
         source_url = fileopts.get('source-url', self.source_url) + '/' + \
                 os.path.join(log_dir, fileopts['name'])
+        fields["log_url"] = source_url
         out_event = {}
         out_event["@fields"] = fields
         out_event["@tags"] = [fileopts['name']] + fileopts.get('tags', [])