logstash-output-elasticsearch 6.2.0-java → 6.2.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d8fa5b44c2bf968c6460d25f27caf4f1b814467
-  data.tar.gz: 3225315b016f698fcb2a29f48f180d79f8ae15ab
+  metadata.gz: e5784a9d0afcd410642c33e371a91d7a8111a233
+  data.tar.gz: 7b1587c58e64395a14632f4d9172a1357af2b8c7
 SHA512:
-  metadata.gz: 55d2b2af8b3e15a814cfc2e592251488eadb8325a6b075976af4199f98df79b0e8d70ba3c7e27352a6f69c7e741255fd3b46b523efbbb1cd6c32a3f4e07847bb
-  data.tar.gz: 18268aa5143178e89467b90f81c278cd449f49ba8b5e03d2a00ec7a4e3f5a05885ccba70252de25c4ebfc3e8137e9e28b3792a6af71b3de4cbf4665d0a642308
+  metadata.gz: 1711322d80f101e96e84ff8aa12d519d8226ab497abd458f1c492858c7ec0d7efa42f9893e5aea2234d8c7cd7ee32bc5a421d396db6888cfa25f7dcc47d0a7a5
+  data.tar.gz: 69564e37569720085ec839fd4ceae3210d2a63f31ae67ee2ee8ec4019af9325f7854e0da1641a966d1683ef9362afc295bdaee52201a1b280d0eca10cbb11421

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 6.2.1
+- When an HTTP error is encountered, log the response body instead of the request.
+  The request body will still be logged at debug level.
+
 ## 6.2.0
 - Add version number / version conflict support
 

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

@@ -238,7 +238,10 @@ module LogStash; module Outputs; class ElasticSearch;
           sleep_interval = sleep_for_interval(sleep_interval)
           retry unless @stopping.true?
         else
-          @logger.error("Got a bad response code from server, but this code is not considered retryable. Request will be dropped", :code => e.response_code, :body => e.body)
+          log_hash = {:code => e.response_code, 
+                      :response_body => e.response_body}
+          log_hash[:request_body] = e.request_body if @logger.debug?
+          @logger.error("Got a bad response code from server, but this code is not considered retryable. Request will be dropped", log_hash)
         end
       rescue => e
         # Stuff that should never happen

data/lib/logstash/outputs/elasticsearch/http_client/manticore_adapter.rb

@@ -64,7 +64,7 @@ module LogStash; module Outputs; class ElasticSearch; class HttpClient;
       # template installation. We might need a better story around this later
       # but for our current purposes this is correct
       if resp.code < 200 || resp.code > 299 && resp.code != 404
-        raise ::LogStash::Outputs::ElasticSearch::HttpClient::Pool::BadResponseCodeError.new(resp.code, request_uri, body)
+        raise ::LogStash::Outputs::ElasticSearch::HttpClient::Pool::BadResponseCodeError.new(resp.code, request_uri, body, resp.body)
       end
 
       resp

data/lib/logstash/outputs/elasticsearch/http_client/pool.rb

@@ -2,16 +2,17 @@ module LogStash; module Outputs; class ElasticSearch; class HttpClient;
   class Pool
     class NoConnectionAvailableError < Error; end
     class BadResponseCodeError < Error
-      attr_reader :url, :response_code, :body
+      attr_reader :url, :response_code, :request_body, :response_body
 
-      def initialize(response_code, url, body)
+      def initialize(response_code, url, request_body, response_body)
         @response_code = response_code
         @url = url
-        @body = body
+        @request_body = request_body
+        @response_body = response_body
       end
 
       def message
-        "Got response code '#{response_code}' contact Elasticsearch at URL '#{@url}'"
+        "Got response code '#{response_code}' contacting Elasticsearch at URL '#{@url}'"
       end
     end
     class HostUnreachableError < Error;

data/logstash-output-elasticsearch.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-elasticsearch'
-  s.version         = '6.2.0'
+  s.version         = '6.2.1'
   s.licenses        = ['apache-2.0']
   s.summary         = "Logstash Output to Elasticsearch"
   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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 6.2.1
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-03 00:00:00.000000000 Z
+date: 2017-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement