fluent-plugin-elasticsearch 1.13.2 → 1.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a09291d3314b725675ab4d940a2b71766d7576b2b145281545c4dfa5b6d6ec78
-  data.tar.gz: 4b44b618882f9ec85887b0c3f274d46c1ec7560e11567a69e6e0e7afb586be37
+  metadata.gz: 5f0bb600b3e421042e95cae076b456cf28b83acd7260ed91aea30174e42da279
+  data.tar.gz: 29df2a1ade54adb459694ddccb5c9c04cee62e447a35580a08b45acc22b35244
 SHA512:
-  metadata.gz: 1198c5c8ad6232bdc4b1869d70d49016e3f9623c01a5c88e0bd6ed90ccfcb49731fffd430cf06b641eec011d7a0c671fb8cfabf7eef0cc5b9df736fafbbef294
-  data.tar.gz: a8f171967cde67dfd93409f31ed4cbeefa1d506da7020917daa03a78f349d5aad99114404f958290f0de530e0f51fab548d01e22a135a2f65796701a5b30f422
+  metadata.gz: e6007507bc7a5417c4e319e6d6875c29b4f95d84ac6e56bc60c2a35add576df2bb3bbedf5930104a1fbf599cd93c88471693cbaac222ca847c1c0db6e04d90bb
+  data.tar.gz: b24a9ea5f7078d1268f234893fe50b5aafe0c98b65493c4ee1d1c4f7ceffc62c9aeb26a0d9fb5f6f16277766518c0f3879c22a084ad7eb3a1fb13dfe2b0c2245

data/History.md

@@ -4,8 +4,11 @@
 - Log ES response errors (#230)
 - Use latest elasticsearch-ruby (#240)
 
+### 1.13.3
+- backport removing outdated generating hash id support module (#374)
+
 ### 1.13.2
-- backport preventing error when using template in elasticsearch_dynamic for elementally use case (#363)
+- backport preventing error when using template in elasticsearch_dynamic for elementally use case (#364)
 
 ### 1.13.1
 - backport adding config parameter to enable elasticsearch-ruby's transporter logging (#343)

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       = '1.13.2'
+  s.version       = '1.13.3'
   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

@@ -13,7 +13,6 @@ require 'fluent/output'
 require_relative 'elasticsearch_constants'
 require_relative 'elasticsearch_error_handler'
 require_relative 'elasticsearch_index_template'
-require_relative 'generate_hash_id_support'
 
 class Fluent::ElasticsearchOutput < Fluent::ObjectBufferedOutput
   class ConnectionFailure < StandardError; end
@@ -72,7 +71,6 @@ class Fluent::ElasticsearchOutput < Fluent::ObjectBufferedOutput
   config_param :with_transporter_log, :bool, :default => false
 
   include Fluent::ElasticsearchIndexTemplate
-  include Fluent::GenerateHashIdSupport
   include Fluent::ElasticsearchConstants
 
   def initialize

data/lib/fluent/plugin/out_elasticsearch_dynamic.rb

@@ -10,8 +10,6 @@ class Fluent::ElasticsearchOutputDynamic < Fluent::ElasticsearchOutput
   DYNAMIC_PARAM_NAMES = %W[hosts host port include_timestamp logstash_format logstash_prefix logstash_dateformat time_key utc_index index_name tag_key type_name id_key parent_key routing_key write_operation]
   DYNAMIC_PARAM_SYMBOLS = DYNAMIC_PARAM_NAMES.map { |n| "@#{n}".to_sym }
 
-  include Fluent::GenerateHashIdSupport
-
   attr_reader :dynamic_config
 
   def configure(conf)

data/test/plugin/test_out_elasticsearch.rb

@@ -205,21 +205,6 @@ class ElasticsearchOutput < Test::Unit::TestCase
     assert_false instance.with_transporter_log
   end
 
-  def test_configure_with_invaild_generate_id_config
-    assert_raise_message(/Use bundled filter-elasticsearch-genid instead./) do
-      driver.configure(Fluent::Config::Element.new(
-                         'ROOT', '', {
-                           '@type' => 'elasticsearch',
-                           'id_key' =>'id_mismatch',
-                         }, [
-                           Fluent::Config::Element.new('hash', '', {
-                                                         'hash_id_key' => '_hash',
-                                                       }, [])
-                         ]
-                       ))
-    end
-  end
-
   def test_template_already_present
     config = %{
       host            logs.google.com
@@ -627,27 +612,6 @@ class ElasticsearchOutput < Test::Unit::TestCase
     assert_equal('myindex', index_cmds.first['index']['_index'])
   end
 
-  class AdditionalHashIdMechanismTest < self
-    data("default"            => {"hash_id_key" => '_id'},
-         "custom hash_id_key" => {"hash_id_key" => '_hash_id'},
-        )
-    def test_writes_with_genrate_hash(data)
-      assert_raise_message(/Use bundled filter-elasticsearch-genid instead./) do
-        driver.configure(Fluent::Config::Element.new(
-                           'ROOT', '', {
-                             '@type' => 'elasticsearch',
-                             'id_key' => data["hash_id_key"],
-                           }, [
-                             Fluent::Config::Element.new('hash', '', {
-                                                           'keys' => ['request_id'],
-                                                           'hash_id_key' => data["hash_id_key"],
-                                                         }, [])
-                           ]
-                         ))
-      end
-    end
-  end
-
   def test_writes_to_speficied_index_uppercase
     driver.configure("index_name MyIndex\n")
     stub_elastic_ping

data/test/plugin/test_out_elasticsearch_dynamic.rb

@@ -309,27 +309,6 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
     assert_equal(2000, total)
   end
 
-  class AdditionalHashIdMechanismTest < self
-    data("default"            => {"hash_id_key" => '_id'},
-         "custom hash_id_key" => {"hash_id_key" => '_hash_id'},
-        )
-    def test_writes_with_genrate_hash(data)
-      assert_raise_message(/Use bundled filter-elasticsearch-genid instead./) do
-        driver.configure(Fluent::Config::Element.new(
-                           'ROOT', '', {
-                             '@type' => 'elasticsearch',
-                             'id_key' => data["hash_id_key"],
-                           }, [
-                             Fluent::Config::Element.new('hash', '', {
-                                                           'keys' => ['request_id'],
-                                                           'hash_id_key' => data["hash_id_key"],
-                                                         }, [])
-                           ]
-                         ))
-      end
-    end
-  end
-
   def test_makes_bulk_request
     stub_elastic_ping
     stub_elastic

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 1.13.2
+  version: 1.13.3
 platform: ruby
 authors:
 - diogo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-20 00:00:00.000000000 Z
+date: 2018-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -148,7 +148,6 @@ files:
 - lib/fluent/plugin/elasticsearch_error_handler.rb
 - lib/fluent/plugin/elasticsearch_index_template.rb
 - lib/fluent/plugin/filter_elasticsearch_genid.rb
-- lib/fluent/plugin/generate_hash_id_support.rb
 - lib/fluent/plugin/out_elasticsearch.rb
 - lib/fluent/plugin/out_elasticsearch_dynamic.rb
 - test/helper.rb

data/lib/fluent/plugin/generate_hash_id_support.rb

@@ -1,23 +0,0 @@
-require 'securerandom'
-require 'base64'
-
-module Fluent
-  module GenerateHashIdSupport
-    def self.included(klass)
-      klass.instance_eval {
-        config_section :hash, param_name: :hash_config, required: false, multi: false do
-          config_param :hash_id_key, :string, default: '_hash',
-                       obsoleted: "Use bundled filter-elasticsearch-genid instead."
-
-        end
-      }
-    end
-
-    def generate_hash_id_key(record)
-      s = ""
-      s += Base64.strict_encode64(SecureRandom.uuid)
-      record[@hash_config.hash_id_key] = s
-      record
-    end
-  end
-end