logstash-filter-json 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fae32f551c32adc1e999196a442b5b617024b3ea
-  data.tar.gz: 205a5c85baa987762364f8951dd2f4e1bffa350b
+  metadata.gz: 27170e93f03822ec0da6420f92abea14b28301d4
+  data.tar.gz: 4486725015297d1aef4f49a1237a93e9754f9498
 SHA512:
-  metadata.gz: 4db90f0a968c8651a712bc53c9f1c096095ab7581948c5f4e45b74e8655bf757dcf601154179d74a4c2791d5e20b16530c4e3feff2c1b5db85be7e5b882d43bd
-  data.tar.gz: 6de51f87957d8e83659f4f885f421da77a63c3d6e4f00de92e87335059c0db969f50b45f7bf3e5459740ae01ca6c82579de1a21be8a4a2b8020e24a48e95406d
+  metadata.gz: 6def29af5bc608eff94091b35d28b6bd5070d9cec25a71aad9968b0ae3c4c62c65c639e538572dfa6b8e6aea2664ba0c00f10894acd34b8a7e97ef2b03ef380d
+  data.tar.gz: 35044d9e29c8136bdd73cb8a3d8edf5b1a6d91f3ef3041967b2abf0e367fa6364eb1c87630b0a2488bbf6624a4d1ea5ead03f4a54c82ed27ca40a946f49dc71a

data/lib/logstash/filters/json.rb

@@ -62,24 +62,18 @@ class LogStash::Filters::Json < LogStash::Filters::Base
     # TODO(colin) this field merging stuff below should be handled in Event.
 
     source = event[@source]
-    if @target.nil?
-      # Default is to write to the root of the event.
-      dest = event.to_hash
-    else
-      if @target == @source
-        # Overwrite source
-        dest = event[@target] = {}
-      else
-        dest = event[@target] ||= {}
-      end
-    end
 
     begin
-      # TODO(sissel): Note, this will not successfully handle json lists
-      # like your text is '[ 1,2,3 ]' json parser gives you an array (correctly)
-      # which won't merge into a hash. If someone needs this, we can fix it
-      # later.
-      dest.merge!(LogStash::Json.load(source))
+      parsed = LogStash::Json.load(source)
+      # If your parsed JSON is an array, we can't merge, so you must specify a
+      # destination to store the JSON, so you will get an exception about
+      if parsed.kind_of?(Array) && @target.nil?
+        raise('Parsed JSON arrays must have a destination in the configuration')
+      elsif @target.nil?
+        event.to_hash.merge! parsed
+      else
+        event[@target] = parsed
+      end
 
       # If no target, we target the root of the event object. This can allow
       # you to overwrite @timestamp and this will typically happen for json

data/logstash-filter-json.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-json'
-  s.version         = '1.0.0'
+  s.version         = '1.0.1'
   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"

data/spec/filters/json_spec.rb

@@ -86,6 +86,23 @@ describe LogStash::Filters::Json do
     end
   end
 
+  describe "parse JSON array into target field" do
+    config <<-CONFIG
+      filter {
+        json {
+          # Parse message as JSON, store the results in the 'data' field'
+          source => "message"
+          target => "data"
+        }
+      }
+    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
+    end
+  end
+
   context "when json could not be parsed" do
 
     subject(:filter) {  LogStash::Filters::Json.new(config)  }
@@ -124,6 +141,14 @@ describe LogStash::Filters::Json do
       end
     end
 
-  end
+    context "the JSON is an ArrayList" do
+
+      let(:message)  { "[1, 2, 3]" }
 
+      it "adds the failure tag" do
+        expect(event['tags']).to include "_jsonparsefailure"
+      end
+    end
+
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-json
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.2
+rubygems_version: 2.1.9
 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.