Merge pull request offensity#1 from moniker-dns/source-conventions

Update @source fields per logstash conventions

Author: vklochan

logstash/handler.py

@@ -13,8 +13,10 @@ class LogstashHandler(DatagramHandler):
     :param fqdn; Indicates whether to show fully qualified domain name or not (default False).
     """
 
-    def __init__(self, host, port=5959, message_type='logstash', fqdn=False):
+    def __init__(self, host, port=5959, message_type='logstash',
+                 message_path='logstash', fqdn=False):
         self.message_type = message_type
+        self.message_path = message_path
         self.fqdn = fqdn
         DatagramHandler.__init__(self, host, port)
 
@@ -36,7 +38,9 @@ def build_message(self, record):
                 'logger': record.name,
             },
             '@message': record.getMessage(),
-            '@source': host,
+            '@source': self.format_source(host),
+            '@source_host': host,
+            '@source_path': self.message_path,
             '@tags': [],
             '@timestamp': self.format_timestamp(record.created),
             '@type': self.message_type,
@@ -84,4 +88,7 @@ def format_exception(self, exc_info):
         return ''.join(traceback.format_exception(*exc_info)) if exc_info else ''
 
     def format_timestamp(self, time):
-        return datetime.utcfromtimestamp(time).isoformat()
+        return datetime.utcfromtimestamp(time).isoformat()
+
+    def format_source(self, host):
+        return "%s://%s/%s" % (self.message_type, host, self.message_path)