logstash-input-gelf 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 158054a93311590d65d56a3ff79aa12c56092d23
-  data.tar.gz: b469cff4004b9f25dc4e3f389e9a2b006d09417f
+  metadata.gz: dadd960344e3445d70df63413aa82c8975d42c28
+  data.tar.gz: ff642ce5d0c7ef904c857be8acaad1bab17a9c2b
 SHA512:
-  metadata.gz: 213969545dfabb0868b5796ffe90aefb0a065fd63872338bbb9423eae1bc088365e54c69a446da2ef1075c65de431dbf3dfee9d8081592b1264f64aeda22e2a0
-  data.tar.gz: 6708cfb23edfeac1c79bfa104c676e024baac35e42e2e367d6f597b83f4ba30b61757023bdeb444fdf250988f315c365d20e85a697b7d79c37d52565ed292280
+  metadata.gz: b180ffd916f3ebb7472866b14dd294754f6d7a022fe54b416e60c442e7d260f3994be91014e60fb5b82e20a9085469b5a271484161afe064be833d6de07c76bc
+  data.tar.gz: 4691a2d35448c0c8d3fb03ffad34ccf66a72a2590698c0dc41c3aebd127083493364cfaeb80f7d29a946d7420313706ba2e884c3885582c459a3f2e77627ca3f

data/CHANGELOG.md

@@ -1,14 +1,16 @@
-# 2.0.7
+## 2.0.8
+  - Make the `Event.from_json` return a single element instead of an array and make this plugin works under 5.0
+## 2.0.7
   - Fix failing test caused by reverting Java Event back to Ruby Event
-# 2.0.6
+## 2.0.6
   - Fix plugin crash when Logstash::Json fails to parse a message, https://github.com/logstash-plugins/logstash-input-gelf/pull/27
-# 2.0.5
+## 2.0.5
   - Depend on logstash-core-plugin-api instead of logstash-core, removing the need to mass update plugins on major releases of logstash
-# 2.0.4
+## 2.0.4
   - New dependency requirements for logstash-core for the 5.0 release
-# 2.0.3
+## 2.0.3
  - Fix Timestamp coercion to preserve upto microsecond precision, https://github.com/logstash-plugins/logstash-input-gelf/pull/35
-# 2.0.0
+## 2.0.0
  - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully,
    instead of using Thread.raise on the plugins' threads. Ref: https://github.com/elastic/logstash/pull/3895
  - Dependency on logstash-core update to 2.0

data/Gemfile

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

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012–2015 Elasticsearch <http://www.elastic.co>
+Copyright (c) 2012–2016 Elasticsearch <http://www.elastic.co>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/README.md

@@ -55,7 +55,12 @@ gem "logstash-filter-awesome", :path => "/your/local/logstash-filter-awesome"
 ```
 - Install plugin
 ```sh
+# Logstash 2.3 and higher
+bin/logstash-plugin install --no-verify
+
+# Prior to Logstash 2.3
 bin/plugin install --no-verify
+
 ```
 - Run Logstash with your plugin
 ```sh
@@ -73,7 +78,12 @@ gem build logstash-filter-awesome.gemspec
 ```
 - Install the plugin from the Logstash home
 ```sh
-bin/plugin install /your/local/plugin/logstash-filter-awesome.gem
+# Logstash 2.3 and higher
+bin/logstash-plugin install --no-verify
+
+# Prior to Logstash 2.3
+bin/plugin install --no-verify
+
 ```
 - Start Logstash and proceed to test the plugin
 

data/lib/logstash/inputs/gelf.rb

@@ -111,6 +111,7 @@ class LogStash::Inputs::Gelf < LogStash::Inputs::Base
       next if data.nil?
 
       event = self.class.new_event(data, client[3])
+      next if event.nil?
 
       remap_gelf(event) if @remap
       strip_leading_underscore(event) if @strip_leading_underscore
@@ -126,10 +127,11 @@ class LogStash::Inputs::Gelf < LogStash::Inputs::Base
   # @return [LogStash::Event] new event with parsed json gelf, assigned source host and coerced timestamp
   def self.new_event(json_gelf, host)
     event = parse(json_gelf)
+    return if event.nil?
 
-    event[SOURCE_HOST_FIELD] = host
+    event.set(SOURCE_HOST_FIELD, host)
 
-    if (gelf_timestamp = event[TIMESTAMP_GELF_FIELD]).is_a?(Numeric)
+    if (gelf_timestamp = event.get(TIMESTAMP_GELF_FIELD)).is_a?(Numeric)
       event.timestamp = self.coerce_timestamp(gelf_timestamp)
       event.remove(TIMESTAMP_GELF_FIELD)
     end
@@ -148,7 +150,9 @@ class LogStash::Inputs::Gelf < LogStash::Inputs::Base
 
   # from_json_parse uses the Event#from_json method to deserialize and directly produce events
   def self.from_json_parse(json)
-    LogStash::Event.from_json(json).each { |event| event }
+    # from_json will always return an array of item.
+    # in the context of gelf, the payload should be an array of 1
+    LogStash::Event.from_json(json).first
   rescue LogStash::Json::ParserError => e
     logger.error(PARSE_FAILURE_LOG_MESSAGE, :error => e, :data => json)
     LogStash::Event.new(MESSAGE_FIELD => json, TAGS_FIELD => [PARSE_FAILURE_TAG, '_fromjsonparser'])
@@ -157,7 +161,7 @@ class LogStash::Inputs::Gelf < LogStash::Inputs::Base
   # legacy_parse uses the LogStash::Json class to deserialize json
   def self.legacy_parse(json)
     o = LogStash::Json.load(json)
-    LogStash::Event.new(o) if o
+    LogStash::Event.new(o)
   rescue LogStash::Json::ParserError => e
     logger.error(PARSE_FAILURE_LOG_MESSAGE, :error => e, :data => json)
     LogStash::Event.new(MESSAGE_FIELD => json, TAGS_FIELD => [PARSE_FAILURE_TAG, '_legacyjsonparser'])
@@ -171,14 +175,14 @@ class LogStash::Inputs::Gelf < LogStash::Inputs::Base
 
   private
   def remap_gelf(event)
-    if event["full_message"] && !event["full_message"].empty?
-      event["message"] = event["full_message"].dup
+    if event.get("full_message") && !event.get("full_message").empty?
+      event.set("message", event.get("full_message").dup)
       event.remove("full_message")
-      if event["short_message"] == event["message"]
+      if event.get("short_message") == event.get("message")
         event.remove("short_message")
       end
-    elsif event["short_message"]  && !event["short_message"].empty?
-      event["message"] = event["short_message"].dup
+    elsif event.get("short_message") && !event.get("short_message").empty?
+      event.set("message", event.get("short_message").dup)
       event.remove("short_message")
     end
   end # def remap_gelf
@@ -188,7 +192,7 @@ class LogStash::Inputs::Gelf < LogStash::Inputs::Base
      # Map all '_foo' fields to simply 'foo'
      event.to_hash.keys.each do |key|
        next unless key[0,1] == "_"
-       event[key[1..-1]] = event[key]
+       event.set(key[1..-1], event.get(key))
        event.remove(key)
      end
   end # deef removing_leading_underscores

data/logstash-input-gelf.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-gelf'
-  s.version         = '2.0.7'
+  s.version         = '2.0.8'
   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/plugin install gemname. This gem is not a stand-alone program"
+  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"
   s.authors         = ["Elastic"]
   s.email           = 'info@elastic.co'
   s.homepage        = "http://www.elastic.co/guide/en/logstash/current/index.html"
@@ -20,7 +20,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 "gelfd", ["0.2.0"]                 #(Apache 2.0 license)
   s.add_runtime_dependency 'logstash-codec-plain'

data/spec/inputs/gelf_spec.rb

@@ -53,7 +53,7 @@ describe LogStash::Inputs::Gelf do
       gelfclient.notify!("short_message" => "start")
 
       e = queue.pop
-      while (e["message"] != "start")
+      while (e.get("message") != "start")
         e = queue.pop
       end
 
@@ -65,8 +65,8 @@ describe LogStash::Inputs::Gelf do
     end
 
     events.each_with_index do |e, i|
-      insist { e["message"] } == messages[i]
-      insist { e["host"] } == Socket.gethostname
+      insist { e.get("message") } == messages[i]
+      insist { e.get("host") } == Socket.gethostname
     end
   end
 
@@ -150,20 +150,21 @@ describe LogStash::Inputs::Gelf do
   context "when an invalid JSON is fed to the listener" do
     subject { LogStash::Inputs::Gelf.new_event(message, "host") }
     let(:message) { "Invalid JSON message" }
-    if LogStash::Event.respond_to?(:from_java)
+
+    if LogStash::Event.respond_to?(:from_json)
       context "default :from_json parser output" do
         it { should be_a(LogStash::Event) }
 
         it "falls back to plain-text" do
-          expect(subject["message"]).to eq(message)
+          expect(subject.get("message")).to eq(message)
         end
 
         it "tags message with _jsonparsefailure" do
-          expect(subject["tags"]).to include("_jsonparsefailure")
+          expect(subject.get("tags")).to include("_jsonparsefailure")
         end
 
         it "tags message with _fromjsonparser" do
-          expect(subject["tags"]).to include("_fromjsonparser")
+          expect(subject.get("tags")).to include("_fromjsonparser")
         end
       end
     else
@@ -171,15 +172,15 @@ describe LogStash::Inputs::Gelf do
         it { should be_a(LogStash::Event) }
 
         it "falls back to plain-text" do
-          expect(subject["message"]).to eq(message)
+          expect(subject.get("message")).to eq(message)
         end
 
         it "tags message with _jsonparsefailure" do
-          expect(subject["tags"]).to include("_jsonparsefailure")
+          expect(subject.get("tags")).to include("_jsonparsefailure")
         end
 
         it "tags message with _legacyjsonparser" do
-          expect(subject["tags"]).to include("_legacyjsonparser")
+          expect(subject.get("tags")).to include("_legacyjsonparser")
         end
       end
     end

metadata

@@ -1,114 +1,114 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-gelf
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2016-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: logstash-core-plugin-api
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
+  name: logstash-core-plugin-api
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: gelfd
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '2.0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.2.0
+  name: gelfd
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-codec-plain
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: logstash-codec-plain
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: stud
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.22
+        version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.22
+  name: stud
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.22
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: logstash-devutils
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: gelf
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.3.2
+  name: gelf
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: flores
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.2
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: flores
   prerelease: false
   type: :development
-description: This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program
+  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
 email: info@elastic.co
 executables: []
 extensions: []
@@ -136,12 +136,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []