logstash-output-elasticsearch 2.6.1-java → 2.6.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5551c54f0e8b203365e73483a7db20333db6d333
-  data.tar.gz: 9c5c987d0fc748b76d253c275cfa698ae26874c5
+  metadata.gz: 0e498531e88fe7f64902a58f2b8c78692e53fe50
+  data.tar.gz: 649251ac66818877c41c3fd09415fcabcbaf4887
 SHA512:
-  metadata.gz: 7dd6e24625c9c7426be50acd16c7926b4b08ea4f23a6e7c3876015a39a0a34599d98490b515b21f965357a204fedad42b55d261a53c420d09e17d23eb68c86c5
-  data.tar.gz: 9d69f8a3c0a888ce32a754a40ad84b28d261d43286f09f595a556f048564f0277ea2463be8dc978b596e9f28f5a1c7acaf759e5120676817e940cd6997c9b375
+  metadata.gz: 37f1ad94ed0a96818dd4abe9290d5b40b43a61956fda40e2f68552579b0a6f7764b3ed1f3cef3fa6e228a0bbe63960a1f37a8d6fd172d10320d52d053f6fe1f2
+  data.tar.gz: 65d29533998b3a822c3a98a9867fd987158c89180060e4685797bcb94891356669827354fe86a245dbe736d9f516b7c2664c1f01cd97ef465f1199ac3fe82078

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.6.2
+ - Fix bug where update index actions would not work with events with 'data' field
+
 ## 2.6.1
  - Add 'retry_on_conflict' configuration option which should have been here from the beginning
  

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012–2015 Elasticsearch <http://www.elastic.co>
+Copyright (c) 2012–2016 Elasticsearch <http://www.elastic.co>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/README.md

@@ -67,7 +67,12 @@ gem "logstash-filter-awesome", :path => "/your/local/logstash-filter-awesome"
 ```
 - Install plugin
 ```sh
+# Logstash 2.3 and higher
+bin/logstah-plugin install --no-verify
+
+# Prior to Logstash 2.3
 bin/plugin install --no-verify
+
 ```
 - Run Logstash with your plugin
 ```sh
@@ -85,7 +90,12 @@ gem build logstash-filter-awesome.gemspec
 ```
 - Install the plugin from the Logstash home
 ```sh
-bin/plugin install /your/local/plugin/logstash-filter-awesome.gem
+# Logstash 2.3 and higher
+bin/logstah-plugin install --no-verify
+
+# Prior to Logstash 2.3
+bin/plugin install --no-verify
+
 ```
 - Start Logstash and proceed to test the plugin
 

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

@@ -44,7 +44,7 @@ module LogStash; module Outputs; class ElasticSearch;
         args, source = update_action_builder(args, source) if action == 'update'
 
         if source && action != 'delete'
-          next [ { action => args }, source ]
+          next [ { action => args.merge({ :data => source }) } ]
         else
           next { action => args }
         end

data/logstash-output-elasticsearch.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-elasticsearch'
-  s.version         = '2.6.1'
+  s.version         = '2.6.2'
   s.licenses        = ['apache-2.0']
   s.summary         = "Logstash Output to Elasticsearch"
-  s.description     = "Output events 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"
   s.authors         = ["Elastic"]
   s.email           = 'info@elastic.co'
   s.homepage        = "http://logstash.net/"

data/spec/integration/outputs/update_spec.rb

@@ -53,8 +53,20 @@ describe "Update actions", :integration => true do
       r = @es.get(:index => 'logstash-update', :type => 'logs', :id => "123", :refresh => true)
       insist { r["_source"]["message"] } == 'updated message here'
     end
+
+    # The es ruby client treats the data field differently. Make sure this doesn't
+    # raise an exception
+    it "should update an existing document that has a 'data' field" do
+      subject = get_es_output({ 'document_id' => "123" })
+      subject.register
+      subject.receive(LogStash::Event.new("data" => "updated message here", "message" => "foo"))
+      subject.flush
+      r = @es.get(:index => 'logstash-update', :type => 'logs', :id => "123", :refresh => true)
+      insist { r["_source"]["data"] } == 'updated message here'
+      insist { r["_source"]["message"] } == 'foo'
+    end
   end
-    
+
   context "when using script" do
     it "should increment a counter with event/doc 'count' variable" do
       subject = get_es_output({ 'document_id' => "123", 'script' => 'scripted_update', 'script_type' => 'file' })

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.2
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-08 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -182,7 +182,7 @@ dependencies:
         version: '0'
   prerelease: false
   type: :development
-description: Output events to elasticsearch
+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
 email: info@elastic.co
 executables: []
 extensions: []