Fix Logstash 1.5.5 and 2.0.0 compatibility

See #247

lib/logstash/inputs/courier.rb

@@ -31,6 +31,16 @@ class Courier < LogStash::Inputs::Base
         milestone 2
       end
 
+      # Disable raw_events in the Log Courier gem if we're Logstash 1.5.5+ or
+      # 2.0.0+. Due to changes in those versions to JrJackson, JSON outputs like
+      # elasticsearch can be broken by our use of raw_events (which defaults
+      # true). See https://github.com/driskell/log-courier/issues/247
+      if Gem::Version.new(LOGSTASH_VERSION) >= Gem::Version.new('1.5.5')
+        RAW_EVENTS = false
+      else
+        RAW_EVENTS = true
+      end
+
       default :codec, 'plain'
 
       # The IP address to listen on
@@ -110,17 +120,22 @@ def run(output_queue)
       private
 
       def options
-        result = {}
+        result = {
+          raw_events: self.RAW_EVENTS
+        }
 
+        add_logstash_options result
+        add_override_options result
+      end
+
+      def add_plugin_options(result)
         [
           :logger, :address, :port, :transport, :ssl_certificate, :ssl_key,
           :ssl_key_passphrase, :ssl_verify, :ssl_verify_default_ca,
           :ssl_verify_ca, :curve_secret_key
         ].each do |k|
           result[k] = send(k)
         end
-
-        add_override_options result
       end
 
       def add_override_options(result)

version.txt

@@ -1 +1 @@
-1.8.1
+1.8.3