logstash-filter-elasticsearch 2.1.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4449efda65f5a277f728141753eb1c950e83ef04
-  data.tar.gz: e56e6b5c256c27117461b6db0bea22bfbb527d34
+  metadata.gz: c49921dd793aef36a733aea0ed8a5779b18436b1
+  data.tar.gz: 87a9620d7ab1ecb01ae9beb754e6792b4a98b79d
 SHA512:
-  metadata.gz: f59ef828868090acfef220f3ad3dd6e01154963a4e362d40438a8bbb67a33f17fc71286c0b5b4133430738d97b7256defa34e6a6c5cd62569fd9ec5e03f225c7
-  data.tar.gz: 30932b8f798136089e5c609bb1ad801441779a2053f452d11b3b3acab493874f6895a304241e4d63b52400826753657d8a41d3c7a1c457e4c3669ebd08dfb9c8
+  metadata.gz: c5a2a6405f93d584e3f72130eebd95ce722ea6a2921fa0042893b25b49998013bd38767b1b9c1e3ad611ba75571a70ce2385a18cdee85b73a5e02835f4fb1cf5
+  data.tar.gz: 8cdd41e4935039db5f7efaf6885f87556d0be62a882b4ad3839c426010d40b6a8e205113495464e7d3049ba62ac3d1c1ac6c891d9db4c3cbb2264b3d7c75456d

data/CHANGELOG.md

@@ -1,6 +1,5 @@
-## 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.
+## 3.0.0
+  - Breaking: Updated plugin to use new Java Event APIs
 ## 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,7 +74,8 @@ class LogStash::Filters::Elasticsearch < LogStash::Filters::Base
       :ssl => @ssl,
       :hosts => @hosts,
       :ca_file => @ca_file,
-      :logger => @logger
+      :logger => @logger,
+      :index => @index
     }
     @client = LogStash::Filters::ElasticsearchClient.new(@user, @password, options)
   end # def register
@@ -83,7 +84,7 @@ class LogStash::Filters::Elasticsearch < LogStash::Filters::Base
     begin
       query_str = event.sprintf(@query)
 
-      params = { :q => query_str, :size => result_size, :index => @index }
+      params = { :q => query_str, :size => result_size }
       params[:sort] =  @sort if @enable_sort
       results = @client.search(params)
 
@@ -93,13 +94,13 @@ class LogStash::Filters::Elasticsearch < LogStash::Filters::Base
           results["hits"]["hits"].to_a.each do |doc|
             set << doc["_source"][old_key]
           end
-          event[new_key] = ( set.count > 1 ? set : set.first)
+          event.set(new_key, set.count > 1 ? set : set.first)
         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)
   end # def filter
-end # class LogStash::Filters::Elasticsearch
+end #class LogStash::Filters::Elasticsearch

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(hosts: hosts, transport_options: transport_options)
+        @client = ::Elasticsearch::Client.new(index: options[:index], 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.1'
+  s.version         = '3.0.0'
   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"
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "filter" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core-plugin-api", "~> 1.0"
+  s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
   s.add_runtime_dependency 'elasticsearch'
 
   s.add_development_dependency 'logstash-devutils'

data/spec/filters/elasticsearch_spec.rb

@@ -40,29 +40,7 @@ describe LogStash::Filters::Elasticsearch do
 
     it "should enhance the current event with new data" do
       plugin.filter(event)
-      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
+      expect(event.get("code")).to eq(404)
     end
 
     context "when asking for more than one result" do
@@ -82,7 +60,7 @@ describe LogStash::Filters::Elasticsearch do
 
       it "should enhance the current event with new data" do
         plugin.filter(event)
-        expect(event["code"]).to eq([404]*10)
+        expect(event.get("code")).to eq([404]*10)
       end
     end
 

data/spec/filters/integration/elasticsearch_spec.rb

@@ -21,7 +21,7 @@ describe LogStash::Filters::Elasticsearch, :integration => true do
 
   it "should enhance the current event with new data" do
     plugin.filter(event)
-    expect(event["code"]).to eq(404)
+    expect(event.get("code")).to eq(404)
   end
 
   context "when retrieving a list of elements" do
@@ -37,7 +37,7 @@ describe LogStash::Filters::Elasticsearch, :integration => true do
 
     it "should enhance the current event with new data" do
       plugin.filter(event)
-      expect(event["code"]).to eq([404]*10)
+      expect(event.get("code")).to eq([404]*10)
     end
 
   end

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   name: logstash-core-plugin-api
   prerelease: false
   type: :runtime
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: