fluent-plugin-elasticsearch 3.4.3 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 599f144cfd094f25416002686c3f4c11b693c3f5a28c33d18ddd670639d95b6f
-  data.tar.gz: fcfcfaf1c73a5338740934d887273399a7b4396a2246f392ceb779281a7da9d7
+  metadata.gz: e569ad392bb2cd8d948582b76aaae250d4acb47d48ffe1f533a113062b75e100
+  data.tar.gz: a44cc9cdacc8f742c19ee81a3a7792ce7444a7170d6c4f3c71dbd631b5679f37
 SHA512:
-  metadata.gz: 0c7a7176b04bbb770ad1ad9fd7f67a1f4ff8cdc7b4206fca5e1e677518c00ffa2329a1ae5ebeb1dd25e2d5324edd8df5e4c92a90c59a337b7ed2e68827aef4b6
-  data.tar.gz: 69f91ef1ecbd148da6feac924f1d8c86668aa50191a76eccd53d9968e5ae47f6b33039ea1c693784fe89c688f0e4ee772077e9085ac511032b1490bdf3565706
+  metadata.gz: 2d3b8ba9dde0905e89c0f51170eedd84d7d6ff687a26341b2361a8982c7a47517ba01f86a217bc041cb8ba59340281928b8c56a834f8ff3cd4a5069ace176dae
+  data.tar.gz: 85be138322cf8db2843d16cf550490c0a275c37534d93a98e2c8b15016e10bcd5ba823b60f2918fe3116d5980c074b1bfdc8be76d26cb0b78eaa8dc6b4a97ca6

data/History.md

@@ -2,6 +2,9 @@
 
 ### [Unreleased]
 
+### 3.5.0
+- Adopt Elasticsearch ruby client v7 loggable class (#583)
+
 ### 3.4.3
 - Add fail_on_putting_template_retry_exceed config (#579)
 

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       = '3.4.3'
+  s.version       = '3.5.0'
   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/log-ext.rb

@@ -0,0 +1,38 @@
+require 'fluent/log'
+# For elasticsearch-ruby v7.0.0 or later
+# logger for Elasticsearch::Loggable required the following methods:
+#
+# * debug?
+# * info?
+# * warn?
+# * error?
+# * fatal?
+
+module Fluent
+  class Log
+    # Elasticsearch::Loggable does not request trace? method.
+    # def trace?
+    #   @level <= LEVEL_TRACE
+    # end
+
+    def debug?
+      @level <= LEVEL_DEBUG
+    end
+
+    def info?
+      @level <= LEVEL_INFO
+    end
+
+    def warn?
+      @level <= LEVEL_WARN
+    end
+
+    def error?
+      @level <= LEVEL_ERROR
+    end
+
+    def fatal?
+      @level <= LEVEL_FATAL
+    end
+  end
+end

data/lib/fluent/plugin/out_elasticsearch.rb

@@ -13,6 +13,7 @@ require 'fluent/plugin/output'
 require 'fluent/event'
 require 'fluent/error'
 require 'fluent/time'
+require 'fluent/log-ext'
 require_relative 'elasticsearch_constants'
 require_relative 'elasticsearch_error'
 require_relative 'elasticsearch_error_handler'

data/test/test_log-ext.rb

@@ -0,0 +1,35 @@
+require 'helper'
+require 'fluent/log-ext'
+
+class TestFluentLogExtHandler < Test::Unit::TestCase
+  def setup
+    @log_device = Fluent::Test::DummyLogDevice.new
+    dl_opts = {:log_level => ServerEngine::DaemonLogger::INFO}
+    logger = ServerEngine::DaemonLogger.new(@log_device, dl_opts)
+    @log = Fluent::Log.new(logger)
+  end
+
+  def test_trace?
+    assert_false @log.respond_to?(:trace?)
+  end
+
+  def test_debug?
+    assert_true @log.respond_to?(:debug?)
+  end
+
+  def test_info?
+    assert_true @log.respond_to?(:info?)
+  end
+
+  def test_warn?
+    assert_true @log.respond_to?(:warn?)
+  end
+
+  def test_error?
+    assert_true @log.respond_to?(:error?)
+  end
+
+  def test_fatal?
+    assert_true @log.respond_to?(:fatal?)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 3.4.3
+  version: 3.5.0
 platform: ruby
 authors:
 - diogo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-20 00:00:00.000000000 Z
+date: 2019-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -144,6 +144,7 @@ files:
 - Rakefile
 - appveyor.yml
 - fluent-plugin-elasticsearch.gemspec
+- lib/fluent/log-ext.rb
 - lib/fluent/plugin/elasticsearch_constants.rb
 - lib/fluent/plugin/elasticsearch_error.rb
 - lib/fluent/plugin/elasticsearch_error_handler.rb
@@ -160,6 +161,7 @@ files:
 - test/plugin/test_out_elasticsearch.rb
 - test/plugin/test_out_elasticsearch_dynamic.rb
 - test/plugin/test_template.json
+- test/test_log-ext.rb
 homepage: https://github.com/uken/fluent-plugin-elasticsearch
 licenses:
 - Apache-2.0
@@ -191,3 +193,4 @@ test_files:
 - test/plugin/test_out_elasticsearch.rb
 - test/plugin/test_out_elasticsearch_dynamic.rb
 - test/plugin/test_template.json
+- test/test_log-ext.rb