logstash-input-elasticsearch 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99cc10fa5daee63fcb318c325f8edaa86c443f22
-  data.tar.gz: 0dd1acac2ff9314ab1decf1b57782c1ad37c390e
+  metadata.gz: 2a0e5a727cc097ec00743d23dcef666cf7e07581
+  data.tar.gz: d415d62a7901234a0dfb3e702bf619a000bd51ca
 SHA512:
-  metadata.gz: c2b22763cfc5521cbbff86c11d7c01030f4e9d88df57d7d6c02813eaf97524e34e641e2ee109c6d2aa14f270e04a98c2c4d1818d8880fd9d779be6fd982a6146
-  data.tar.gz: c89c0da4e80ef31a41d1ac15c13fe34ba5d4eb3ed0ec6cff356b23fd29aeec7b61d65f6d7562bcc663eb05f67a3ca2ccbb4888772715c1fa31467d0eb83bf820
+  metadata.gz: 0e48d5b0e0179e48f96b93080e7b688e84d5c218e302d0d6a5e622432358e1659c8e10365d9d9a7ee7e68d4047884935be2ef7efc6bbf4cf64f0769a7b135eed
+  data.tar.gz: d430ea78cb36bfdd40fca16c92165627306dccf1b5d2d7ed998ba416a2a180b4767b557354c14c6f3d0ada60e381c71b06f3053d9ab97f68669690953f593c61

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.0.1
+  - Switch internal HTTP client to support TLSv1.2
+  - Upgrade ES client internally to better support ES 5.x
+
 ## 4.0.0
   - Remove `scan` from list of options as this is no longer allowed in
     Elasticsearch 5.0.

data/lib/logstash/inputs/elasticsearch.rb

@@ -1,6 +1,8 @@
 # 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.
@@ -101,12 +103,10 @@ class LogStash::Inputs::Elasticsearch < LogStash::Inputs::Base
   # SSL
   config :ssl, :validate => :boolean, :default => false
 
-  # SSL Certificate Authority file
+  # SSL Certificate Authority file in PEM encoded format, must also include any chain certificates as necessary 
   config :ca_file, :validate => :path
 
   def register
-    require "elasticsearch"
-
     @options = {
       :index => @index,
       :body => @query,
@@ -117,8 +117,10 @@ class LogStash::Inputs::Elasticsearch < LogStash::Inputs::Base
     transport_options = {}
 
     if @user && @password
-      token = Base64.strict_encode64("#{@user}:#{@password.value}")
-      transport_options[:headers] = { :Authorization => "Basic #{token}" }
+      transport_options[:auth] = {
+        :user => @user,
+        :password => @password.value
+      }
     end
 
     hosts = if @ssl then
@@ -130,11 +132,17 @@ 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
-      transport_options[:ssl] = { :ca_file => @ca_file }
+      client_options[:ssl] = { :enabled => true, :ca_file => @ca_file }
     end
-
-    @client = Elasticsearch::Client.new(:hosts => hosts, :transport_options => transport_options)
+    
+    @client = Elasticsearch::Client.new(client_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.0'
+  s.version         = '4.0.1'
   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,7 +22,9 @@ Gem::Specification.new do |s|
   # Gem dependencies
   s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
 
-  s.add_runtime_dependency 'elasticsearch', ['>= 1.0.6', '~> 1.0']
+  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 'logstash-codec-json'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-10-13 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -35,10 +35,10 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.6
-    - - "~>"
+        version: 5.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 6.0.0
   name: elasticsearch
   prerelease: false
   type: :runtime
@@ -46,10 +46,30 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.6
-    - - "~>"
+        version: 5.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        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: