logstash-output-elasticsearch 2.7.0-java → 2.7.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74f2ac96bc6550963861463f730f02b3f7db5b6e
-  data.tar.gz: 05c1c72ec132dac8ef7284b08a2180d9e72e2bb4
+  metadata.gz: a968ae201b4c933075d146acde8af91a2def01ff
+  data.tar.gz: a8b256d46697dee393d4cd56ab2e939650d4b3ca
 SHA512:
-  metadata.gz: f38466236f48b6162e57e7cbe5b1eebe175847a53dd98690291f74a7db328f75cff86d2abe8a22707cb662c2c7f3db04d53a38a09042a278b7e263828812cdc0
-  data.tar.gz: 0bf1bdf857e923e3103045fa7e1bb9f5df585a3c775db9ef632c2fa9a88eeefbff357e12ee89a024d6b7247191a803dddadfaee846382ddbedfdbfac8b49f7ee
+  metadata.gz: 342d5170558e760265bc75e41fa095488a2944f8023636eee69f562d763aaf15f4bb954c1550d4410c4193265fcc00c94103becd80d353242fef671afaa28214
+  data.tar.gz: 09797bea573acaa3faf2a4c6d8e1fc615dc9ff265d10127170d5cf385266b5b63343de086f2669d1f95003091604b82ea313b95f396b0bf8481774a129f002a2

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 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
+
 ## 2.7.0
  - Add `pipeline` configuration option for setting an ingest pipeline to run upon indexing
 

data/lib/logstash/outputs/elasticsearch.rb

@@ -79,7 +79,9 @@ 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.
-  config :path, :validate => :string, :default => "/"
+  # 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
 
   # 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/lib/logstash/outputs/elasticsearch/common.rb

@@ -177,8 +177,7 @@ 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,
-        :client_config => @client.client_options,
+        :class => e.class.name
       )
       @logger.debug("Failed actions for last bad bulk request!", :actions => actions)
 
@@ -193,8 +192,7 @@ module LogStash; module Outputs; class ElasticSearch;
           "the configuration provided?",
         :error_message => e.message,
         :error_class => e.class.name,
-        :backtrace => e.backtrace,
-        :client_config => @client.client_options,
+        :backtrace => e.backtrace
       )
 
       @logger.debug("Failed actions for last bad bulk request!", :actions => actions)

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

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

data/logstash-output-elasticsearch.gemspec

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

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" => "Hello World!", "type" => type))
+        subject.receive(LogStash::Event.new("message" => "test", "type" => type))
       end
     end
 

data/spec/integration/outputs/templates_spec.rb

@@ -73,9 +73,7 @@ describe "index template expected behavior", :integration => true do
   end
 
   it "make [geoip][location] a geo_point" do
-    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 ]
+    expect(@es.indices.get_template(name: "logstash")["logstash"]["mappings"]["_default_"]["properties"]["geoip"]["properties"]["location"]["type"]).to eq("geo_point")
   end
 
   it "aggregate .raw results correctly " do

data/spec/integration/outputs/update_spec.rb

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

data/spec/unit/outputs/elasticsearch_spec.rb

@@ -18,10 +18,12 @@ describe "outputs/elasticsearch" do
       eso.client.send(:client).transport.options[:hosts].first
     }
 
+    let(:do_register) { true }
+
     around(:each) do |block|
-      eso.register
+      eso.register if do_register
       block.call()
-      eso.close
+      eso.close if do_register
     end
 
     describe "getting a document type" do
@@ -78,6 +80,56 @@ 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,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2016-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   name: concurrent-ruby
@@ -21,16 +21,16 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.13
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   name: elasticsearch
@@ -38,19 +38,19 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.13
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.17
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
   name: stud
@@ -58,16 +58,16 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.17
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
   name: cabin
@@ -75,13 +75,13 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   name: logstash-core-plugin-api
@@ -89,13 +89,13 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.42
   name: ftw
@@ -103,13 +103,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.42
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   name: logstash-codec-plain
@@ -117,16 +117,16 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.4
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
   name: manticore
@@ -134,16 +134,16 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.4
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   name: logstash-devutils
@@ -151,13 +151,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   name: longshoreman
@@ -165,13 +165,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   name: flores
@@ -179,7 +179,7 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 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
@@ -234,17 +234,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Logstash Output to Elasticsearch