logstash-output-elasticsearch 2.5.1-java → 2.5.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2be6702ec45ea049c714fc3d3481405c8d9d4b5
-  data.tar.gz: 376cb1122b3bc91c2747813dee512cd89bef4bcd
+  metadata.gz: d828f1e289c77ea6baff44c741445806d2269d57
+  data.tar.gz: a2dd7280157da88097c32701db5a394748de4378
 SHA512:
-  metadata.gz: f06e6bc71c5faa1ba4296231e0c2f555c4c7caf73031a09a776ec1ff17a127afeaa7967396a41ecbb2ecbf9fd939858fcbd042855d0b72c4e2cffb5edd9f9f63
-  data.tar.gz: c2c403a0690b04aa328eb005312cc1d69d43bc50585e5ef6a0900e0258a8eafa59a7c2c475048e7b15077d5c3982e225bbcb3b6371456cc951b7ae6f1f736ade
+  metadata.gz: 0590f8743db7c23025c4816d82f0d32d1f053b6a4f2aae8204c9cbbc2a43277ba082f3dc89cbeb92215ce3c63d897c985177c2124baff41e25ffee04f250584f
+  data.tar.gz: e9522c843c2a8d89b7187ec43f9e64e5c309114c13a2af4b6164518f702594e713a10f0bdcfa10e5b4d42bea8fb153ad3f976c0924a4f14007685a0c2e4655b0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 2.5.3
+ - Fix bug with update document with doc_as_upsert and scripting (#364, #359)
+ - Make error messages more verbose and easier to parse by humans
+ 
+## 2.5.2
+ - Retryable failures are now logged at the info level instead of warning. (issue #372)
+ 
 ## 2.5.1
  - Fix bug where SSL would sometimes not be enabled
 

data/CONTRIBUTORS

@@ -8,6 +8,7 @@ Contributors:
 * Dmitry Koprov (dkoprov)
 * Graham Bleach (bleach)
 * Hao Chen (haoch)
+* Ivan Babrou (bobrik)
 * James Turnbull (jamtur01)
 * John E. Vincent (lusis)
 * Jordan Sissel (jordansissel)

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

@@ -107,12 +107,13 @@ module LogStash; module Outputs; class ElasticSearch;
       bulk_response["items"].each_with_index do |response,idx|
         action_type, action_props = response.first
         status = action_props["status"]
+        error  = action_props["error"]
         action = actions[idx]
 
         if SUCCESS_CODES.include?(status)
           next
         elsif RETRYABLE_CODES.include?(status)
-          @logger.warn "retrying failed action with response code: #{status}"
+          @logger.info "retrying failed action with response code: #{status} (#{error})"
           actions_to_retry << action
         else
           @logger.warn "Failed action. ", status: status, action: action, response: response
@@ -166,9 +167,9 @@ module LogStash; module Outputs; class ElasticSearch;
       @logger.error(
         "Attempted to send a bulk request to Elasticsearch configured at '#{@client.client_options[:hosts]}',"+
           " but Elasticsearch appears to be unreachable or down!",
-        :client_config => @client.client_options,
         :error_message => e.message,
-        :class => e.class.name
+        :class => e.class.name,
+        :client_config => @client.client_options,
       )
       @logger.debug("Failed actions for last bad bulk request!", :actions => actions)
 
@@ -181,10 +182,10 @@ module LogStash; module Outputs; class ElasticSearch;
         "Attempted to send a bulk request to Elasticsearch configured at '#{@client.client_options[:hosts]}'," +
           " but an error occurred and it failed! Are you sure you can reach elasticsearch from this machine using " +
           "the configuration provided?",
-        :client_config => @client.client_options,
         :error_message => e.message,
         :error_class => e.class.name,
-        :backtrace => e.backtrace
+        :backtrace => e.backtrace,
+        :client_config => @client.client_options,
       )
 
       @logger.debug("Failed actions for last bad bulk request!", :actions => actions)

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

@@ -203,10 +203,13 @@ module LogStash; module Outputs; class ElasticSearch;
         # Use the event as a hash from your script with variable name defined
         # by script_var_name (default: "event")
         # Ex: event["@timestamp"]
-        source = { 'script' => {'params' => { @options[:script_var_name] => source }} }
+        source_orig = source
+        source = { 'script' => {'params' => { @options[:script_var_name] => source_orig }} }
         if @options[:scripted_upsert]
           source['scripted_upsert'] = true
           source['upsert'] = {}
+        elsif @options[:doc_as_upsert]
+          source['upsert'] = source_orig
         else
           source['upsert'] = args.delete(:_upsert) if args[:_upsert]
         end

data/logstash-output-elasticsearch.gemspec

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

data/spec/integration/outputs/update_spec.rb

@@ -77,17 +77,47 @@ describe "Update actions", :integration => true do
     it "should increment a counter with event/doc 'count' variable with inline script" do
       subject = get_es_output({
         'document_id' => "123",
-        'script' => 'ctx._source.counter += event["count"]',
+        'script' => 'ctx._source.counter += event["counter"]',
         'script_lang' => 'groovy',
         'script_type' => 'inline'
       })
       subject.register
-      subject.receive(LogStash::Event.new("count" => 3 ))
+      subject.receive(LogStash::Event.new("counter" => 3 ))
       subject.flush
       r = @es.get(:index => 'logstash-update', :type => 'logs', :id => "123", :refresh => true)
       insist { r["_source"]["counter"] } == 4
     end
 
+    it "should increment a counter with event/doc 'count' variable with event/doc as upsert and inline script" do
+      subject = get_es_output({
+        'document_id' => "123",
+        'doc_as_upsert' => true,
+        'script' => 'if( ctx._source.containsKey("counter") ){ ctx._source.counter += event["counter"]; } else { ctx._source.counter = event["counter"]; }',
+        'script_lang' => 'groovy',
+        'script_type' => 'inline'
+      })
+      subject.register
+      subject.receive(LogStash::Event.new("counter" => 3 ))
+      subject.flush
+      r = @es.get(:index => 'logstash-update', :type => 'logs', :id => "123", :refresh => true)
+      insist { r["_source"]["counter"] } == 4
+    end
+
+    it "should, with new doc, set a counter with event/doc 'count' variable with event/doc as upsert and inline script" do
+      subject = get_es_output({
+        'document_id' => "456",
+        'doc_as_upsert' => true,
+        'script' => 'if( ctx._source.containsKey("counter") ){ ctx._source.counter += event["count"]; } else { ctx._source.counter = event["count"]; }',
+        'script_lang' => 'groovy',
+        'script_type' => 'inline'
+      })
+      subject.register
+      subject.receive(LogStash::Event.new("counter" => 3 ))
+      subject.flush
+      r = @es.get(:index => 'logstash-update', :type => 'logs', :id => "456", :refresh => true)
+      insist { r["_source"]["counter"] } == 3
+    end
+
     it "should increment a counter with event/doc 'count' variable with indexed script" do
       @es.put_script lang: 'groovy', id: 'indexed_update', body: { script: 'ctx._source.counter += event["count"]' }
       subject = get_es_output({

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.2
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby