logstash-output-elasticsearch_java 1.0.0.beta1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f3598838ddd3f3b31bb2fd185b947913d8abf21
-  data.tar.gz: b360525c05bd16bff468a8c0d93257e966926d36
+  metadata.gz: 6ca2df36f0c6552c973d3abc54431be44b8800b1
+  data.tar.gz: 7f5ed63ea8db279bc51be73330741643eba73bd9
 SHA512:
-  metadata.gz: dc56371b39b232bb78bc6369fc98e7976b9ec4f91a64ae5876b3207d58e29c941dd5e896693f801cfe30be5dfc136d105c8be26b410118f7b57eee0525c0d5f1
-  data.tar.gz: 24e90919491c6d754cc9c08f6d1d90bd178a5883d1692c516a0bcba2e276ccea1e61221f6871ce1847ec58dca23daa295498ceae08717512433085822a77831a
+  metadata.gz: fd1207a347bf8f72b9f8f4fd9412973d5e3d17d0b6ed0dc9fa7112851b60fa6129e2d8937f54e9973c8979c71e6de6f33ec1244f43bdce4c22a78da9408d7f1c
+  data.tar.gz: 8fb170cc1c35392e73b1317f49b98af418f33d1cd1308c5a9fe4c0f428003ae885a6721e4a25754c06d43b22f7c57c99a994435d83353afd8bcea0a11f76010e

data/lib/logstash/outputs/elasticsearch_java.rb

@@ -303,42 +303,11 @@ class LogStash::Outputs::ElasticSearchJava < LogStash::Outputs::Base
     @retry_queue_not_full = ConditionVariable.new
     @retry_queue = Queue.new
 
-    client_settings = {}
-    client_settings["cluster.name"] = @cluster if @cluster
-    client_settings["network.host"] = @network_host if @network_host
-    client_settings["transport.tcp.port"] = @transport_tcp_port if @transport_tcp_port
-    client_settings["client.transport.sniff"] = @sniffing
-
-    if @node_name
-      client_settings["node.name"] = @node_name
-    else
-      client_settings["node.name"] = "logstash-#{Socket.gethostname}-#{$$}-#{object_id}"
-    end
-
-    @@plugins.each do |plugin|
-      name = plugin.name.split('-')[-1]
-      client_settings.merge!(LogStash::Outputs::ElasticSearchJava.const_get(name.capitalize).create_client_config(self))
-    end
-
     if (@hosts.nil? || @hosts.empty?) && @protocol != "node" # node can use zen discovery
       @logger.info("No 'hosts' set in elasticsearch output. Defaulting to localhost")
       @hosts = ["localhost"]
     end
 
-    common_options = {
-      :protocol => @protocol,
-      :client_settings => client_settings,
-      :hosts => @hosts,
-      :port => @port
-    }
-
-    # Update API setup
-    update_options = {
-      :upsert => @upsert,
-      :doc_as_upsert => @doc_as_upsert
-    }
-    common_options.merge! update_options if @action == 'update'
-
     client_class = case @protocol
       when "transport"
         LogStash::Outputs::ElasticSearchJavaPlugins::Protocols::TransportClient
@@ -346,7 +315,7 @@ class LogStash::Outputs::ElasticSearchJava < LogStash::Outputs::Base
         LogStash::Outputs::ElasticSearchJavaPlugins::Protocols::NodeClient
     end
 
-    @client = client_class.new(common_options)
+    @client = client_class.new(client_options)
 
     if @manage_template
       begin
@@ -385,6 +354,41 @@ class LogStash::Outputs::ElasticSearchJava < LogStash::Outputs::Base
     end
   end # def register
 
+  def client_options
+    client_settings = {}
+    client_settings["cluster.name"] = @cluster if @cluster
+    client_settings["network.host"] = @network_host if @network_host
+    client_settings["transport.tcp.port"] = @transport_tcp_port if @transport_tcp_port
+    client_settings["client.transport.sniff"] = @sniffing
+
+    if @node_name
+      client_settings["node.name"] = @node_name
+    else
+      client_settings["node.name"] = "logstash-#{Socket.gethostname}-#{$$}-#{object_id}"
+    end
+
+    @@plugins.each do |plugin|
+      name = plugin.name.split('-')[-1]
+      client_settings.merge!(LogStash::Outputs::ElasticSearchJava.const_get(name.capitalize).create_client_config(self))
+    end
+
+    common_options = {
+      :protocol => @protocol,
+      :client_settings => client_settings,
+      :hosts => @hosts,
+      :port => @port
+    }
+
+    # Update API setup
+    update_options = {
+      :upsert => @upsert,
+      :doc_as_upsert => @doc_as_upsert
+    }
+    common_options.merge! update_options if @action == 'update'
+
+    common_options
+  end
+
 
   public
   def get_template
@@ -402,7 +406,7 @@ class LogStash::Outputs::ElasticSearchJava < LogStash::Outputs::Base
 
   public
   def receive(event)
-    return unless output?(event)
+    
 
     # block until we have not maxed out our 
     # retry queue. This is applying back-pressure
@@ -473,11 +477,7 @@ class LogStash::Outputs::ElasticSearchJava < LogStash::Outputs::Base
   end # def flush
 
   public
-  def teardown
-    if @cacert # remove temporary jks store created from the cacert
-      File.delete(@truststore)
-    end
-
+  def close
     @retry_teardown_requested.make_true
     # First, make sure retry_timer_thread is stopped
     # to ensure we do not signal a retry based on 

data/lib/logstash/outputs/elasticsearch_java/protocol.rb

@@ -14,12 +14,6 @@ module LogStash
             @logger = Cabin::Channel.get
           end
 
-          def client
-            return @client if @client
-            @client = build_client(@options)
-            return @client
-          end
-
           def template_install(name, template, force=false)
             if template_exists?(name) && !force
               @logger.debug("Found existing Elasticsearch template. Skipping template management", :name => name)
@@ -230,12 +224,16 @@ module LogStash
         end # class NodeClient
 
         class TransportClient < NodeClient
+          def client
+            return @client if @client
+            @client = build_client(@options)
+            return @client
+          end
+
+
           private
           def build_client(options)
-            client = org.elasticsearch.client.transport.TransportClient.
-              builder().
-              settings((settings.build)).
-              build()
+            client = org.elasticsearch.client.transport.TransportClient.new(settings.build)
 
             options[:hosts].each do |host|
               matches = host.match /(.+)(?:.*)/

data/logstash-output-elasticsearch_java.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-output-elasticsearch_java'
-  s.version         = '1.0.0.beta1'
+  s.version         = '1.0.0'
   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"
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Files
-  s.files = `git ls-files`.split($\)
+  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
 
   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
@@ -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.beta2", "< 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'),
@@ -60,7 +61,7 @@ describe "failures in bulk class expected behavior", :integration => true do
     end
     subject.register
     subject.receive(event1)
-    subject.teardown
+    subject.close
   end
 
   it "should retry actions with response status of 503" do
@@ -108,7 +109,7 @@ describe "failures in bulk class expected behavior", :integration => true do
     subject.register
     subject.receive(invalid_event)
     expect(subject).not_to receive(:retry_push)
-    subject.teardown
+    subject.close
 
     @es.indices.refresh
     sleep(5)
@@ -122,7 +123,7 @@ describe "failures in bulk class expected behavior", :integration => true do
     subject.register
     subject.receive(event1)
     expect(subject).not_to receive(:retry_push)
-    subject.teardown
+    subject.close
 
     @es.indices.refresh
     sleep(5)
@@ -136,7 +137,7 @@ describe "failures in bulk class expected behavior", :integration => true do
     subject.register
     subject.receive(invalid_event)
     subject.receive(event1)
-    subject.teardown
+    subject.close
     @es.indices.refresh
     sleep(5)
 

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)
@@ -28,6 +29,12 @@ describe "transport client create actions", :integration => true do
   end
 
   context "when action => create" do
+    it "should instantiate a transport, not node, client" do
+      subject = get_es_output("create", "id123")
+      subject.register
+      expect(subject.client.send(:client).class).to eql(Java::OrgElasticsearchClientTransport::TransportClient)
+    end
+
     it "should create new documents with or without id" do
       subject = get_es_output("create", "id123")
       subject.register

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,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch_java
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta1
+  version: 1.0.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-10 00:00:00.000000000 Z
+date: 2015-10-22 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.10
-    - - "~>"
+        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.10
-    - - "~>"
+        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,33 +75,33 @@ 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.4.0
-    - - "<"
+        version: 2.0.0.beta2
+    - - <
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
   name: logstash-core
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - "<"
+        version: 2.0.0.beta2
+    - - <
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.42
   name: ftw
@@ -109,13 +109,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-input-generator
@@ -123,13 +123,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: logstash-devutils
@@ -137,13 +137,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
@@ -151,7 +151,7 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Output events to elasticsearch using the java client
@@ -160,14 +160,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
 - CHANGELOG.md
 - CONTRIBUTORS
 - Gemfile
 - LICENSE
 - NOTICE.TXT
 - README.md
-- Rakefile
 - lib/logstash-output-elasticsearch_java_jars.rb
 - lib/logstash/outputs/elasticsearch_java.rb
 - lib/logstash/outputs/elasticsearch_java/elasticsearch-template.json
@@ -185,11 +183,17 @@ files:
 - spec/unit/outputs/elasticsearch/protocol_spec.rb
 - spec/unit/outputs/elasticsearch_spec.rb
 - vendor/jar-dependencies/runtime-jars/antlr-runtime-3.5.jar
+- vendor/jar-dependencies/runtime-jars/apache-log4j-extras-1.2.17.jar
 - vendor/jar-dependencies/runtime-jars/asm-4.1.jar
 - vendor/jar-dependencies/runtime-jars/asm-commons-4.1.jar
-- vendor/jar-dependencies/runtime-jars/elasticsearch-1.7.0.jar
+- vendor/jar-dependencies/runtime-jars/elasticsearch-1.7.3.jar
+- vendor/jar-dependencies/runtime-jars/groovy-all-2.4.4.jar
+- vendor/jar-dependencies/runtime-jars/jna-4.1.0.jar
+- vendor/jar-dependencies/runtime-jars/jts-1.13.jar
+- vendor/jar-dependencies/runtime-jars/log4j-1.2.17.jar
 - vendor/jar-dependencies/runtime-jars/lucene-analyzers-common-4.10.4.jar
 - vendor/jar-dependencies/runtime-jars/lucene-core-4.10.4.jar
+- vendor/jar-dependencies/runtime-jars/lucene-expressions-4.10.4.jar
 - vendor/jar-dependencies/runtime-jars/lucene-grouping-4.10.4.jar
 - vendor/jar-dependencies/runtime-jars/lucene-highlighter-4.10.4.jar
 - vendor/jar-dependencies/runtime-jars/lucene-join-4.10.4.jar
@@ -213,14 +217,14 @@ 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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project:
 rubygems_version: 2.4.8

data/.gitignore

@@ -1,5 +0,0 @@
-*.gem
-Gemfile.lock
-.bundle
-.idea
-*~

data/Rakefile

@@ -1 +0,0 @@
-require "logstash/devutils/rake"