logstash-codec-json 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 301db44dac7fae7150d3192cedfc924aede32ecc
-  data.tar.gz: 3655a1837f16ee061573a65e17582c87f6c72397
+  metadata.gz: 9295eea7f1cd9ae7339dbc10ef81cf23b6ce1d36
+  data.tar.gz: bcd279ad1a9df82528d42ba132dd15bc4b824996
 SHA512:
-  metadata.gz: 654736689c2cffe29aa09dc2df93825f8c617a6ddac5dec1e14104de6b34b6ec06f868b0b7068a719c0abb6e8befcd1eb99dc5178d64ad1e356f3943fa393dda
-  data.tar.gz: 77fc0dc02e502d549a32c8bacc77c03f34e9999f2f53281817a21e0c26f42a7182825bfbedee93ead67b4d1667d1d5503039d37f526be9c7231a025752eb863d
+  metadata.gz: 6de6306fad4704d91654c976b9cbde23b4028c72d9053b581fbe75f194f1c9e357ac12b50bf39e07956894e72cc7d33cffe58c102906bbb4ab88b5dc449e630b
+  data.tar.gz: c4bc2c043c6df6643835cfffcb952165218ada149fc5ed9dbd37333ef9aa185a5ea610d41dad0eb854d722cdcbeee720f6fc78a861131889ac70390df87bda14

data/CHANGELOG.md

@@ -0,0 +1,2 @@
+* 1.0.1
+  - Handle JSON arrays at source root by emitting multiple events

data/lib/logstash/codecs/json.rb

@@ -4,7 +4,9 @@ require "logstash/util/charset"
 require "logstash/json"
 
 # This codec may be used to decode (via inputs) and encode (via outputs)
-# full JSON messages.  If you are streaming JSON messages delimited
+# full JSON messages. If the data being sent is a JSON array at its root multiple events will be created (one per element).
+#
+# If you are streaming JSON messages delimited
 # by '\n' then see the `json_lines` codec.
 #
 # Encoding will result in a compact JSON representation (no line terminators or indentation)
@@ -37,7 +39,13 @@ class LogStash::Codecs::JSON < LogStash::Codecs::Base
   def decode(data)
     data = @converter.convert(data)
     begin
-      yield LogStash::Event.new(LogStash::Json.load(data))
+      decoded = LogStash::Json.load(data)
+      if decoded.is_a?(Array)
+        decoded.each {|item| yield(LogStash::Event.new(item)) }
+      else
+        yield LogStash::Event.new(decoded)
+      end
+
     rescue LogStash::Json::ParserError => e
       @logger.info("JSON parse failure. Falling back to plain-text", :error => e, :data => data)
       yield LogStash::Event.new("message" => data, "tags" => ["_jsonparsefailure"])

data/logstash-codec-json.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-codec-json'
-  s.version         = '1.0.0'
+  s.version         = '1.0.1'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This codec may be used to decode (via inputs) and encode (via outputs) full JSON messages"
   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/codecs/json_spec.rb

@@ -52,6 +52,34 @@ describe LogStash::Codecs::JSON do
       end
     end
 
+    context "processing JSON with an array root" do
+      let(:data) {
+        [
+          {"foo" => "bar"},
+          {"foo" => "baz"}
+        ]
+      }
+      let(:data_json) {
+        LogStash::Json.dump(data)
+      }
+
+      it "should yield multiple events" do
+        count = 0
+        subject.decode(data_json) do |event|
+          count += 1
+        end
+        expect(count).to eql(data.count)
+      end
+
+      it "should yield the correct objects" do
+        index = 0
+        subject.decode(data_json) do |event|
+          expect(event.to_hash).to include(data[index])
+          index += 1
+        end
+      end
+    end
+
     context "processing weird binary blobs" do
       it "falls back to plain text and doesn't crash (LOGSTASH-1595)" do
         decoded = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-codec-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-14 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 codec may be used to decode (via inputs) and encode (via outputs) full JSON messages