logstash-input-elasticsearch 4.0.2 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfcf0809f15cabb90372ff0ed684bbc63299bc04
-  data.tar.gz: 3350926e0b5063633931abd52b34e5bdd5db5d16
+  metadata.gz: 60ae7f6cc0bb6581187f15e57f0655b91cc6e14b
+  data.tar.gz: 712a2ddf325e7eaa84594a341d30ce7a4a48cfd6
 SHA512:
-  metadata.gz: f868c0fdb9be3b97382a47fdb5edb9f7d2a593ee8c254f9a1358a6838f80eee16c32814e15a38edb5379a2a8f12de552b952f3b3009029100ee19dd70ca8d227
-  data.tar.gz: 0ca36c5dcb0852eca499fefa32722ddfd784d0495e3e520a459b0edc99706249677a2fef2f4b9d5c6867426f3e5212fba672862ccee92661bed386021d6aa89a
+  metadata.gz: 9b9354d32b3442b276df1e30953768b8388305fee0162162939c3f3418bc15c5bff04a5f3e563338cf87f5fa5f3cf779484bab39312e26b7ec1b498e0ddf949d
+  data.tar.gz: 8561315ff579ee5059f0ff11ccd012530e928eb37cbe894707fc96aa052590baa8c9b3fee1459556b85aa072e8e737902b2643be5a732d748262fbfc3222869a

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.0.3
+  - Docs: Add requirement to use version 4.0.2 or higher to support sending Content-Type headers
+  - Fix scrolling to use json bodies in the requests (this makes scrolling not work in ES 1.x)
+
 ## 4.0.2
   - Bump ES client to 5.0.2 to get content-type: json behavior
   - Revert unneeded manticore change 

data/lib/logstash/inputs/elasticsearch.rb

@@ -3,6 +3,16 @@ require "logstash/inputs/base"
 require "logstash/namespace"
 require "base64"
 
+# .Compatibility Note
+# [NOTE]
+# ================================================================================
+# Starting with Elasticsearch 5.3, there's an {ref}modules-http.html[HTTP setting]
+# called `http.content_type.required`. If this option is set to `true`, and you
+# are using Logstash 2.4 through 5.2, you need to update the Elasticsearch input
+# plugin to version 4.0.2 or higher.
+# 
+# ================================================================================
+# 
 # Read from an Elasticsearch cluster, based on search query results.
 # This is useful for replaying test logs, reindexing, etc.
 #
@@ -184,6 +194,6 @@ class LogStash::Inputs::Elasticsearch < LogStash::Inputs::Base
   end
 
   def scroll_request scroll_id
-    @client.scroll(:body => scroll_id, :scroll => @scroll)
+    @client.scroll(:body => { :scroll_id => scroll_id }, :scroll => @scroll)
   end
 end

data/logstash-input-elasticsearch.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-elasticsearch'
-  s.version         = '4.0.2'
+  s.version         = '4.0.3'
   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/logstash-plugin install gemname. This gem is not a stand-alone program"

data/spec/inputs/elasticsearch_spec.rb

@@ -63,7 +63,7 @@ describe LogStash::Inputs::Elasticsearch do
     client = Elasticsearch::Client.new
     expect(Elasticsearch::Client).to receive(:new).with(any_args).and_return(client)
     expect(client).to receive(:search).with(any_args).and_return(response)
-    expect(client).to receive(:scroll).with({ :body => "cXVlcnlUaGVuRmV0Y2g", :scroll=> "1m" }).and_return(scroll_reponse)
+    expect(client).to receive(:scroll).with({ :body => { :scroll_id => "cXVlcnlUaGVuRmV0Y2g" }, :scroll=> "1m" }).and_return(scroll_reponse)
 
     event = input(config) do |pipeline, queue|
       queue.pop
@@ -114,7 +114,7 @@ describe LogStash::Inputs::Elasticsearch do
     before do
       expect(Elasticsearch::Client).to receive(:new).with(any_args).and_return(client)
       expect(client).to receive(:search).with(any_args).and_return(response)
-      allow(client).to receive(:scroll).with({ :body => "cXVlcnlUaGVuRmV0Y2g", :scroll => "1m" }).and_return(scroll_reponse)
+      allow(client).to receive(:scroll).with({ :body => {:scroll_id => "cXVlcnlUaGVuRmV0Y2g"}, :scroll => "1m" }).and_return(scroll_reponse)
     end
 
     context 'when defining docinfo' do

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: logstash-core-plugin-api
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -19,10 +20,7 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: '2.99'
-  name: logstash-core-plugin-api
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -30,8 +28,11 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: '2.99'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: elasticsearch
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -39,10 +40,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 6.0.0
-  name: elasticsearch
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -50,34 +48,36 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 6.0.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: logstash-codec-json
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-json
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
   prerelease: false
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 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
 email: info@elastic.co
 executables: []