logstash-output-elasticsearch_java 2.0.0.beta5 → 2.0.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f921261909c00b735dbc91ff20531ae8411d3c9
-  data.tar.gz: 29619fedd17dbc1ae24aaf8d99d571bbbd9bc756
+  metadata.gz: eee11b1070782cb52e85390cae6d8a0e92ebfe63
+  data.tar.gz: 7f508fcedb3b86d8d169c06816906c2f979cdc71
 SHA512:
-  metadata.gz: e6c5796ef190689b9647a4ab081cc7dd00b5f28652d148353d7e306c2e5e385a9f2b121f7bd6859a2e17a9f83649f880c5e3bbb6fe807a59d9b337f598b3867c
-  data.tar.gz: 55e2c01e92cbb836494287a1bec07e5f7aab4eebf1fdfab942ec8dad43dbb5ddf5871da078bc3043c5dcb6a66ad3d93959cc048328a1e28e2a6cb29ead1e26d7
+  metadata.gz: 21d21ed89aded30c7535d78309f70b4fa3b07431da940e97c9facdda81652c4268bbf6a2357735e81ace45af7736655fb4a0b4461ea893904838102ac3ff9492
+  data.tar.gz: c84d407cab42a88f67db7729604bc544651c09896cbe4a39614bf62dc8c392ff9d4cf25f463fb5ba0708d27aa82948ffb342a38b96b72b79ea5de1949d449413

data/lib/logstash/outputs/elasticsearch_java.rb

@@ -131,6 +131,7 @@ class LogStash::Outputs::ElasticSearchJava < LogStash::Outputs::Base
   # The name of your cluster if you set it on the Elasticsearch side. Useful
   # for discovery when using `node` or `transport` protocols.
   # By default, it looks for a cluster named 'elasticsearch'.
+  # Equivalent to the Elasticsearch option 'cluster.name'
   config :cluster, :validate => :string
 
   # For the `node` protocol, if you do not specify `host`, it will attempt to use
@@ -174,14 +175,13 @@ class LogStash::Outputs::ElasticSearchJava < LogStash::Outputs::Base
   # * `protocol => node` - port 9300-9305
   config :port, :validate => :string, :default => "9300-9305"
 
-  # The name/address of the host to bind to for Elasticsearch clustering
-  # This MUST be set when the node protocol is used. The internal Elasticsearch node
+  # The name/address of the host to bind to for Elasticsearch clustering. Equivalent to the Elasticsearch option 'network.host'
+  # option.
+  # This MUST be set for either protocol to work (node or transport)! The internal Elasticsearch node
   # will bind to this ip. This ip MUST be reachable by all nodes in the Elasticsearch cluster
-  config :network_host, :validate => :string
+  config :network_host, :validate => :string, :required => true
 
-  # This is only valid for the 'node' protocol. This sets the port to bind to on 'network_host'
-  #
-  # The port for the node to listen on.
+  # This sets the local port to bind to. Equivalent to the Elasticsrearch option 'transport.tcp.port'
   config :transport_tcp_port, :validate => :number
 
   # This setting no longer does anything. It exists to keep config validation
@@ -229,10 +229,7 @@ class LogStash::Outputs::ElasticSearchJava < LogStash::Outputs::Base
   # Elasticsearch cluster to this Logstash server.
   #
   # All protocols will use bulk requests when talking to Elasticsearch.
-  #
-  # The default `protocol` setting under java/jruby is "node". The default
-  # `protocol` on non-java rubies is "http"
-  config :protocol, :validate => [ "node", "transport"], :default => "node"
+  config :protocol, :validate => [ "node", "transport"], :default => "transport"
 
   # The Elasticsearch action to perform. Valid actions are: `index`, `delete`.
   #
@@ -273,8 +270,9 @@ class LogStash::Outputs::ElasticSearchJava < LogStash::Outputs::Base
   # Set the truststore password
   config :keystore_password, :validate => :password
 
-  # Enable cluster sniffing (transport only)
+  # Enable cluster sniffing (transport only).
   # Asks host for the list of all cluster nodes and adds them to the hosts list
+  # Equivalent to the Elasticsearch option 'client.transport.sniff'
   config :sniffing, :validate => :boolean, :default => false
 
   # Set max retry for each event

data/logstash-output-elasticsearch_java.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-output-elasticsearch_java'
-  s.version         = '2.0.0.beta5'
+  s.version         = '2.0.0.beta6'
   s.licenses        = ['apache-2.0']
   s.summary         = "Logstash Output to Elasticsearch using Java node/transport client"
   s.description     = "Output events to elasticsearch using the java client"
@@ -20,10 +20,10 @@ Gem::Specification.new do |s|
 
   # Gem dependencies
   s.add_runtime_dependency 'concurrent-ruby'
-  s.add_runtime_dependency 'elasticsearch', ['>= 1.0.10', '~> 1.0']
+  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", '>= 1.4.0', '< 2.0.0'
+  s.add_runtime_dependency "logstash-core", ['>= 2.0.0.beta1', '< 3.0.0']
 
   s.add_development_dependency 'ftw', '~> 0.0.42'
   s.add_development_dependency 'logstash-input-generator'

data/spec/integration/outputs/index_spec.rb

@@ -53,6 +53,7 @@ describe "an indexer with custom index_type", :integration => true do
       output {
         elasticsearch_java {
           hosts => "#{get_host()}"
+          network_host => "#{get_local_host}"
           port => "#{get_port('transport')}"
           protocol => "transport"
           index => "#{index}"
@@ -78,6 +79,7 @@ describe "an indexer with no type value set (default to logs)", :integration =>
       output {
         elasticsearch_java {
           hosts => "#{get_host()}"
+          network_host => "#{get_local_host}"
           port => "#{get_port('transport')}"
           protocol => "transport"
           index => "#{index}"

data/spec/integration/outputs/retry_spec.rb

@@ -21,6 +21,7 @@ describe "failures in bulk class expected behavior", :integration => true do
       "manage_template" => true,
       "index" => "logstash-2014.11.17",
       "template_overwrite" => true,
+      "network_host" => get_local_host,
       "protocol" => 'transport',
       "hosts" => get_host(),
       "port" => get_port('transport'),

data/spec/integration/outputs/routing_spec.rb

@@ -52,6 +52,7 @@ describe "(transport protocol) index events with fieldref in routing value", :in
           index => "#{index}"
           flush_size => #{flush_size}
           routing => "%{message}"
+          network_host => "#{get_local_host}"
         }
       }
       CONFIG

data/spec/integration/outputs/templates_spec.rb

@@ -11,7 +11,8 @@ describe "index template expected behavior", :integration => true do
           "template_overwrite" => true,
           "protocol" => protocol,
           "hosts" => "#{get_host()}",
-          "port" => "#{get_port('transport')}"
+          "port" => "#{get_port('transport')}",
+          "network_host" => get_local_host
         }
         next LogStash::Outputs::ElasticSearchJava.new(settings)
       end

data/spec/integration/outputs/transport_create_spec.rb

@@ -12,7 +12,8 @@ describe "transport client create actions", :integration => true do
       "protocol" => "transport",
       "hosts" => get_host(),
       "port" => get_port('transport'),
-      "action" => action
+      "action" => action,
+      "network_host" => get_local_host
     }
     settings['document_id'] = id unless id.nil?
     LogStash::Outputs::ElasticSearchJava.new(settings)

data/spec/unit/outputs/elasticsearch_spec.rb

@@ -3,7 +3,11 @@ require_relative "../../../spec/es_spec_helper"
 describe "outputs/elasticsearch_java" do
   context "registration" do
     it "should register" do
-      output = LogStash::Plugin.lookup("output", "elasticsearch_java").new("protocol" => "transport", "manage_template" => "false")
+      output = LogStash::Plugin.lookup("output", "elasticsearch_java").new(
+        "protocol" => "transport",
+        "network_host" => get_local_host,
+        "manage_template" => "false"
+      )
       # register will try to load jars and raise if it cannot find jars
       expect {output.register}.to_not raise_error
     end
@@ -15,6 +19,7 @@ describe "outputs/elasticsearch_java" do
         require "logstash/outputs/elasticsearch_java"
         settings = {
           "protocol" => "transport",
+          "network_host" => get_local_host,
           "node_name" => "mynode"
         }
         next LogStash::Outputs::ElasticSearchJava.new(settings)
@@ -27,6 +32,7 @@ describe "outputs/elasticsearch_java" do
           :protocol => "transport",
           :client_settings => {
             "client.transport.sniff" => false,
+            "network.host" => get_local_host,
             "node.name" => "mynode"
           }
         })
@@ -40,6 +46,7 @@ describe "outputs/elasticsearch_java" do
         settings = {
           "hosts" => "node01",
           "protocol" => "transport",
+          "network_host" => get_local_host,
           "sniffing" => true
         }
         next LogStash::Outputs::ElasticSearchJava.new(settings)
@@ -61,6 +68,7 @@ describe "outputs/elasticsearch_java" do
         settings = {
           "hosts" => "node01",
           "protocol" => "transport",
+          "network_host" => get_local_host,
           "sniffing" => false
         }
         next LogStash::Outputs::ElasticSearchJava.new(settings)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch_java
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta5
+  version: 2.0.0.beta6
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 1.0.13
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -40,7 +40,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 1.0.13
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -83,10 +83,10 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 2.0.0.beta1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
   name: logstash-core
   prerelease: false
   type: :runtime
@@ -94,10 +94,10 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 2.0.0.beta1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -262,3 +262,4 @@ test_files:
 - spec/integration/outputs/update_spec.rb
 - spec/unit/outputs/elasticsearch/protocol_spec.rb
 - spec/unit/outputs/elasticsearch_spec.rb
+has_rdoc: