logstash-input-delf 3.0.3 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 308100753a50a0d7d3c0a9956ce41ee9c001f62d
-  data.tar.gz: c8c424269c039b12f4195a610753af6c5ef183d6
+  metadata.gz: 8efb4dfb5892d770ffe3cb92f89c137ee4a5de3a
+  data.tar.gz: d8aa798b5e78fcdf0f4d1434a957fdda9d3721ce
 SHA512:
-  metadata.gz: 31c2835ee3bc1e0b218e50f2fc103ee9e757dcbcd669cea2a440932805cbb777ffa5ffab2085743d6a767b06c0a06398932758c437906ff49a9f9da29dbbfc5f
-  data.tar.gz: f516dbccce766aed7e57347625ffabd9c1a632f3058d87002f3897494761576259d94118b601bb88b7f6ef1819bc81c83c56261b80ca00567d9651412dc625ef
+  metadata.gz: b58ce6725fe8e6a93c41504056cf8382bb2c3c924a542b858a9738bb7eabb1dffeab2f51bb15eea7941f153ddf50bfcaaa07f08fd1dfbd44d412116a1eea9136
+  data.tar.gz: fc2f4f532136ba8031558d830fa3b77c925b8cc71e4d96824d4d360c889ecd23a3061bc47b839f9272cc662eed11ed0152026f5e0aedefe95e219c13834a514a

data/lib/logstash/inputs/delf.rb

@@ -5,6 +5,7 @@ require "logstash/json"
 require "logstash/timestamp"
 require "stud/interval"
 require "date"
+require "base64"
 require "socket"
 
 # This input will read GELF messages as events over the network,
@@ -34,7 +35,7 @@ class LogStash::Inputs::Delf < LogStash::Inputs::Base
   config :port, :validate => :number, :default => 12201
 
   # The incomplete mark, line ends with this mark will be considered as a incomplete event
-  config :continue_mark, :validate => :string, :default => "\\"
+  config :continue_mark_base64, :validate => :string, :default => "XA=="
 
   # The field to identify different event stream, for Docker events, it's 'container_id'
   config :track, :validate => :string, :default => 'container_id'
@@ -82,6 +83,7 @@ class LogStash::Inputs::Delf < LogStash::Inputs::Base
   private
   def udp_listener(output_queue)
     @logger.info("Starting delf listener", :address => "#{@host}:#{@port}")
+    @continue_mark = Base64.urlsafe_decode64(@continue_mark_base64)
 
     @udp = UDPSocket.new(Socket::AF_INET)
     @udp.bind(@host, @port)
@@ -199,6 +201,9 @@ class LogStash::Inputs::Delf < LogStash::Inputs::Base
     message = event.get("message")
     return event unless message.kind_of?(String)
 
+    # strip right
+    message = message.rstrip
+
     # Fetch last event
     last_event = @incomplete_events[track_id]
 
@@ -214,7 +219,7 @@ class LogStash::Inputs::Delf < LogStash::Inputs::Base
         return nil
       else
         # append content to pending event
-        last_event.set("message", last_event.get("message") + "\n" + message)
+        last_event.set("message", last_event.get("message") + "\r\n" + message)
         # limit message length to 5000
         if last_event.get("message").length > 5000
           @incomplete_events[track_id] = nil
@@ -230,7 +235,7 @@ class LogStash::Inputs::Delf < LogStash::Inputs::Base
         return event
       else
         # append content to pending incomplete event and return it
-        last_event.set("message", last_event.get("message") + "\n" + message)
+        last_event.set("message", last_event.get("message") + "\r\n" + message)
         # clear the pending incomplete event
         @incomplete_events[track_id] = nil
         return last_event

data/logstash-input-delf.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-delf'
-  s.version         = '3.0.3'
+  s.version         = '3.1.3'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This input will read GELF messages as events over the network, making it a good choice if you already use Graylog2 today."
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-delf
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.1.3
 platform: ruby
 authors:
 - Elastic
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-22 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: logstash-core-plugin-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -19,9 +20,8 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: '2.99'
-  name: logstash-core-plugin-api
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -31,90 +31,92 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.99'
 - !ruby/object:Gem::Dependency
+  name: gelfd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.2.0
-  name: gelfd
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
+  name: logstash-codec-plain
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-plain
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: stud
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.22
-  name: stud
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.22
 - !ruby/object:Gem::Dependency
+  name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: gelf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.3.2
-  name: gelf
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.3.2
 - !ruby/object:Gem::Dependency
+  name: flores
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: flores
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program
+description: This gem is a Logstash plugin required to be installed on top of the
+  Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This
+  gem is not a stand-alone program
 email: info@elastic.co
 executables: []
 extensions: []
@@ -137,7 +139,7 @@ licenses:
 metadata:
   logstash_plugin: 'true'
   logstash_group: input
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -152,11 +154,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.8
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.6.11
+signing_key: 
 specification_version: 4
-summary: This input will read GELF messages as events over the network, making it a good choice if you already use Graylog2 today.
+summary: This input will read GELF messages as events over the network, making it
+  a good choice if you already use Graylog2 today.
 test_files:
 - spec/inputs/delf_spec.rb
 - spec/support/helpers.rb