fluent-plugin-elasticsearch 4.3.2 → 4.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69be22981ce5e59de9e573f933c29b51cbf8204ba849fb6ad3729482f94361c0
-  data.tar.gz: f20f079c0dfce9a2c763f89572f4b64e22b790e7b90a5eb542b5c129f6160bad
+  metadata.gz: ed7efe8849b8a7ca1d2cc3c81444e604c0bda824209f9297f0114f01c1ba609a
+  data.tar.gz: f74f8726fa993c3e4bc01b742e97ef4579fb7335809aac2dabce03c2b002e9ad
 SHA512:
-  metadata.gz: 966e0aee9947dcfebe785713118dc014df4216ed34565e5a1672547a47eabef2cb93f15442165ca2249d633b272d41602a52d172675a1d8df50c83516c602ff8
-  data.tar.gz: 714f4b5048b78fad7d30fea2a5a0bce2d824fa2c6585ec480c3dd8bece71c9378a0faa0514906094a3a217662e12bc3d4e86ce9853b6e6977b077954b76fa489
+  metadata.gz: 6adeee82a86f8217f9e6d259990042330d8a96a3a3ddb03a332a90f4ce90996c99aff7385b05c625eee4c6253b9647ba2bfc7856f51ba306ef7df6917d716fb4
+  data.tar.gz: dec1a1a72c88c2fd4df38e1b57ca883d47c5f28582fb5ba9a9210c882986c5e52a44f4eda03bef708961b461555b1538968b905b346e6782ad1090ca4310747d

data/History.md

@@ -2,6 +2,9 @@
 
 ### [Unreleased]
 
+### 4.3.3
+- Handle invalid Elasticsearch::Client#info response (#855)
+
 ### 4.3.2
 - Use log.debug to dump ES 8.x _type information (#852)
 

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       = '4.3.2'
+  s.version       = '4.3.3'
   s.authors       = ['diogo', 'pitr', 'Hiroshi Hatake']
   s.email         = ['pitr.vern@gmail.com', 'me@diogoterror.com', 'cosmo0920.wp@gmail.com']
   s.description   = %q{Elasticsearch output plugin for Fluent event collector}

data/lib/fluent/plugin/out_elasticsearch.rb

@@ -493,7 +493,12 @@ EOC
 
     def detect_es_major_version
       @_es_info ||= client.info
-      unless version = @_es_info.dig("version", "number")
+      begin
+        unless version = @_es_info.dig("version", "number")
+          version = @default_elasticsearch_version
+        end
+      rescue NoMethodError => e
+        log.warn "#{@_es_info} can not dig version information. Assuming Elasticsearch #{@default_elasticsearch_version}", error: e
         version = @default_elasticsearch_version
       end
       version.to_i

data/test/plugin/test_out_elasticsearch.rb

@@ -370,6 +370,65 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
     }
   end
 
+  sub_test_case 'Check client.info response' do
+    def create_driver(conf='', es_version=5, client_version="\"5.0\"")
+      # For request stub to detect compatibility.
+      @client_version ||= client_version
+      @default_elasticsearch_version ||= es_version
+      Fluent::Plugin::ElasticsearchOutput.module_eval(<<-CODE)
+        def detect_es_major_version
+          @_es_info ||= client.info
+          begin
+            unless version = @_es_info.dig("version", "number")
+              version = @default_elasticsearch_version
+            end
+          rescue NoMethodError => e
+            log.warn "#{@_es_info} can not dig version information. Assuming Elasticsearch #{@default_elasticsearch_version}", error: e
+            version = @default_elasticsearch_version
+          end
+          version.to_i
+        end
+      CODE
+
+      Fluent::Plugin::ElasticsearchOutput.module_eval(<<-CODE)
+        def client_library_version
+          #{@client_version}
+        end
+      CODE
+      @driver ||= Fluent::Test::Driver::Output.new(Fluent::Plugin::ElasticsearchOutput) {
+        # v0.12's test driver assume format definition. This simulates ObjectBufferedOutput format
+        if !defined?(Fluent::Plugin::Output)
+          def format(tag, time, record)
+            [time, record].to_msgpack
+          end
+        end
+      }.configure(conf)
+    end
+
+    def stub_elastic_info_bad(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' => 'text/plain' } })
+    end
+
+    test 'handle invalid client.info' do
+      stub_elastic_info_bad("https://logs.fluentd.com:24225/es//", "7.7.1")
+      config = %{
+        host     logs.fluentd.com
+        port     24225
+        scheme   https
+        path     /es/
+        user     john
+        password doe
+        default_elasticsearch_version 7
+        scheme https
+        @log_level info
+      }
+      d = create_driver(config, 7, "\"7.10.1\"")
+      logs = d.logs
+      assert_logs_include(logs, /can not dig version information. Assuming Elasticsearch 7/)
+    end
+  end
+
   sub_test_case 'Check TLS handshake stuck warning log' do
     test 'warning TLS log' do
       config = %{

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 4.3.2
+  version: 4.3.3
 platform: ruby
 authors:
 - diogo
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-07 00:00:00.000000000 Z
+date: 2020-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd