logstash-filter-elasticsearch 3.6.0 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8d5c99d58129ffad85468e4bab7c64f184a0bdc2aa8b8a11c8f52353c8e4876
-  data.tar.gz: 30b1a189484e118138d6f7607be7319e035696464e8682b59122f830063b0c8d
+  metadata.gz: 54415da2d9bc4aa6d1d90ea0b65937aa4782c9a9614cafd2ac583d94c0780913
+  data.tar.gz: 44eea0bc6efd2a0a2a5415320a872e03cd3883e122e8d7627c3873241d47720c
 SHA512:
-  metadata.gz: 6ef80c1576cf3d84f3da23bc23ecf7931812675d3566d46a074f6c8901dc182a34a67da8c17f7a6beafd33407c81d4a392c8d604b54abbaad3e542dd2260b987
-  data.tar.gz: 7b754511d4a252de292646d67929b067d4fc44d7eabad53fb300098320592292fc0afac1d200737e6203fe7bd7422a9a1ea7b43e028d1d194879adb7a39788fb
+  metadata.gz: f148fcacc216cbbfca630e858ec93d85329487738dda440200ac2ea4f85253f2f4b6dc4a55cb859781be372a7ef15c727b5ded25015de1988302cd04e64de98e
+  data.tar.gz: '003910ce329cf1945fb3f92c2aef9f096588eb33c85e8716dbba0b65dd770e168e3960b1751553c2d251bc43b2a36dbc3eef339720acc9d40a08e1d1d36db402'

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.6.1
+  - Loosen restrictions on Elasticsearch gem ([#120](https://github.com/logstash-plugins/logstash-filter-elasticsearch/pull/120))
+
 ## 3.6.0
   - Add support for extracting hits total from Elasticsearch 7.x responses
 

data/logstash-filter-elasticsearch.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-elasticsearch'
-  s.version         = '3.6.0'
+  s.version         = '3.6.1'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Copies fields from previous log events in Elasticsearch to current events "
   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"
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
 
   # Gem dependencies
   s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
-  s.add_runtime_dependency 'elasticsearch', ">= 5.0.3", " <6.0.0"
+  s.add_runtime_dependency 'elasticsearch', ">= 5.0.3"
   s.add_runtime_dependency 'manticore', "~> 0.6"
 
   s.add_development_dependency 'logstash-devutils'

data/spec/es_helper.rb

@@ -0,0 +1,43 @@
+module ESHelper
+  def self.get_host_port
+    if ENV["INTEGRATION"] == "true"
+      "elasticsearch:9200"
+    else
+      "localhost:9200"
+    end
+  end
+
+  def self.get_client
+    Elasticsearch::Client.new(:hosts => [get_host_port])
+  end
+
+  def self.doc_type
+    if ESHelper.es_version_satisfies?(">=8")
+      nil
+    elsif ESHelper.es_version_satisfies?(">=7")
+      "_doc"
+    else
+      "doc"
+    end
+  end
+
+  def self.index_doc(es, params)
+    type = doc_type
+    params[:type] = doc_type unless type.nil?
+    es.index(params)
+  end
+
+  def self.es_version
+    ENV['ES_VERSION'] || ENV['ELASTIC_STACK_VERSION']
+  end
+
+  def self.es_version_satisfies?(*requirement)
+    es_version = RSpec.configuration.filter[:es_version] || ENV['ES_VERSION'] || ENV['ELASTIC_STACK_VERSION']
+    if es_version.nil?
+      puts "Info: ES_VERSION, ELASTIC_STACK_VERSION or 'es_version' tag wasn't set. Returning false to all `es_version_satisfies?` call."
+      return false
+    end
+    es_release_version = Gem::Version.new(es_version).release
+    Gem::Requirement.new(requirement).satisfied_by?(es_release_version)
+  end
+end

data/spec/filters/integration/elasticsearch_spec.rb

@@ -2,13 +2,17 @@
 require "logstash/devutils/rspec/spec_helper"
 require "logstash/plugin"
 require "logstash/filters/elasticsearch"
+require_relative "../../../spec/es_helper"
 
 describe LogStash::Filters::Elasticsearch, :integration => true do
 
+
   let(:config) do
     {
-      "hosts" => ["localhost:9200"],
+      "index" => 'logs',
+      "hosts" => [ESHelper.get_host_port],
       "query" => "response: 404",
+      "sort" => "response",
       "fields" => [ ["response", "code"] ],
     }
   end
@@ -16,21 +20,34 @@ describe LogStash::Filters::Elasticsearch, :integration => true do
   let(:event)  { LogStash::Event.new({}) }
 
   before(:each) do
+    @es = ESHelper.get_client
+    # Delete all templates first.
+    # Clean ES of data before we start.
+    @es.indices.delete_template(:name => "*")
+    # This can fail if there are no indexes, ignore failure.
+    @es.indices.delete(:index => "*") rescue nil
+    10.times do
+      ESHelper.index_doc(@es, :index => 'logs', :body => { :response => 404, :this => 'that'})
+    end
+    @es.indices.refresh
+
     plugin.register
   end
 
   it "should enhance the current event with new data" do
     plugin.filter(event)
-    expect(event.get("code")).to eq(404)
+    expect(event.get('code')).to eq(404)
   end
 
   context "when retrieving a list of elements" do
 
     let(:config) do
       {
-        "hosts" => ["localhost:9200"],
+        "index" => 'logs',
+        "hosts" => [ESHelper.get_host_port],
         "query" => "response: 404",
         "fields" => [ ["response", "code"] ],
+        "sort" => "response",
         "result_size" => 10
       }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.6.1
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-30 00:00:00.000000000 Z
+date: 2019-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -36,9 +36,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 6.0.0
   name: elasticsearch
   prerelease: false
   type: :runtime
@@ -47,9 +44,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 6.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -96,6 +90,7 @@ files:
 - lib/logstash/filters/elasticsearch.rb
 - lib/logstash/filters/elasticsearch/client.rb
 - logstash-filter-elasticsearch.gemspec
+- spec/es_helper.rb
 - spec/filters/elasticsearch_spec.rb
 - spec/filters/fixtures/elasticsearch_7.x_hits_total_as_object.json
 - spec/filters/fixtures/query_template.json
@@ -131,6 +126,7 @@ signing_key:
 specification_version: 4
 summary: Copies fields from previous log events in Elasticsearch to current events
 test_files:
+- spec/es_helper.rb
 - spec/filters/elasticsearch_spec.rb
 - spec/filters/fixtures/elasticsearch_7.x_hits_total_as_object.json
 - spec/filters/fixtures/query_template.json