logstash-input-elasticsearch 1.0.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 648519ea6b29fdcb5b95a9939080095fe7bf129f
-  data.tar.gz: 8e5c3a0d33d74007942e96806032fc08f7569ebf
+  metadata.gz: 098012eed09f98dfd3a76a5c8aa72eeaa436ba13
+  data.tar.gz: 59d3ab90732dcff6f8294f8ef05f1f4e57fed939
 SHA512:
-  metadata.gz: 40e81ca75e061380601bae58d415fa136ee59cce03de7c6dafc59402b117058659ac53d6de4e83d6f0d28acb030cc86cc3be7c27f115831bc59e8218f7393551
-  data.tar.gz: 56fa3228f843bdc67d2a4227e19989d8507f259c8ee8f9f589096923496860f22be0c6a15e8453ec1ee0aa27a08dbd45ef460d6cb56c25033fcd5af13316a7d7
+  metadata.gz: 18de97eb707531cab8f451711cb8398262098c75aaaaeedc7f6f5ec2a5164383d216d2c364718a5286c6741c711cc3b9be84ee204170ceeb1227b645c96385b3
+  data.tar.gz: 30faa4c6a889ad32638c9a6e74241039c2e5e9283274811bc414ebd856716e1a1987bb25ae7ce8f56e744faf0eb91730e233cf8593f7e67b0ce91e1edac917b2

data/lib/logstash/inputs/elasticsearch.rb

@@ -156,7 +156,7 @@ class LogStash::Inputs::Elasticsearch < LogStash::Inputs::Base
       has_hits = r['hits']['hits'].any?
     end
 
-    while has_hits do
+    while has_hits && !stop?
       r = process_next_scroll(output_queue, r['_scroll_id'])
       has_hits = r['has_hits']
     end

data/logstash-input-elasticsearch.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-elasticsearch'
-  s.version         = '1.0.2'
+  s.version         = '2.0.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Read from an Elasticsearch cluster, based on search query results"
   s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Files
-  s.files = `git ls-files`.split($\)+::Dir.glob('vendor/*')
+  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
 
   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "input" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core", '>= 1.4.0', '< 2.0.0'
+  s.add_runtime_dependency "logstash-core", "~> 2.0.0.snapshot"
 
   s.add_runtime_dependency 'elasticsearch', ['>= 1.0.6', '~> 1.0']
 

data/spec/inputs/elasticsearch_spec.rb

@@ -4,6 +4,25 @@ require "logstash/inputs/elasticsearch"
 require "elasticsearch"
 
 describe LogStash::Inputs::Elasticsearch do
+
+  it_behaves_like "an interruptible input plugin" do
+    let(:esclient) { double("elasticsearch-client") }
+    let(:config) { { } }
+
+    before :each do
+      allow(Elasticsearch::Client).to receive(:new).and_return(esclient)
+      hit = {
+        "_index" => "logstash-2014.10.12",
+        "_type" => "logs",
+        "_id" => "C5b2xLQwTZa76jBmHIbwHQ",
+        "_score" => 1.0,
+        "_source" => { "message" => ["ohayo"] }
+      }
+      allow(esclient).to receive(:search) { { "hits" => { "hits" => [hit] } } }
+      allow(esclient).to receive(:scroll) { { "hits" => { "hits" => [hit] } } }
+    end
+  end
+
   it "should retrieve json event from elasticseach" do
     config = %q[
       input {

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.0.snapshot
   name: logstash-core
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.0.snapshot
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -84,14 +78,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
 - CHANGELOG.md
 - CONTRIBUTORS
 - Gemfile
 - LICENSE
 - NOTICE.TXT
 - README.md
-- Rakefile
 - lib/logstash/inputs/elasticsearch.rb
 - logstash-input-elasticsearch.gemspec
 - spec/inputs/elasticsearch_spec.rb
@@ -117,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Read from an Elasticsearch cluster, based on search query results

data/.gitignore

@@ -1,4 +0,0 @@
-*.gem
-Gemfile.lock
-.bundle
-vendor

data/Rakefile

@@ -1,7 +0,0 @@
-@files=[]
-
-task :default do
-  system("rake -T")
-end
-
-require "logstash/devutils/rake"