Add ip protocol to logstash engine

mcpanayides · Mar 24, 2017 · 129015b · 129015b
1 parent 75cfcf2
commit 129015b
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/salt/engines/logstash.py b/salt/engines/logstash.py
@@ -12,6 +12,7 @@
           - logstash:
             host: log.my_network.com
             port: 5959
+            proto: tcp
 
 :depends: logstash
 '''
@@ -40,13 +41,19 @@ def __virtual__():
 log = logging.getLogger(__name__)
 
 
-def start(host, port=5959, tag='salt/engine/logstash'):
+def start(host, port=5959, proto='tcp', tag='salt/engine/logstash'):
     '''
     Listen to salt events and forward them to logstash
     '''
+
+    if proto == 'tcp':
+        logstashHandler = logstash.TCPLogstashHandler
+    elif proto == 'udp':
+        logstashHandler = logstash.UDPLogstashHandler
+
     logstash_logger = logging.getLogger('python-logstash-logger')
     logstash_logger.setLevel(logging.INFO)
-    logstash_logger.addHandler(logstash.LogstashHandler(host, port, version=1))
+    logstash_logger.addHandler(logstashHandler(host, port, version=1))
 
     if __opts__.get('id').endswith('_master'):
         event_bus = salt.utils.event.get_master_event(