logstash-output-elasticsearch 0.1.17-java → 0.1.18-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 892bc7d06569d4f9d371f2e315f9700485fc91e8
-  data.tar.gz: 9d958f6d8988a6538edc418bc44e17bbf35f0e30
+  metadata.gz: 6c15f51be4dc3f93e48d5d7e01e1ee395841778b
+  data.tar.gz: 321c5c48cb9ce8affcd7c9f59c2b8e608e97bdc8
 SHA512:
-  metadata.gz: e21bd143609fb613da9cf6610ddcbfba709b16f911b970eb55c06ac281359f503bd72ca204cb0e16cc3cbd3c49d4d69af188acc39606f3ba02a780d1b4dfc141
-  data.tar.gz: 01ddb6020c95252d8282aa6aaebabda56958f4312798e6d04239f7300cdad5ae48d8e13210ab5ede65608427d859f3eb706f41d860ffa1a8e9666a4b3667a140
+  metadata.gz: a3a3269e0803283108adff84fdbc491ff751f9a76a60970222201855bff5cfbc5c94c3d5418f76ef527a9d835220900272e066630a87246ab3c259a7b6119834
+  data.tar.gz: a06952883180222eef76c94b6b612ec937d5cd6557bcac9d84de00814f9ee1207ba074de53046651ede0dd392481510c013894c0a7b1b0f8e57035d66e64b4d8

data/lib/logstash/outputs/elasticsearch.rb

@@ -35,6 +35,8 @@ require 'logstash-output-elasticsearch_jars.rb'
 # Elasticsearch to Logstash)
 class LogStash::Outputs::ElasticSearch < LogStash::Outputs::Base
   include Stud::Buffer
+  RETRYABLE_CODES = [429, 503]
+  SUCCESS_CODES = [200, 201]
 
   config_name "elasticsearch"
 
@@ -413,11 +415,17 @@ class LogStash::Outputs::ElasticSearch < LogStash::Outputs::Base
       @submit_mutex.unlock
     end
     if bulk_response["errors"]
-      failed_actions = actions.select.with_index {|_,i| [429, 503].include?(bulk_response['statuses'][i]) }
-      unless failed_actions.empty?
-        @logger.debug "#{failed_actions.size}/#{actions.size} events were unsuccessful in sending"
-        retry_push(failed_actions)
+      actions_with_responses = actions.zip(bulk_response['statuses'])
+      actions_to_retry = []
+      actions_with_responses.each do |action, resp_code|
+        if RETRYABLE_CODES.include?(resp_code)
+          @logger.warn "retrying failed action with response code: #{resp_code}"
+          actions_to_retry << action
+        elsif not SUCCESS_CODES.include?(resp_code)
+          @logger.warn "failed action with response of #{resp_code}, dropping action: #{action}"
+        end
       end
+      retry_push(actions_to_retry)
     end
   end
 

data/logstash-output-elasticsearch.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-elasticsearch'
-  s.version         = '0.1.17'
+  s.version         = '0.1.18'
   s.licenses        = ['apache-2.0']
   s.summary         = "Logstash Output to Elasticsearch"
   s.description     = "Output events to elasticsearch"

metadata

@@ -1,30 +1,39 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: java
 authors:
 - Elasticsearch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  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: concurrent-ruby
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: elasticsearch
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+        version: 1.0.6
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -33,18 +42,18 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-  name: elasticsearch
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: stud
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 0.0.17
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
+        version: '0.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -53,33 +62,25 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.0'
-  name: stud
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: cabin
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.17
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.0'
-- !ruby/object:Gem::Dependency
+        version: '0.6'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
-  name: cabin
   prerelease: false
   type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.6'
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: logstash-core
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -87,10 +88,7 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
-  name: logstash-core
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -98,104 +96,106 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: ftw
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.42
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.42
-  name: ftw
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: logstash-input-generator
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.42
-- !ruby/object:Gem::Dependency
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-input-generator
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: manticore
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+        version: '0.3'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
-  name: manticore
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: jar-dependencies
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.3'
-- !ruby/object:Gem::Dependency
+        version: 0.1.7
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.1.7
-  name: jar-dependencies
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: ruby-maven
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.7
-- !ruby/object:Gem::Dependency
+        version: 3.1.1.0.8
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.1.1.0.8
-  name: ruby-maven
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: maven-tools
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1.0.8
-- !ruby/object:Gem::Dependency
+        version: 1.0.7
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.7
-  name: maven-tools
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.7
-- !ruby/object:Gem::Dependency
+        version: '0'
   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: Output events to elasticsearch
 email: info@elasticsearch.com
 executables: []
@@ -236,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - jar 'org.elasticsearch:elasticsearch', '1.4.0'
 rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: Logstash Output to Elasticsearch