logstash-filter-elasticsearch 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c49921dd793aef36a733aea0ed8a5779b18436b1
-  data.tar.gz: 87a9620d7ab1ecb01ae9beb754e6792b4a98b79d
+  metadata.gz: c1a7fa7e023885cbf1a40246c09c81e7280d06dd
+  data.tar.gz: 7cfd59b8225d3d6e820aef510882e189b2d77526
 SHA512:
-  metadata.gz: c5a2a6405f93d584e3f72130eebd95ce722ea6a2921fa0042893b25b49998013bd38767b1b9c1e3ad611ba75571a70ce2385a18cdee85b73a5e02835f4fb1cf5
-  data.tar.gz: 8cdd41e4935039db5f7efaf6885f87556d0be62a882b4ad3839c426010d40b6a8e205113495464e7d3049ba62ac3d1c1ac6c891d9db4c3cbb2264b3d7c75456d
+  metadata.gz: 713ee393456513db2a61e19fc9790fb12204053688fc3c7649fbc5d4fbb2d2d3aef72f5c6698416e71245b9a0f587fe6cf192bd97fa6824312292d3246240aee
+  data.tar.gz: b5a3909c49610544c19db58bb08814f99e49a73d1f12533d7396a48ec8c388c0539793143d39542d13d4f3d6ec31d211f4f0a2334468d9c9cfe699bfef091c41

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.0.1
+- Fix: wrong usage of search params, now if index is properly specified
+  it's passed to search so it's performed not to all indices if this is not the explicit intention.
 ## 3.0.0
   - Breaking: Updated plugin to use new Java Event APIs
 ## 2.1.0

data/lib/logstash/filters/elasticsearch.rb

@@ -74,8 +74,7 @@ class LogStash::Filters::Elasticsearch < LogStash::Filters::Base
       :ssl => @ssl,
       :hosts => @hosts,
       :ca_file => @ca_file,
-      :logger => @logger,
-      :index => @index
+      :logger => @logger
     }
     @client = LogStash::Filters::ElasticsearchClient.new(@user, @password, options)
   end # def register
@@ -84,7 +83,7 @@ class LogStash::Filters::Elasticsearch < LogStash::Filters::Base
     begin
       query_str = event.sprintf(@query)
 
-      params = { :q => query_str, :size => result_size }
+      params = { :q => query_str, :size => result_size, :index => @index }
       params[:sort] =  @sort if @enable_sort
       results = @client.search(params)
 
@@ -98,7 +97,7 @@ class LogStash::Filters::Elasticsearch < LogStash::Filters::Base
         end
       end
     rescue => e
-      @logger.warn("Failed to query elasticsearch for previous event", :index, @index, :query => query_str, :event => event, :error => e)
+      @logger.warn("Failed to query elasticsearch for previous event", :index => @index, :query => query_str, :event => event, :error => e)
       @tag_on_failure.each{|tag| event.tag(tag)}
     end
     filter_matched(event)

data/lib/logstash/filters/elasticsearch/client.rb

@@ -23,7 +23,7 @@ module LogStash
         transport_options[:ssl] = { ca_file: options[:ca_file] } if ssl && options[:ca_file]
 
         @logger.info("New ElasticSearch filter", :hosts => hosts)
-        @client = ::Elasticsearch::Client.new(index: options[:index], hosts: hosts, transport_options: transport_options)
+        @client = ::Elasticsearch::Client.new(hosts: hosts, transport_options: transport_options)
       end
 
       def search(params)

data/logstash-filter-elasticsearch.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-elasticsearch'
-  s.version         = '3.0.0'
+  s.version         = '3.0.1'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Search elasticsearch for a previous log event and copy some fields from it into the current event"
   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/elasticsearch_spec.rb

@@ -43,6 +43,28 @@ describe LogStash::Filters::Elasticsearch do
       expect(event.get("code")).to eq(404)
     end
 
+    it "should receive all necessary params to perform the search" do
+      expect(client).to receive(:search).with({:q=>"response: 404", :size=>1, :index=>"", :sort=>"@timestamp:desc"})
+      plugin.filter(event)
+    end
+
+    context "when asking to hit specific index" do
+
+      let(:config) do
+        {
+          "index" => "foo*",
+          "hosts" => ["localhost:9200"],
+          "query" => "response: 404",
+          "fields" => [ ["response", "code"] ],
+        }
+      end
+
+      it "should receive all necessary params to perform the search" do
+        expect(client).to receive(:search).with({:q=>"response: 404", :size=>1, :index=>"foo*", :sort=>"@timestamp:desc"})
+        plugin.filter(event)
+      end
+    end
+
     context "when asking for more than one result" do
 
       let(:config) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-06-21 00:00:00.000000000 Z
+date: 2016-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement