logstash-output-elasticsearch 5.1.2-java → 5.2.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d467502b3717a7e37fb897d6efc9fb690d03f045
-  data.tar.gz: 3f73d6fa34b9bc65bce91210bf45dd3fb2e935c1
+  metadata.gz: d553066aa5a9463be1990f8eb44e9d5803bee747
+  data.tar.gz: 2d277b0d77b2baa69afcc2a842a68a2fe0f07ae6
 SHA512:
-  metadata.gz: 7daa79d6457e3fe835cad7603a84016ef1964b4d836fbe766139c3a6a2a0438af0c31c11ca8861150198fb7cec2d362028fe3b379e271d9db7ef3f5d7e2d6ab7
-  data.tar.gz: fae281ebd446f93f4cdbf9785143cfa0d3294d9b9b67d17098b60f8139f4903f0abeddb379e2e25e6406335e8e33291148d3d76e58b91da58581b91503f9a511
+  metadata.gz: 8b69222e253ad2ab4ecdc3805e9c02077344fed9820ef0c116ea2157ff67d8d1f0df4bc701f0df1d7042a1e43a218ff846f3c3fdfa8e47252158722dc9736808
+  data.tar.gz: f314dc238f4704775a4ba5019aa3f4a70561be8bf50001b50e6df6a101bfeef7851fe06bf470b839a393b55dd577f69413bb47c0117ea18f9805bbf29dfb18a0

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 5.2.0
+- Change default lang for scripts to be painless, inline with ES 5.0. Earlier there was no default.
+
 ## 5.1.2
 - Hide credentials in exceptions and log messages ([#482](https://github.com/logstash-plugins/logstash-output-elasticsearch/issues/482))
 - [internal] Remove dependency on longshoreman project

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

@@ -114,8 +114,8 @@ module LogStash; module Outputs; class ElasticSearch
       #  file    : "script" contains the name of script stored in elasticseach's config directory
       mod.config :script_type, :validate => ["inline", 'indexed', "file"], :default => ["inline"]
 
-      # Set the language of the used script
-      mod.config :script_lang, :validate => :string, :default => ""
+      # Set the language of the used script. If not set, this defaults to painless in ES 5.0
+      mod.config :script_lang, :validate => :string, :default => "painless"
 
       # Set variable name passed to script (scripted update)
       mod.config :script_var_name, :validate => :string, :default => "event"

data/logstash-output-elasticsearch.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-elasticsearch'
-  s.version         = '5.1.2'
+  s.version         = '5.2.0'
   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"

data/spec/integration/outputs/create_spec.rb

@@ -3,7 +3,7 @@ require_relative "../../../spec/es_spec_helper"
 describe "client create actions", :integration => true do
   require "logstash/outputs/elasticsearch"
 
-  def get_es_output(action, id = nil)
+  def get_es_output(action, id)
     settings = {
       "manage_template" => true,
       "index" => "logstash-create",
@@ -11,7 +11,7 @@ describe "client create actions", :integration => true do
       "hosts" => get_host_port(),
       "action" => action
     }
-    settings['document_id'] = id unless id.nil?
+    settings['document_id'] = id
     LogStash::Outputs::ElasticSearch.new(settings)
   end
 
@@ -36,17 +36,5 @@ describe "client create actions", :integration => true do
         insist { r["hits"]["total"] } == 1
       end
     end
-
-    it "should create new documents without id" do
-      subject = get_es_output("create")
-      subject.register
-      subject.multi_receive([LogStash::Event.new("message" => "sample message here")])
-      @es.indices.refresh
-      # Wait or fail until everything's indexed.
-      Stud::try(3.times) do
-        r = @es.search
-        insist { r["hits"]["total"] } == 1
-      end
-    end
   end
 end

data/spec/integration/outputs/parent_spec.rb

@@ -33,7 +33,7 @@ shared_examples "a parent indexer" do
       Stud::try(10.times) do
         query = { "query" => { "has_parent" => { "type" => "#{type}_parent", "query" => { "match" => { "foo" => "bar" } } } } }
         data = ""
-        response = ftw.post!("#{index_url}/_count?q=*", :body => query.to_json)
+        response = ftw.post!("#{index_url}/_count", :body => query.to_json)
         response.read_body { |chunk| data << chunk }
         result = LogStash::Json.load(data)
         cur_count = result["count"]

data/spec/integration/outputs/update_spec.rb

@@ -9,7 +9,8 @@ describe "Update actions", :integration => true, :version_greater_than_equal_to_
       "index" => "logstash-update",
       "template_overwrite" => true,
       "hosts" => get_host_port(),
-      "action" => "update"
+      "action" => "update",
+      "script_lang" => "groovy"
     }
     LogStash::Outputs::ElasticSearch.new(settings.merge!(options))
   end
@@ -166,6 +167,7 @@ describe "Update actions", :integration => true, :version_greater_than_equal_to_
         subject = get_es_output({ 'document_id' => "456", 'script' => 'scripted_upsert', 'scripted_upsert' => true, 'script_type' => 'file' })
         subject.register
         subject.multi_receive([LogStash::Event.new("counter" => 1)])
+        @es.indices.refresh
         r = @es.get(:index => 'logstash-update', :type => 'logs', :id => "456", :refresh => true)
         insist { r["_source"]["counter"] } == 1
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 5.1.2
+  version: 5.2.0
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-10-03 00:00:00.000000000 Z
+date: 2016-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement