logstash-filter-elasticsearch 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfc8b5e9cf33d9d7ef26f24fa0692a8e64119c17
-  data.tar.gz: 84e9261001fa6a28fd111391fcb23b36c41ce834
+  metadata.gz: 4449efda65f5a277f728141753eb1c950e83ef04
+  data.tar.gz: e56e6b5c256c27117461b6db0bea22bfbb527d34
 SHA512:
-  metadata.gz: 853a1678509361a7eedd80a0fc8264ac7184b0aaf6358cf0373ee0a9783af96620bf873cd12a5d08ba0c9bb5f8966883d68f36fc0c228e64a01b82ed8292134f
-  data.tar.gz: bf37c8e634112d4d5b8cb86cd018cd200e6f91fa11bffabc0fec9e5f38f6dd00eb0404ae4d8fe99fc79ee68df47b5f912a91f4d594b2c54e54169ec9564eb260
+  metadata.gz: f59ef828868090acfef220f3ad3dd6e01154963a4e362d40438a8bbb67a33f17fc71286c0b5b4133430738d97b7256defa34e6a6c5cd62569fd9ec5e03f225c7
+  data.tar.gz: 30932b8f798136089e5c609bb1ad801441779a2053f452d11b3b3acab493874f6895a304241e4d63b52400826753657d8a41d3c7a1c457e4c3669ebd08dfb9c8

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.1.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.
 ## 2.1.0
   - Improved the configuration options to be more easy to understand and
     match what the expectations are from the documentation.

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
@@ -83,7 +82,8 @@ class LogStash::Filters::Elasticsearch < LogStash::Filters::Base
   def filter(event)
     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)
 
@@ -97,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         = '2.1.0'
+  s.version         = '2.1.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["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: 2.1.0
+  version: 2.1.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