logstash-output-elasticsearch 1.0.7-java → 1.1.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6859ba9736d257c039dd16c08ee0d9e6e233c914
-  data.tar.gz: f645572dac0a860dce40e09d5f81e732b37abab3
+  metadata.gz: 21f30a9fb4fae09d20c43211c4a47a38a99892d0
+  data.tar.gz: c8a82c32a338ecc12109b251efab824707770429
 SHA512:
-  metadata.gz: 3fb6d1a7ecb3c40b2f376cb50f00db79e9573cd2cdad844d71e4aae3523aa76a2d2e018fa72916625d9eab414a4bfdd16733b1a8ec01add0020fe530268622ae
-  data.tar.gz: f05821d1741b5b478090cbcb328aa4e33141d2b796b0dcf02bccaea3ab7c18910564f54bdc631b23effb7063e25d4f2c1b119f8febc5b5cb6c9f9d3d924d079c
+  metadata.gz: 1db3b07141dd557c7fcd34dfcfe64fb7705c9c776faf5a9455c6417be00cd23b20e2e267dbcbdbd7477d3c54ac80ea30a65cfe69482722c98ad3505d934ef97b
+  data.tar.gz: cc2c42fd9b8af5caab9b6b15d957d988c7f0c748da737d9449abcd8202ef6f41ac8148c7f77c32a5b92641e43b3a334654f636a0541230f21375aab5820d4c67

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.1.0
+  - Add timeout setting.
+  
 ## 1.0.7
  - Add update API support
 

data/lib/logstash/outputs/elasticsearch.rb

@@ -326,6 +326,11 @@ class LogStash::Outputs::ElasticSearch < LogStash::Outputs::Base
   # create a new document with this parameter as json string if document_id doesn't exists
   config :upsert, :validate => :string, :default => ""
 
+
+  # Set the timeout for network operations and requests sent Elasticsearch. If
+  # a timeout occurs, the request will be retried.
+  config :timeout, :validate => :number
+
   public
   def register
     @submit_mutex = Mutex.new
@@ -396,6 +401,7 @@ class LogStash::Outputs::ElasticSearch < LogStash::Outputs::Base
       :client_settings => client_settings
     }
 
+    common_options[:timeout] = @timeout if @timeout
     common_options.merge! setup_basic_auth()
 
     # Update API setup

data/lib/logstash/outputs/elasticsearch/protocol.rb

@@ -62,13 +62,14 @@ module LogStash::Outputs::Elasticsearch
 
       def build_client(options)
         uri = "#{options[:protocol]}://#{options[:host]}:#{options[:port]}#{options[:client_settings][:path]}"
+        timeout = options[:timeout] || 0
 
         client_options = {
           :host => [uri],
           :ssl => options[:client_settings][:ssl],
           :transport_options => {  # manticore settings so we
-            :socket_timeout => 0,  # do not timeout socket reads
-            :request_timeout => 0,  # and requests
+            :socket_timeout => timeout,  # do not timeout socket reads
+            :request_timeout => timeout,  # and requests
             :proxy => options[:client_settings][:proxy]
           },
           :transport_class => ::Elasticsearch::Transport::Transport::HTTP::Manticore

data/logstash-output-elasticsearch.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-elasticsearch'
-  s.version         = '1.0.7'
+  s.version         = '1.1.0'
   s.licenses        = ['apache-2.0']
   s.summary         = "Logstash Output to Elasticsearch"
   s.description     = "Output events to elasticsearch"
@@ -37,4 +37,5 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'logstash-devutils'
   s.add_development_dependency 'longshoreman'
+  s.add_development_dependency 'flores'
 end

data/spec/unit/outputs/elasticsearch_spec.rb

@@ -1,4 +1,5 @@
 require_relative "../../../spec/es_spec_helper"
+require "flores/random"
 
 describe "outputs/elasticsearch" do
   context "registration" do
@@ -154,4 +155,45 @@ describe "outputs/elasticsearch" do
       end
     end
   end
+
+
+  # TODO(sissel): Improve this. I'm not a fan of using message expectations (expect().to receive...)
+  # especially with respect to logging to verify a failure/retry has occurred. For now, this 
+  # should suffice, though.
+  context "with timeout set" do
+    let(:listener) { Flores::Random.tcp_listener }
+    let(:port) { listener[2] }
+    let(:options) do
+      {
+        "protocol" => "http",
+        "manage_template" => false,
+        "host" => "localhost",
+        "port" => port,
+        "flush_size" => 1,
+        "timeout" => 1,
+      }
+    end
+    let(:eso) {LogStash::Outputs::ElasticSearch.new(options)}
+    
+    before do
+      eso.logger = Cabin::Channel.get
+      eso.register 
+
+      # Expect a timeout to be logged.
+      expect(eso.logger).to receive(:warn).with("Failed to flush outgoing items",
+                                                hash_including(:exception => "Manticore::SocketTimeout"))
+    end
+
+    after do
+      listener[0].close
+      eso.close
+    end
+
+    it "should fail after the timeout" do
+      Thread.new { eso.receive(LogStash::Event.new) }
+
+      # Allow the timeout to occur.
+      sleep(options["timeout"] + 0.5)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.0
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -168,6 +168,20 @@ dependencies:
         version: '0'
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: flores
+  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'
+  prerelease: false
+  type: :development
 description: Output events to elasticsearch
 email: info@elastic.co
 executables: []
@@ -239,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Logstash Output to Elasticsearch