logstash-input-beats 2.2.9 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab6c791f5489d3b2ab5fd6f8bf37e0787b5c14fe
-  data.tar.gz: 5b150c6055976618504fbbf1af6d73b77d650e2a
+  metadata.gz: 01c01cb2565051da88d3a40968123281c37e48af
+  data.tar.gz: aa303cdb8a24c85f59cd14c41710c3d850887d16
 SHA512:
-  metadata.gz: 65e2018889644bf486c57d766050d53261f54a493bd7b992a4e0787cc346510a461cc6442c2a3012915a200dbcfdcf0ca71255000ae9aeadc790a6d5285b84d2
-  data.tar.gz: 30ce185eb4c7bdc59ce031e7da1e45b1e247f3799b455be96b20acb228c2fe8ac9e7ed1014802f30f7aa5259594ab6414da1e4a0548e47586505cc4de126776c
+  metadata.gz: a00a634314cccc966f7b8b6c5c32ebebf16d71affff752fd252e10678c7d6f884491a26dec49136190a0ac40234c7f2ae90148fc9be48367829ae29b9add348a
+  data.tar.gz: c5fbd85b44cce829a39e53f82132a021fe76aaaa772f83c47ec13f66053af4168b86cfda18d64b591844e7be94babbda1e57ed23452da7815a799ffa614a64d3

data/CHANGELOG.md

@@ -1,5 +1,5 @@
-# 2.2.9
-  - Fix an issue when parsing multiple frames received from a filebeat client using pipelining.
+## 3.0.0
+  - Update the plugin to the version 2.0 of the plugin api, this change is required for Logstash 5.0 compatibility. See https://github.com/elastic/logstash/issues/5141
 # 2.2.8
   - Fix #73 Bug in EventTransformCommon#codec_name, use config_name
   - Add regression test for fix to #73

data/Gemfile

@@ -1,2 +1,4 @@
 source 'https://rubygems.org'
-gemspec
+
+# Specify your gem's dependencies in logstash-mass_effect.gemspec
+gemspec

data/lib/logstash/inputs/beats_support/decoded_event_transform.rb

@@ -8,8 +8,8 @@ module LogStash::Inputs::BeatsSupport
     def transform(event, hash)
       ts = coerce_ts(hash.delete("@timestamp"))
 
-      event["@timestamp"] = ts unless ts.nil?
-      hash.each { |k, v| event[k] = v }
+      event.set("@timestamp", ts) unless ts.nil?
+      hash.each { |k, v| event.set(k, v) }
       super(event)
       event.tag("beats_input_codec_#{codec_name}_applied")
       event

data/lib/logstash/inputs/beats_support/event_transform_common.rb

@@ -12,10 +12,10 @@ module LogStash::Inputs::BeatsSupport
     # Copies the beat.hostname field into the host field unless
     # the host field is already defined
     def copy_beat_hostname(event)
-      host = event["[beat][hostname]"]
+      host = event.get("[beat][hostname]")
 
-      if host && event["host"].nil?
-        event["host"] = host
+      if host && event.get("host").nil?
+        event.set("host", host)
       end
     end
 

data/lib/lumberjack/beats/server.rb

@@ -381,8 +381,7 @@ module Lumberjack module Beats
       transition(:header, 2)
 
       # Parse the uncompressed payload.
-      parser = self.class.new
-      parser.feed(original, &block)
+      feed(original, &block)
     end
   end # class Parser
 

data/logstash-input-beats.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = "logstash-input-beats"
-  s.version         = '2.2.9'
+  s.version         = '3.0.0'
   s.licenses        = ["Apache License (2.0)"]
   s.summary         = "Receive events using the lumberjack protocol."
   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"
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "input" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core-plugin-api", "~> 1.0"
+  s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
 
   s.add_runtime_dependency "logstash-codec-plain"
   s.add_runtime_dependency "concurrent-ruby", [ ">= 0.9.2", "<= 1.0.0" ]

data/spec/inputs/beats_spec.rb

@@ -147,7 +147,7 @@ describe LogStash::Inputs::Beats do
           plugin.handle_new_connection(connection)
 
           event = pipeline_queue.shift
-          expect(event["tags"]).to include("beats_input_flushed_by_end_of_connection")
+          expect(event.get("tags")).to include("beats_input_flushed_by_end_of_connection")
         end
       end
     end

data/spec/inputs/beats_support/connection_handler_spec.rb

@@ -51,8 +51,8 @@ describe LogStash::Inputs::BeatsSupport::ConnectionHandler do
           subject.process(map, identity_stream)
           event = queue.take
 
-          expect(event["hello"]).to eq(map["hello"])
-          expect(event["tags"]).to include("beats_input_raw_event")
+          expect(event.get("hello")).to eq(map["hello"])
+          expect(event.get("tags")).to include("beats_input_raw_event")
         end
       end
 
@@ -75,8 +75,8 @@ describe LogStash::Inputs::BeatsSupport::ConnectionHandler do
           subject.process(map, identity_stream)
           event = queue.take
 
-          expect(event["message"]).to eq(message)
-          expect(event["tags"]).to include("beats_input_codec_plain_applied")
+          expect(event.get("message")).to eq(message)
+          expect(event.get("tags")).to include("beats_input_codec_plain_applied")
         end
       end
 

data/spec/inputs/beats_support/decoded_event_transform_spec.rb

@@ -32,12 +32,12 @@ describe LogStash::Inputs::BeatsSupport::DecodedEventTransform do
   include_examples "Common Event Transformation"
 
   it "tags the event" do
-    expect(subject["tags"]).to include("beats_input_codec_plain_applied")
+    expect(subject.get("tags")).to include("beats_input_codec_plain_applied")
   end
 
   it "merges the other data from the map to the event" do
-    expect(subject["super"]).to eq(map["super"])
-    expect(subject["@metadata"]).to include(map["@metadata"])
+    expect(subject.get("super")).to eq(map["super"])
+    expect(subject.get("@metadata")).to include(map["@metadata"])
   end
 
   context "map contains a timestamp" do
@@ -46,7 +46,7 @@ describe LogStash::Inputs::BeatsSupport::DecodedEventTransform do
       let(:map) { super.merge({"@timestamp" => timestamp }) }
      
       it "uses as the event timestamp" do
-        expect(subject["@timestamp"]).to eq(LogStash::Timestamp.coerce(timestamp)) 
+        expect(subject.get("@timestamp")).to eq(LogStash::Timestamp.coerce(timestamp)) 
       end
     end
 
@@ -54,21 +54,21 @@ describe LogStash::Inputs::BeatsSupport::DecodedEventTransform do
       let(:map) { super.merge({"@timestamp" => "invalid" }) }
 
       it "fallback the current time" do
-        expect(subject["@timestamp"]).to be_kind_of(LogStash::Timestamp)
+        expect(subject.get("@timestamp")).to be_kind_of(LogStash::Timestamp)
       end
     end
   end
 
   context "when the map doesn't provide a timestamp" do
     it "fallback the current time" do
-      expect(subject["@timestamp"]).to be_kind_of(LogStash::Timestamp)
+      expect(subject.get("@timestamp")).to be_kind_of(LogStash::Timestamp)
     end
   end
 
   context "when the codec is a base_codec wrapper" do
     before { config.update("codec" => BeatsInputTest::DummyCodec.new) }
     it "gets the codec config name from the base codec" do
-      expect(subject["tags"]).to include("beats_input_codec_dummy_applied")
+      expect(subject.get("tags")).to include("beats_input_codec_dummy_applied")
     end
   end
 end

data/spec/inputs/beats_support/raw_event_transform_spec.rb

@@ -21,6 +21,6 @@ describe LogStash::Inputs::BeatsSupport::RawEventTransform do
   include_examples "Common Event Transformation"
 
   it "tags the event" do
-    expect(subject["tags"]).to include("beats_input_raw_event")
+    expect(subject.get("tags")).to include("beats_input_raw_event")
   end
 end

data/spec/support/integration_shared_context.rb

@@ -4,7 +4,7 @@ require "flores/random"
 shared_examples "send events" do
   it "successfully send the events" do
     wait(20).for { queue.size }.to eq(number_of_events), "Expected: #{number_of_events} got: #{queue.size}, execution output:\n #{@execution_output}" 
-    expect(queue.collect { |e| e["message"] }).to eq(events)
+    expect(queue.collect { |e| e.get("message") }).to eq(events)
   end
 end
 

data/spec/support/shared_examples.rb

@@ -22,7 +22,7 @@ shared_examples "Common Event Transformation" do
   end
 
   it "adds configured tags to the event" do
-    expect(subject["tags"]).to include(tag)
+    expect(subject.get("tags")).to include(tag)
   end
 
   context "when the `beast.hotname` doesnt exist on the event" do
@@ -30,7 +30,7 @@ shared_examples "Common Event Transformation" do
     let(:event_map) { super.merge({ "host" => already_exist }) }
 
     it "doesnt change the value" do
-      expect(subject["host"]).to eq(already_exist)
+      expect(subject.get("host")).to eq(already_exist)
     end
   end
 
@@ -40,7 +40,7 @@ shared_examples "Common Event Transformation" do
 
     context "when `host` key doesn't exist on the event" do
       it "copy the `beat.hostname` to `host` or backward compatibility" do
-        expect(subject["host"]).to eq(producer_host)
+        expect(subject.get("host")).to eq(producer_host)
       end
     end
 
@@ -49,7 +49,7 @@ shared_examples "Common Event Transformation" do
       let(:event_map) { super.merge({ "host" => already_exist }) }
 
       it "doesn't override it" do
-        expect(subject["host"]).to eq(already_exist)
+        expect(subject.get("host")).to eq(already_exist)
       end
     end
   end

metadata

@@ -1,44 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-beats
 version: !ruby/object:Gem::Version
-  version: 2.2.9
+  version: 3.0.0
 platform: ruby
 authors:
 - Elastic
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: logstash-core-plugin-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-  name: logstash-core-plugin-api
-  prerelease: false
+        version: '2.0'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '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: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -47,9 +48,8 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: 1.0.0
-  name: concurrent-ruby
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -59,146 +59,148 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
+  name: thread_safe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.5
-  name: thread_safe
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.5
 - !ruby/object:Gem::Dependency
+  name: logstash-codec-multiline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.5
-  name: logstash-codec-multiline
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.5
 - !ruby/object:Gem::Dependency
+  name: flores
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.6
-  name: flores
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.6
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rspec
-  prerelease: false
   type: :development
+  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'
-  name: stud
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: pry
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rspec-wait
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rspec-wait
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.18
-  name: logstash-devutils
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.18
 - !ruby/object:Gem::Dependency
+  name: logstash-codec-json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-json
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: childprocess
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: childprocess
-  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: []
@@ -251,7 +253,7 @@ licenses:
 metadata:
   logstash_plugin: 'true'
   logstash_group: input
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -266,9 +268,9 @@ 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.5.1
+signing_key: 
 specification_version: 4
 summary: Receive events using the lumberjack protocol.
 test_files: