logstash-input-elasticsearch 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a0e5a727cc097ec00743d23dcef666cf7e07581
-  data.tar.gz: d415d62a7901234a0dfb3e702bf619a000bd51ca
+  metadata.gz: cfcf0809f15cabb90372ff0ed684bbc63299bc04
+  data.tar.gz: 3350926e0b5063633931abd52b34e5bdd5db5d16
 SHA512:
-  metadata.gz: 0e48d5b0e0179e48f96b93080e7b688e84d5c218e302d0d6a5e622432358e1659c8e10365d9d9a7ee7e68d4047884935be2ef7efc6bbf4cf64f0769a7b135eed
-  data.tar.gz: d430ea78cb36bfdd40fca16c92165627306dccf1b5d2d7ed998ba416a2a180b4767b557354c14c6f3d0ada60e381c71b06f3053d9ab97f68669690953f593c61
+  metadata.gz: f868c0fdb9be3b97382a47fdb5edb9f7d2a593ee8c254f9a1358a6838f80eee16c32814e15a38edb5379a2a8f12de552b952f3b3009029100ee19dd70ca8d227
+  data.tar.gz: 0ca36c5dcb0852eca499fefa32722ddfd784d0495e3e520a459b0edc99706249677a2fef2f4b9d5c6867426f3e5212fba672862ccee92661bed386021d6aa89a

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.0.2
+  - Bump ES client to 5.0.2 to get content-type: json behavior
+  - Revert unneeded manticore change 
+
 ## 4.0.1
   - Switch internal HTTP client to support TLSv1.2
   - Upgrade ES client internally to better support ES 5.x

data/lib/logstash/inputs/elasticsearch.rb

@@ -1,8 +1,6 @@
 # encoding: utf-8
 require "logstash/inputs/base"
 require "logstash/namespace"
-require 'elasticsearch'
-require 'elasticsearch/transport/transport/http/manticore'
 require "base64"
 
 # Read from an Elasticsearch cluster, based on search query results.
@@ -107,6 +105,8 @@ class LogStash::Inputs::Elasticsearch < LogStash::Inputs::Base
   config :ca_file, :validate => :path
 
   def register
+    require "elasticsearch"
+
     @options = {
       :index => @index,
       :body => @query,
@@ -117,10 +117,8 @@ class LogStash::Inputs::Elasticsearch < LogStash::Inputs::Base
     transport_options = {}
 
     if @user && @password
-      transport_options[:auth] = {
-        :user => @user,
-        :password => @password.value
-      }
+      token = Base64.strict_encode64("#{@user}:#{@password.value}")
+      transport_options[:headers] = { :Authorization => "Basic #{token}" }
     end
 
     hosts = if @ssl then
@@ -132,17 +130,11 @@ class LogStash::Inputs::Elasticsearch < LogStash::Inputs::Base
       @hosts
     end
 
-    client_options = {
-      :hosts => hosts, 
-      :transport_options => transport_options, 
-      :transport_class => Elasticsearch::Transport::Transport::HTTP::Manticore
-    }
-
     if @ssl && @ca_file
-      client_options[:ssl] = { :enabled => true, :ca_file => @ca_file }
+      transport_options[:ssl] = { :ca_file => @ca_file }
     end
-    
-    @client = Elasticsearch::Client.new(client_options)
+
+    @client = Elasticsearch::Client.new(:hosts => hosts, :transport_options => transport_options)
   end
 
   def run(output_queue)

data/logstash-input-elasticsearch.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-elasticsearch'
-  s.version         = '4.0.1'
+  s.version         = '4.0.2'
   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"
@@ -22,9 +22,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.0', '< 6.0.0']
-  s.add_runtime_dependency "manticore", '>= 0.5.4', '< 1.0.0'
-
+  s.add_runtime_dependency 'elasticsearch', ['>= 5.0.3', '< 6.0.0']
 
   s.add_runtime_dependency 'logstash-codec-json'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.0.3
     - - "<"
       - !ruby/object:Gem::Version
         version: 6.0.0
@@ -46,30 +46,10 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.0.3
     - - "<"
       - !ruby/object:Gem::Version
         version: 6.0.0
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  name: manticore
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: