logstash-filter-esquerystring 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: '0608e5bf3e3a027b7ebfcbd6eb83fdef7de8caea701c20add1d4cccfa62a5c92'
-  data.tar.gz: d7bdabec91119b6ed833fe789f0c2413d31faa616fcea8e4c3d87ef55dc011f8
+SHA1:
+  metadata.gz: 0bc48d1cf1d787b54b63d96f00195787056a2cc8
+  data.tar.gz: ff744149a3c8702e851bc720505ab36481f30eae
 SHA512:
-  metadata.gz: 3ad22fc8ece75dcceeacfa366a5777f76c1280b5a180e5676c3dc619e5e9fc19771c53c0727fa71a80695fc9cb5e7c836ca96b63c30ca6de51fc907d5b821651
-  data.tar.gz: 8dbe2b99216417fba9080ded313b3d7702ba50588b21828b97cbc9ca4489eaed9db1943eac4ca0f9f4bf9d3db0dfc85d3271b420c0a142070befb492404ff42d
+  metadata.gz: 67f92b43df01f7a3bf3a9c94f8a23eb03ae00237233e537681669df95696eb1991c4707a9ab023891fad9dc549cc574f45938f6d5c541fac0c35f00962c9c935
+  data.tar.gz: 9e65a1a31e2f3f4c4b85850ec73094698b91cf2a7909dd44ce3bab16f8632067f2b308dac981d0629898177e2a575af018b3e54a3f1f24f49f44fe80220a3186

data/lib/logstash/filters/esquerystring.rb

@@ -7,6 +7,8 @@ class LogStash::Filters::Esquerystring < LogStash::Filters::Base
 
   config :source, :validate => :array, :required => true
   config :target, :validate => :string, :required => true
+  config :maxlength, :validate => :number, :default => 4096, :required => false
+  config :length_autofix, :validate => :boolean, :default => false, :required => false
 
   public
   def register
@@ -27,8 +29,23 @@ class LogStash::Filters::Esquerystring < LogStash::Filters::Base
     end
 
     return if values.length == 0
-    values = "(" + values.uniq.map { |x| '"' + x + '"' }.join(" OR ") + ")"
-    event.set(@target, values)
+    values = values.uniq.map { |x| '"' + x + '"' }
+    values_str = "(" + values.join(" OR ") + ")"
+    if values_str.length > @maxlength
+      msg = "Produced too long query string (>#{@maxlength}): #{values_str}"
+      if @length_autofix
+        while values_str.length > @maxlength
+          values.pop
+          values_str = "(" + values.join(" OR ") + ")"
+        end
+        @logger.warn(msg + "; Autofixed to: #{values_str}")
+        event.set(@target, values_str)
+      else
+        @logger.error(msg)
+      end
+    else
+      event.set(@target, values_str)
+    end
   end # def filter
 
 end # class LogStash::Filters::Esquerystring

data/logstash-filter-esquerystring.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-esquerystring'
-  s.version         = '1.2.0'
+  s.version         = '1.3.0'
   s.licenses        = ['Apache-2.0']
   s.summary         = "This filter converts values of source field to elasticsearch query string"
   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"

data/spec/filters/esquerystring_spec.rb

@@ -94,4 +94,38 @@ describe LogStash::Filters::Esquerystring do
       insist { subject.get("dst") } == '("arg1" OR "arg2")'
     end
   end
+
+  describe "esquerystring string with too long array and without autofix" do
+    config <<-CONFIG
+      filter {
+        esquerystring {
+          source         => "src"
+          target         => "dst"
+          maxlength      => 20
+          length_autofix => false
+        }
+      }
+    CONFIG
+
+    sample("src" => ["arg1", "arg2", "arg3", "arg4"]) do
+      insist { subject.get("dst") } == nil
+    end
+  end
+
+  describe "esquerystring string with too long array and with autofix" do
+    config <<-CONFIG
+      filter {
+        esquerystring {
+          source         => "src"
+          target         => "dst"
+          maxlength      => 20
+          length_autofix => true
+        }
+      }
+    CONFIG
+
+    sample("src" => ["arg1", "arg2", "arg3", "arg4"]) do
+      insist { subject.get("dst") } == '("arg1" OR "arg2")'
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-esquerystring
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-13 00:00:00.000000000 Z
+date: 2018-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key:
 specification_version: 4
 summary: This filter converts values of source field to elasticsearch query string