logstash-output-elasticsearch 2.7.1-java → 3.0.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a968ae201b4c933075d146acde8af91a2def01ff
-  data.tar.gz: a8b256d46697dee393d4cd56ab2e939650d4b3ca
+  metadata.gz: f948e5caa196ea3ba4eb76f706c65f81670189b4
+  data.tar.gz: e8a600c78977584ce8a19f881f1dc462e1340ba5
 SHA512:
-  metadata.gz: 342d5170558e760265bc75e41fa095488a2944f8023636eee69f562d763aaf15f4bb954c1550d4410c4193265fcc00c94103becd80d353242fef671afaa28214
-  data.tar.gz: 09797bea573acaa3faf2a4c6d8e1fc615dc9ff265d10127170d5cf385266b5b63343de086f2669d1f95003091604b82ea313b95f396b0bf8481774a129f002a2
+  metadata.gz: 1c167b9448ec63baecb93bacecbdac5fbef4f005d39121700a51579a51f742e6827f93f12552c36c2ee2b18f3bb5033c4be3ab1b0f8b242e71c27b14088b040d
+  data.tar.gz: f579359b3b18ecbf4fbdc86559a077ce306df472bd9c0e961882fc604c32ef0e2d3b7c28386af37c14687529e8fc8f03aa34f00a36d980c550f876efa8465d2f

data/CHANGELOG.md

@@ -1,9 +1,7 @@
-## 2.7.1
- - Fix spec suite argument passing and other minor bugs
- - Show test failures in CI
- - Omit extraneous debug information in error messages
- - Allow URI paths to work correctly when no 'path' option set
-
+## 3.0.1
+  - Republish all the gems under jruby.
+## 3.0.0
+  - Update the plugin to the version 2.0 of the plugin api, this change is required for Logstash 5.0 compatibility. See https://github.com/elastic/logstash/issues/5141
 ## 2.7.0
  - Add `pipeline` configuration option for setting an ingest pipeline to run upon indexing
 

data/Gemfile

@@ -1,3 +1,4 @@
 source 'https://rubygems.org'
 
-gemspec
+# Specify your gem's dependencies in logstash-mass_effect.gemspec
+gemspec

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

@@ -157,7 +157,7 @@ module LogStash; module Outputs; class ElasticSearch;
       type = if @document_type
                event.sprintf(@document_type)
              else
-               event["type"] || "logs"
+               event.get("type") || "logs"
              end
 
       if !(type.is_a?(String) || type.is_a?(Numeric))
@@ -177,7 +177,8 @@ module LogStash; module Outputs; class ElasticSearch;
         "Attempted to send a bulk request to Elasticsearch configured at '#{@client.client_options[:hosts]}',"+
           " but Elasticsearch appears to be unreachable or down!",
         :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)
 
@@ -192,7 +193,8 @@ module LogStash; module Outputs; class ElasticSearch;
           "the configuration provided?",
         :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_builder.rb

@@ -10,11 +10,7 @@ module LogStash; module Outputs; class ElasticSearch;
       }
 
       common_options[:timeout] = params["timeout"] if params["timeout"]
-
-      if params["path"]
-        client_settings[:path] = "/#{params["path"]}/".gsub(/\/+/, "/") # Normalize slashes
-      end
-
+      client_settings[:path] = "/#{params["path"]}/".gsub(/\/+/, "/") # Normalize slashes
       logger.debug? && logger.debug("Normalizing http path", :path => params["path"], :normalized => client_settings[:path])
 
       client_settings.merge! setup_ssl(logger, params)
@@ -107,4 +103,4 @@ module LogStash; module Outputs; class ElasticSearch;
       }
     end
   end
-end; end; end
+end; end; end

data/lib/logstash/outputs/elasticsearch.rb

@@ -79,9 +79,7 @@ class LogStash::Outputs::ElasticSearch < LogStash::Outputs::Base
 
   # HTTP Path at which the Elasticsearch server lives. Use this if you must run Elasticsearch behind a proxy that remaps
   # the root path for the Elasticsearch HTTP API lives.
-  # Note that if you use paths as components of URLs in the 'hosts' field you may
-  # not also set this field. That will raise an error at startup
-  config :path, :validate => :string
+  config :path, :validate => :string, :default => "/"
 
   # Enable SSL/TLS secured communication to Elasticsearch cluster. Leaving this unspecified will use whatever scheme
   # is specified in the URLs listed in 'hosts'. If no explicit protocol is specified plain HTTP will be used.

data/logstash-output-elasticsearch.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-elasticsearch'
-  s.version         = '2.7.1'
+  s.version         = '3.0.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"
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'elasticsearch', ['>= 1.0.13', '~> 1.0']
   s.add_runtime_dependency 'stud', ['>= 0.0.17', '~> 0.0']
   s.add_runtime_dependency 'cabin', ['~> 0.6']
-  s.add_runtime_dependency "logstash-core-plugin-api", "~> 1.0"
+  s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
 
   s.add_development_dependency 'ftw', '~> 0.0.42'
   s.add_development_dependency 'logstash-codec-plain'

data/spec/integration/outputs/routing_spec.rb

@@ -12,7 +12,7 @@ shared_examples "a routing indexer" do
     before do
       subject.register
       event_count.times do
-        subject.receive(LogStash::Event.new("message" => "test", "type" => type))
+        subject.receive(LogStash::Event.new("message" => "Hello World!", "type" => type))
       end
     end
 

data/spec/integration/outputs/templates_spec.rb

@@ -73,7 +73,9 @@ describe "index template expected behavior", :integration => true do
   end
 
   it "make [geoip][location] a geo_point" do
-    expect(@es.indices.get_template(name: "logstash")["logstash"]["mappings"]["_default_"]["properties"]["geoip"]["properties"]["location"]["type"]).to eq("geo_point")
+    results = @es.search(:body => { "query" => { "bool" => { "must" => { "match_all" => {} }, "filter" => { "geo_distance" => { "distance" => "1000km", "geoip.location" => { "lat" => 0.5, "lon" => 0.5 } } } } } })
+    insist { results["hits"]["total"] } == 1
+    insist { results["hits"]["hits"][0]["_source"]["geoip"]["location"] } == [ 0.0, 0.0 ]
   end
 
   it "aggregate .raw results correctly " do

data/spec/integration/outputs/update_spec.rb

@@ -1,7 +1,6 @@
 require_relative "../../../spec/es_spec_helper"
 
-describe "Update actions", :integration => true, :version_2x_plus => true do
-
+describe "Update actions", :integration => true do
   require "logstash/outputs/elasticsearch"
   require "elasticsearch"
 

data/spec/unit/outputs/elasticsearch_spec.rb

@@ -18,12 +18,10 @@ describe "outputs/elasticsearch" do
       eso.client.send(:client).transport.options[:hosts].first
     }
 
-    let(:do_register) { true }
-
     around(:each) do |block|
-      eso.register if do_register
+      eso.register
       block.call()
-      eso.close if do_register
+      eso.close
     end
 
     describe "getting a document type" do
@@ -80,56 +78,6 @@ describe "outputs/elasticsearch" do
           expect(manticore_host).to include(options["path"])
         end
       end
-
-      context "with a URI based path" do
-        let(:options) do
-          o = super()
-          o.delete("path")
-          o["hosts"] = ["http://localhost:9200/mypath/"]
-          o
-        end
-        let(:client_host_path) { URI.parse(eso.client.client_options[:hosts].first).path }
-
-        it "should initialize without error" do
-          expect { eso }.not_to raise_error
-        end
-
-        it "should use the URI path" do
-          expect(client_host_path).to eql("/mypath/")
-        end
-
-        context "with a path option but no URL path" do
-          let(:options) do
-            o = super()
-            o["path"] = "/override/"
-            o["hosts"] = ["http://localhost:9200"]
-            o
-          end
-
-          it "should initialize without error" do
-            expect { eso }.not_to raise_error
-          end
-
-          it "should use the option path" do
-            expect(client_host_path).to eql("/override/")
-          end
-        end
-
-        # If you specify the path in two spots that is an error!
-        context "with a path option and a URL path" do
-          let(:do_register) { false } # Register will fail
-          let(:options) do
-            o = super()
-            o["path"] = "/override"
-            o["hosts"] = ["http://localhost:9200/mypath/"]
-            o
-          end
-
-          it "should initialize with an error" do
-            expect { eso.register }.to raise_error(LogStash::ConfigurationError)
-          end
-        end
-      end
     end
     describe "without a port specified" do
       it "should properly set the default port (9200) on the HTTP client" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 3.0.1
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-06-29 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +83,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   name: logstash-core-plugin-api
   prerelease: false
   type: :runtime
@@ -91,7 +91,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: