logstash-filter-kv 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7823f827ecc2a7359e187f76eeef30ace026483d
-  data.tar.gz: 15efba89f825cfe3431ad6fc66f1fa8eb06ff1d9
+  metadata.gz: 173341a071a48586f6990109102f5d6ee2ad0763
+  data.tar.gz: f46c88d52048613c298361ceb5e67c7a31e000a7
 SHA512:
-  metadata.gz: b5c3322e32a0c28e133ec2a7b7a347019e208c70d7ec84afca3ec086c1d0389f3b20effce8392a8646b333e378dfa4a917d00f7b92731da3c2953ce6291d8604
-  data.tar.gz: f0fd946fba942d8e8c5d0c678e85619b522b32e12ba6b2bce49e2bf6166cc6744b5ed9838e94ebc267565b1336304778b8551d431e01978d3b11336b041d63a4
+  metadata.gz: 797bc5b31e5cff7de16d7734d1d50cd3017d7631132f2487604851573925ee72af79225face47c07202c7589a00b15dd729a360cbdc99fd68907b9ac1ed49ac1
+  data.tar.gz: 64198181139ce12f0d2876170172f07acc2397c139f8ef07ac990ee826be96002c349fae230c4f92f52f5f8f13acab379ac69d5a4c9b91480cc0d7ac6fdf2cb5

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.0.4
+ - Fixed: Fields without values could claim the next field + value under certain circumstances. Reported in #22
+
 ## 2.0.3
  - fixed fixed short circuit expressions, some optimizations, added specs, PR #20
  - fixed event field assignment, PR #21

data/lib/logstash/filters/kv.rb

@@ -186,12 +186,15 @@ class LogStash::Filters::KV < LogStash::Filters::Base
   # `bracketsone=(hello world) bracketstwo=[hello world]`
   #
   # will be:
+  #
   # * bracketsone: hello world
   # * bracketstwo: hello world
   #
   # instead of:
+  #
   # * bracketsone: (hello
   # * bracketstwo: [hello
+  #
   config :include_brackets, :validate => :boolean, :default => true
 
   # A boolean specifying whether to drill down into values
@@ -215,8 +218,7 @@ class LogStash::Filters::KV < LogStash::Filters::Base
     valueRxString = "(?:\"([^\"]+)\"|'([^']+)'"
     valueRxString += "|\\(([^\\)]+)\\)|\\[([^\\]]+)\\]" if @include_brackets
     valueRxString += "|((?:\\\\ |[^" + @field_split + "])+))"
-    @scan_re = Regexp.new("((?:\\\\ |[^" + @field_split + @value_split + "])+)\\s*[" + @value_split + "]\\s*" + valueRxString)
-
+    @scan_re = Regexp.new("((?:\\\\ |[^" + @field_split + @value_split + "])+)\s*[" + @value_split + "]\s*" + valueRxString)
     @value_split_re = /[#{@value_split}]/
   end
 

data/logstash-filter-kv.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-kv'
-  s.version         = '2.0.3'
+  s.version         = '2.0.4'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This filter helps automatically parse messages (or specific event fields) which are of the 'foo=bar' variety."
   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"
@@ -24,4 +24,3 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'logstash-devutils'
 end
-

data/spec/filters/kv_spec.rb

@@ -600,4 +600,33 @@ describe LogStash::Filters::KV do
       insist { subject["[foo]"] } == ["bar", "yeah", "yeah"]
     end
   end
+
+  describe "keys without values (reported in #22)" do
+    subject do
+      plugin = LogStash::Filters::KV.new(options)
+      plugin.register
+      plugin
+    end
+
+    let(:message) { "AccountStatus: 4\r\nAdditionalInformation\r\n\r\nCode: \r\nHttpStatusCode: \r\nIsSuccess: True\r\nMessage: \r\n" }
+    let(:data) { {"message" => message} }
+    let(:event) { LogStash::Event.new(data) }
+    let(:options) {
+      {
+        "field_split" => "\r\n",
+        "value_split" => " ",
+        "trimkey" => ":"
+      }
+    }
+
+    context "key and splitters with no value" do
+      it "should ignore the incomplete key/value pairs" do
+        subject.filter(event)
+        expect(event["AccountStatus"]).to eq("4")
+        expect(event["IsSuccess"]).to eq("True")
+        expect(event.to_hash.keys.sort).to eq(
+          ["@timestamp", "@version", "AccountStatus", "IsSuccess", "message"])
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-kv
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core