fluent-plugin-elasticsearch 2.12.4 → 2.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 346ce09074a330559ab327a078ddc042e2555bb71afad491962083c272789751
-  data.tar.gz: 46689cc4b8496fdd57b620d303de60e46e661dce3ac6fe30fab5c7595396bd28
+  metadata.gz: 2e61b71d57d8dcc1f75180c40f8e926804b694004b30cb0ecff73407fb1c647c
+  data.tar.gz: b1503054bd7fe71e15bc3aa0c9f0fd90e320926ae40138924ddae9511e1bde8a
 SHA512:
-  metadata.gz: 71857e0b0b56a2cb5fb4bd6b98f3931ce09397503aadae2df46ac470530065186a22c97625f53f8286f42df7ea4265c0af2073f332a280d7b959cb1376393d0a
-  data.tar.gz: 82325f62e7365816d0779e8d6656ac31cccc9d20a50723b78b9fe3cd32f3f7fcffbfd8dd62cebb71a203dc4db15be20c283067eaf10b61ad947a4ebca9d04ea1
+  metadata.gz: ccf3115fb1d7e434cb7bf986bc4c3f2ef91af0eeeddab5b49bf5603089b4ce48919eb56a60a5f07222be8695caf03ea1d9017ff54a6e0c8e96fcd7adec2dfbec
+  data.tar.gz: a5a2b1ee4a2bcf33406e3c754547d0b8de41082a334c196c4ab7b4a9f410770bcf018064ddf5375ceea9e5e935a23e5d88b3b9e17e4a27e9cfc43e1fa6d1acee

data/History.md

@@ -2,6 +2,9 @@
 
 ### [Unreleased]
 
+### 2.12.5
+- Ensure sniffer class constants definition before calling #client (#515)
+
 ### 2.12.4
 - #506 Rollover index will be in effect in case of template overwrite also. (#513)
 

data/fluent-plugin-elasticsearch.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name          = 'fluent-plugin-elasticsearch'
-  s.version       = '2.12.4'
+  s.version       = '2.12.5'
   s.authors       = ['diogo', 'pitr']
   s.email         = ['pitr.vern@gmail.com', 'me@diogoterror.com']
   s.description   = %q{Elasticsearch output plugin for Fluent event collector}

data/lib/fluent/plugin/out_elasticsearch.rb

@@ -218,6 +218,14 @@ EOC
         log_level = conf['@log_level'] || conf['log_level']
         log.warn "Consider to specify log_level with @log_level." unless log_level
       end
+      # Specify @sniffer_class before calling #client.
+      # #detect_es_major_version uses #client.
+      @sniffer_class = nil
+      begin
+        @sniffer_class = Object.const_get(@sniffer_class_name) if @sniffer_class_name
+      rescue Exception => ex
+        raise Fluent::ConfigError, "Could not load sniffer class #{@sniffer_class_name}: #{ex}"
+      end
 
       @last_seen_major_version =
         if @verify_es_version_at_startup
@@ -256,12 +264,6 @@ EOC
           end
         end
       end
-      @sniffer_class = nil
-      begin
-        @sniffer_class = Object.const_get(@sniffer_class_name) if @sniffer_class_name
-      rescue Exception => ex
-        raise Fluent::ConfigError, "Could not load sniffer class #{@sniffer_class_name}: #{ex}"
-      end
     end
 
     def backend_options

data/test/plugin/test_out_elasticsearch.rb

@@ -23,10 +23,14 @@ class ElasticsearchOutput < Test::Unit::TestCase
     # For request stub to detect compatibility.
     @es_version ||= es_version
     @client_version ||= client_version
+    if @es_version
+      Fluent::Plugin::ElasticsearchOutput.module_eval(<<-CODE)
+        def detect_es_major_version
+          #{@es_version}
+        end
+      CODE
+    end
     Fluent::Plugin::ElasticsearchOutput.module_eval(<<-CODE)
-      def detect_es_major_version
-        #{@es_version}
-      end
       def client_library_version
         #{@client_version}
       end
@@ -59,6 +63,11 @@ class ElasticsearchOutput < Test::Unit::TestCase
     stub_request(:head, url).to_return(:status => 200, :body => "", :headers => {})
   end
 
+  def stub_elastic_info(url="http://localhost:9200/", version="6.4.2")
+    body ="{\"version\":{\"number\":\"#{version}\"}}"
+    stub_request(:get, url).to_return({:status => 200, :body => body, :headers => { 'Content-Type' => 'json' } })
+  end
+
   def stub_elastic(url="http://localhost:9200/_bulk")
     stub_request(:post, url).with do |req|
       @index_cmds = req.body.split("\n").map {|r| JSON.parse(r) }
@@ -191,6 +200,11 @@ class ElasticsearchOutput < Test::Unit::TestCase
     assert_equal(exp_matches, matches.length, "Logs do not contain '#{msg}' '#{logs}'")
   end
 
+  def assert_logs_include_compare_size(exp_matches=1, operator="<=", logs="", msg="")
+    matches = logs.grep /#{msg}/
+    assert_compare(exp_matches, operator, matches.length, "Logs do not contain '#{msg}' '#{logs}'")
+  end
+
   def test_configure
     config = %{
       host     logs.google.com
@@ -2395,19 +2409,24 @@ class ElasticsearchOutput < Test::Unit::TestCase
 
   def test_use_simple_sniffer
     require 'fluent/plugin/elasticsearch_simple_sniffer'
-    driver.configure("sniffer_class_name Fluent::Plugin::ElasticsearchSimpleSniffer
-                      log_level debug
-                      with_transporter_log true
-                      reload_connections true
-                      reload_after 1")
     stub_elastic_ping
+    stub_elastic_info
     stub_elastic
+    config = %[
+      sniffer_class_name Fluent::Plugin::ElasticsearchSimpleSniffer
+      log_level debug
+      with_transporter_log true
+      reload_connections true
+      reload_after 1
+    ]
+    driver(config, nil)
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
     log = driver.logs
-    # 2 - one for the ping, one for the _bulk
-    assert_logs_include(log, /In Fluent::Plugin::ElasticsearchSimpleSniffer hosts/, 2)
+    # 2 or 3 - one for the ping, one for the _bulk, (and client.info)
+    assert_logs_include_compare_size(4, ">", log, /In Fluent::Plugin::ElasticsearchSimpleSniffer hosts/)
+    assert_logs_include_compare_size(2, "<=", log, /In Fluent::Plugin::ElasticsearchSimpleSniffer hosts/)
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 2.12.4
+  version: 2.12.5
 platform: ruby
 authors:
 - diogo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-10 00:00:00.000000000 Z
+date: 2018-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd