logstash-filter-json 2.0.6 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd746f5742e8da5738fb9721b8e63bb08c59f7c4
-  data.tar.gz: 3496565b8e687152acf4f1573305505e97cfbddb
+  metadata.gz: e3a3f04567d37846259538d4df0e706fd70e2ea5
+  data.tar.gz: 0badea87ef0fae43fa838a62e3e136f049214891
 SHA512:
-  metadata.gz: 0b615c999b1a94f8be0033acfbd212be5c9ac682a6d96202d6cb4b2c2b8674c71ee49016d472de1799b5b6ceb4f7c426d65c990158e98eb33e5983b6605eac67
-  data.tar.gz: b977b150a7cb258f3edeb9fa48c959f8c944ff99413270b7dfc65d3fcf41fa55d50fd84c7bb172a599a2153a5db7cd574359bd2f1feaa9a99f549005dcc7002e
+  metadata.gz: ff8ff0813e23f1881f877aa1c37bdb6e21af5e266f32d1b3a0da256847f742f8b4a8c226c43bbd6503d2baab1d975f2209279d63cf99cb8ee7115769746b09e1
+  data.tar.gz: d46aa98df97832ae3053250137fc28390a272054fcf1c60a0932eb5daa02db5b076e0863f95d2af0ed7c27e0b9986e4091599d068b9f834ac914213449ecae3e

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.6
   - Depend on logstash-core-plugin-api instead of logstash-core, removing the need to mass update plugins on major releases of logstash
 # 2.0.5

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%20Filters/job/logstash-plugin-filter-json-unit/badge/icon)](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Filters/job/logstash-plugin-filter-json-unit/)
+[![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-filter-json.svg)](https://travis-ci.org/logstash-plugins/logstash-filter-json)
 
 This is a plugin for [Logstash](https://github.com/elastic/logstash).
 
@@ -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/filters/json.rb

@@ -66,7 +66,7 @@ class LogStash::Filters::Json < LogStash::Filters::Base
   def filter(event)
     @logger.debug? && @logger.debug("Running json filter", :event => event)
 
-    source = event[@source]
+    source = event.get(@source)
     return unless source
 
     begin
@@ -78,7 +78,7 @@ class LogStash::Filters::Json < LogStash::Filters::Base
     end
 
     if @target
-      event[@target] = parsed
+      event.set(@target, parsed)
     else
       unless parsed.is_a?(Hash)
         @tag_on_failure.each{|tag| event.tag(tag)}
@@ -98,7 +98,7 @@ class LogStash::Filters::Json < LogStash::Filters::Base
       end
 
       # b) then set all parsed fields in the event
-      parsed.each{|k, v| event[k] = v}
+      parsed.each{|k, v| event.set(k, v)}
 
       # c) finally re-inject proper @timestamp
       if parsed_timestamp
@@ -108,7 +108,7 @@ class LogStash::Filters::Json < LogStash::Filters::Base
           event.timestamp = LogStash::Timestamp.new
           @logger.warn("Unrecognized #{LogStash::Event::TIMESTAMP} value, setting current time to #{LogStash::Event::TIMESTAMP}, original in #{LogStash::Event::TIMESTAMP_FAILURE_FIELD} field", :value => parsed_timestamp.inspect)
           event.tag(LogStash::Event::TIMESTAMP_FAILURE_TAG)
-          event[LogStash::Event::TIMESTAMP_FAILURE_FIELD] = parsed_timestamp.to_s
+          event.set(LogStash::Event::TIMESTAMP_FAILURE_FIELD, parsed_timestamp.to_s)
         end
       end
     end

data/logstash-filter-json.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-json'
-  s.version         = '2.0.6'
+  s.version         = '3.0.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This is a JSON parsing filter. It takes an existing field which contains JSON and expands it into an actual data structure within the Logstash event."
-  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" => "filter" }
 
   # Gem dependencies
-  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/filters/json_spec.rb

@@ -17,9 +17,9 @@ describe LogStash::Filters::Json do
     CONFIG
 
     sample '{ "hello": "world", "list": [ 1, 2, 3 ], "hash": { "k": "v" } }' do
-      insist { subject["hello"] } == "world"
-      insist { subject["list" ].to_a } == [1,2,3] # to_a for JRuby + JrJacksom which creates Java ArrayList
-      insist { subject["hash"] } == { "k" => "v" }
+      insist { subject.get("hello") } == "world"
+      insist { subject.get("list" ).to_a } == [1,2,3] # to_a for JRuby + JrJacksom which creates Java ArrayList
+      insist { subject.get("hash") } == { "k" => "v" }
     end
   end
 
@@ -35,9 +35,9 @@ describe LogStash::Filters::Json do
     CONFIG
 
     sample '{ "hello": "world", "list": [ 1, 2, 3 ], "hash": { "k": "v" } }' do
-      insist { subject["data"]["hello"] } == "world"
-      insist { subject["data"]["list" ].to_a } == [1,2,3] # to_a for JRuby + JrJacksom which creates Java ArrayList
-      insist { subject["data"]["hash"] } == { "k" => "v" }
+      insist { subject.get("data")["hello"] } == "world"
+      insist { subject.get("data")["list" ].to_a } == [1,2,3] # to_a for JRuby + JrJacksom which creates Java ArrayList
+      insist { subject.get("data")["hash"] } == { "k" => "v" }
     end
   end
 
@@ -54,8 +54,8 @@ describe LogStash::Filters::Json do
     CONFIG
 
     sample "invalid json" do
-      insist { subject["tags"] }.include?("_jsonparsefailure")
-      insist { subject["tags"] }.include?("_custom_failure_tag")
+      insist { subject.get("tags") }.include?("_jsonparsefailure")
+      insist { subject.get("tags") }.include?("_custom_failure_tag")
     end
   end
 
@@ -69,8 +69,8 @@ describe LogStash::Filters::Json do
     CONFIG
 
     sample "{ \"@timestamp\": \"2013-10-19T00:14:32.996Z\" }" do
-      insist { subject["@timestamp"] }.is_a?(LogStash::Timestamp)
-      insist { LogStash::Json.dump(subject["@timestamp"]) } == "\"2013-10-19T00:14:32.996Z\""
+      insist { subject.get("@timestamp") }.is_a?(LogStash::Timestamp)
+      insist { LogStash::Json.dump(subject.get("@timestamp")) } == "\"2013-10-19T00:14:32.996Z\""
     end
   end
 
@@ -85,8 +85,8 @@ describe LogStash::Filters::Json do
     CONFIG
 
     sample({ "example" => "{ \"hello\": \"world\" }" }) do
-      insist { subject["example"] }.is_a?(Hash)
-      insist { subject["example"]["hello"] } == "world"
+      insist { subject.get("example") }.is_a?(Hash)
+      insist { subject.get("example")["hello"] } == "world"
     end
   end
 
@@ -102,8 +102,8 @@ describe LogStash::Filters::Json do
     CONFIG
 
     sample '[ { "k": "v" }, { "l": [1, 2, 3] } ]' do
-      insist { subject["data"][0]["k"] } == "v"
-      insist { subject["data"][1]["l"].to_a } == [1,2,3] # to_a for JRuby + JrJacksom which creates Java ArrayList
+      insist { subject.get("data")[0]["k"] } == "v"
+      insist { subject.get("data")[1]["l"].to_a } == [1,2,3] # to_a for JRuby + JrJacksom which creates Java ArrayList
     end
   end
 
@@ -127,11 +127,11 @@ describe LogStash::Filters::Json do
       end
 
       it "uses an array to store the tags" do
-        expect(event['tags']).to be_a(Array)
+        expect(event.get('tags')).to be_a(Array)
       end
 
       it "add a json parser failure tag" do
-        expect(event['tags']).to include("_jsonparsefailure")
+        expect(event.get('tags')).to include("_jsonparsefailure")
       end
 
       context "there are two different errors added" do
@@ -139,11 +139,11 @@ describe LogStash::Filters::Json do
         let(:event)  { LogStash::Event.new("message" => message, "tags" => ["_anotherkinfoffailure"] ) }
 
         it "pile the different error messages" do
-          expect(event['tags']).to include("_jsonparsefailure")
+          expect(event.get('tags')).to include("_jsonparsefailure")
         end
 
         it "keep the former error messages on the list" do
-          expect(event['tags']).to include("_anotherkinfoffailure")
+          expect(event.get('tags')).to include("_anotherkinfoffailure")
         end
       end
     end
@@ -152,7 +152,7 @@ describe LogStash::Filters::Json do
       let(:message) { "[1, 2, 3]" }
 
       it "adds the failure tag" do
-        expect(event['tags']).to include("_jsonparsefailure")
+        expect(event.get('tags')).to include("_jsonparsefailure")
       end
     end
 
@@ -170,8 +170,8 @@ describe LogStash::Filters::Json do
 
       it "should set timestamp to current time" do
         expect(event.timestamp).to be_a(LogStash::Timestamp)
-        expect(event["tags"]).to include(LogStash::Event::TIMESTAMP_FAILURE_TAG)
-        expect(event[LogStash::Event::TIMESTAMP_FAILURE_FIELD]).to eq("foobar")
+        expect(event.get("tags")).to include(LogStash::Event::TIMESTAMP_FAILURE_TAG)
+        expect(event.get(LogStash::Event::TIMESTAMP_FAILURE_FIELD)).to eq("foobar")
       end
     end
   end

metadata

@@ -1,44 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-json
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 3.0.0
 platform: ruby
 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-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: []
@@ -59,7 +61,7 @@ licenses:
 metadata:
   logstash_plugin: 'true'
   logstash_group: filter
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -74,10 +76,11 @@ 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: This is a JSON parsing filter. It takes an existing field which contains JSON and expands it into an actual data structure within the Logstash event.
+summary: This is a JSON parsing filter. It takes an existing field which contains
+  JSON and expands it into an actual data structure within the Logstash event.
 test_files:
 - spec/filters/json_spec.rb