logstash-input-log4j 2.0.7-java → 3.0.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ba5a66031d73f30bdef796e9163def5c862ad13
-  data.tar.gz: b113944153fb865028ed74b40b7a9ed9bd035be3
+  metadata.gz: 82c2333c75035c45d32df73b37a1837a39916010
+  data.tar.gz: 793e367219c37a32b5bd821c13eda75e48ccc237
 SHA512:
-  metadata.gz: 33542b5d93fe84179fe9f5c548a6a195f928f5b63fe9a11ce368870e31590151acdc31b9d96287e4bbcea14f4e9459dc1a2b959237832d6782dd0fda3b1cace8
-  data.tar.gz: cb2938d7f0dba31120962a4900bdad6c7d41e16c0fee9ca26c62a44af21b6cfa85a5d424d195043016dcd86be674456293d0a4a571e356da12d13a0f84c8311e
+  metadata.gz: e7c656d8f4d2dcd69f527c340a3311893a725cae983de730031e32306527d7380089b901ea75a788ac82c8d25a00d952b46fc924e0feba8e6c688641c73785d1
+  data.tar.gz: 7cbf5ed6c81e483405d8ff8c9b004f9c4b81cf839fd1ffb08006ab3787758520dad3b8420998170629084a924dbd962cd0041c13bc1318b4cf8a66c14c5f6d26

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+## 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.0.7
   - Depend on logstash-core-plugin-api instead of logstash-core, removing the need to mass update plugins on major releases of logstash
 # 2.0.6

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

@@ -1,7 +1,6 @@
 # Logstash Plugin
 
-[![Build
-Status](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Inputs/job/logstash-plugin-input-log4j-unit/badge/icon)](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Inputs/job/logstash-plugin-input-log4j-unit/)
+[![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-input-log4j.svg)](https://travis-ci.org/logstash-plugins/logstash-input-log4j)
 
 This is a plugin for [Logstash](https://github.com/elastic/logstash) to allow it to receive events from the log4j Socket Appender. Note that it only works with log4j 1.x and not with version 2.
 
@@ -56,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
@@ -74,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/log4j.rb

@@ -77,21 +77,21 @@ class LogStash::Inputs::Log4j < LogStash::Inputs::Base
   def create_event(log4j_obj)
     # NOTE: log4j_obj is org.apache.log4j.spi.LoggingEvent
     event = LogStash::Event.new("message" => log4j_obj.getRenderedMessage)
-    event["timestamp"] = log4j_obj.getTimeStamp
-    event["path"] = log4j_obj.getLoggerName
-    event["priority"] = log4j_obj.getLevel.toString
-    event["logger_name"] = log4j_obj.getLoggerName
-    event["thread"] = log4j_obj.getThreadName
-    event["class"] = log4j_obj.getLocationInformation.getClassName
-    event["file"] = log4j_obj.getLocationInformation.getFileName + ":" + log4j_obj.getLocationInformation.getLineNumber
-    event["method"] = log4j_obj.getLocationInformation.getMethodName
-    event["NDC"] = log4j_obj.getNDC if log4j_obj.getNDC
-    event["stack_trace"] = log4j_obj.getThrowableStrRep.to_a.join("\n") if log4j_obj.getThrowableInformation
+    event.set("timestamp", log4j_obj.getTimeStamp)
+    event.set("path", log4j_obj.getLoggerName)
+    event.set("priority", log4j_obj.getLevel.toString)
+    event.set("logger_name", log4j_obj.getLoggerName)
+    event.set("thread", log4j_obj.getThreadName)
+    event.set("class", log4j_obj.getLocationInformation.getClassName)
+    event.set("file", log4j_obj.getLocationInformation.getFileName + ":" + log4j_obj.getLocationInformation.getLineNumber)
+    event.set("method", log4j_obj.getLocationInformation.getMethodName)
+    event.set("NDC", log4j_obj.getNDC) if log4j_obj.getNDC
+    event.set("stack_trace", log4j_obj.getThrowableStrRep.to_a.join("\n")) if log4j_obj.getThrowableInformation
 
     # Add the MDC context properties to event
     if log4j_obj.getProperties
       log4j_obj.getPropertyKeySet.each do |key|
-        event[key] = log4j_obj.getProperty(key)
+        event.set(key, log4j_obj.getProperty(key))
       end
     end
     return event
@@ -103,7 +103,7 @@ class LogStash::Inputs::Log4j < LogStash::Inputs::Base
       ois = socket_to_inputstream(socket)
       while !stop?
         event = create_event(ois.readObject)
-        event["host"] = socket.peer
+        event.set("host", socket.peer)
         decorate(event)
         output_queue << event
       end # loop do

data/logstash-input-log4j.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-log4j'
-  s.version         = '2.0.7'
+  s.version         = '3.0.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Read events over a TCP socket from a Log4j SocketAppender"
-  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"
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'logstash-codec-plain'
 
-  s.add_runtime_dependency "logstash-core-plugin-api", "~> 1.0"
+  s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
 
   s.add_development_dependency 'logstash-devutils'
 end

data/spec/inputs/log4j_spec.rb

@@ -60,28 +60,28 @@ describe LogStash::Inputs::Log4j do
 
     it "creates event with general information" do
       subject = input.create_event(log_obj)
-      expect(subject["timestamp"]).to eq(1426366971)
-      expect(subject["path"]).to eq("org.apache.log4j.LayoutTest")
-      expect(subject["priority"]).to eq("INFO")
-      expect(subject["logger_name"]).to eq("org.apache.log4j.LayoutTest")
-      expect(subject["thread"]).to be_a(String)
-      expect(subject["thread"]).not_to be_empty
-      expect(subject["message"]).to eq("Hello, World")
+      expect(subject.get("timestamp")).to eq(1426366971)
+      expect(subject.get("path")).to eq("org.apache.log4j.LayoutTest")
+      expect(subject.get("priority")).to eq("INFO")
+      expect(subject.get("logger_name")).to eq("org.apache.log4j.LayoutTest")
+      expect(subject.get("thread")).to be_a(String)
+      expect(subject.get("thread")).not_to be_empty
+      expect(subject.get("message")).to eq("Hello, World")
       # checks locationInformation is collected, but testing exact values is not meaningful in jruby
-      expect(subject["class"]).not_to be_empty
-      expect(subject["file"]).not_to be_empty
-      expect(subject["method"]).not_to be_empty
+      expect(subject.get("class")).not_to be_empty
+      expect(subject.get("file")).not_to be_empty
+      expect(subject.get("method")).not_to be_empty
     end
 
     it "creates event without stacktrace" do
       subject = input.create_event(log_obj)
-      expect(subject["stack_trace"]).to be_nil
+      expect(subject.get("stack_trace")).to be_nil
     end
 
     it "creates event with stacktrace" do
       subject = input.create_event(log_obj_with_stacktrace)
       #checks stack_trace is collected, exact value is too monstruous
-      expect(subject["stack_trace"]).not_to be_empty
+      expect(subject.get("stack_trace")).not_to be_empty
     end
   end
 end

metadata

@@ -1,58 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-log4j
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 3.0.0
 platform: java
 authors:
 - Elastic
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-24 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !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: 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-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'
-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
+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: []
@@ -75,7 +77,7 @@ licenses:
 metadata:
   logstash_plugin: 'true'
   logstash_group: input
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -90,9 +92,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: Read events over a TCP socket from a Log4j SocketAppender
 test_files: