fluent-plugin-elasticsearch 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af3f58b827423bdfc292675d045d0e88f3bcc051
-  data.tar.gz: 63d6cdcdf4f23cac1c7e932e633df607cc3ac7fd
+  metadata.gz: c29f67bc984aa2da3c26d64f4eb8b39a696ec45a
+  data.tar.gz: 5c3b38d9a83cce6c3b6dd0c6cfec3cb258b93801
 SHA512:
-  metadata.gz: 38fdabbdd290f4d03f5cc26eae8643c8a7e6a922ebf6d294fc46b3b4a085b77155776c6c48c44d9fa4ca03ffbad4e91c0f3587d34999610fa0214d5635d61c1b
-  data.tar.gz: de3e9167b99936945d290da18400074b9def208d59b6ae01b2a506e644d972d4e5551717f32a77fb969074c6a09c153490ceb940ae88fece749266192d08a45c
+  metadata.gz: ab8603053553d60e49b37eefea82d5dab6d6ef051225e4765907de6139d749231b2d7dec145c06d1d72396deadb0c02cccb441f73061e98c20fbe8799a1ee69d
+  data.tar.gz: 3c59c0982680b9cb23a50abd6e5d89d5251809047c39ff54371285b93400446a082048ed285c8e56738dca76245b1ef46f50ab395cf07f26dca1e74d6097aeed

data/History.md

@@ -4,6 +4,9 @@
 - Log ES response errors (#230)
 - Use latest elasticsearch-ruby (#240)
 
+### 2.4.0
+- Add built-in placeholders support against type_name parameter (#338)
+
 ### 2.3.0
 - Allow overwriting existing index template (#239)
 

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.3.0'
+  s.version       = '2.4.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/plugin/out_elasticsearch.rb

@@ -320,7 +320,8 @@ module Fluent::Plugin
     def expand_placeholders(metadata)
       logstash_prefix = extract_placeholders(@logstash_prefix, metadata)
       index_name = extract_placeholders(@index_name, metadata)
-      return logstash_prefix, index_name
+      type_name = extract_placeholders(@type_name, metadata)
+      return logstash_prefix, index_name, type_name
     end
 
     def multi_workers_ready?
@@ -333,7 +334,7 @@ module Fluent::Plugin
       meta = {}
 
       tag = chunk.metadata.tag
-      logstash_prefix, index_name = expand_placeholders(chunk.metadata)
+      logstash_prefix, index_name, type_name = expand_placeholders(chunk.metadata)
       @error = Fluent::Plugin::ElasticsearchErrorHandler.new(self)
 
       chunk.msgpack_each do |time, record|
@@ -384,7 +385,7 @@ module Fluent::Plugin
         if target_type_parent && target_type_parent[target_type_child_key]
           target_type = target_type_parent.delete(target_type_child_key)
         else
-          target_type = @type_name
+          target_type = type_name
         end
 
         meta.clear

data/test/plugin/test_out_elasticsearch.rb

@@ -821,6 +821,16 @@ class ElasticsearchOutput < Test::Unit::TestCase
     assert_equal('mytype', index_cmds.first['index']['_type'])
   end
 
+  def test_writes_to_speficied_type_with_placeholders
+    driver.configure("type_name mytype.${tag}\n")
+    stub_elastic_ping
+    stub_elastic
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record)
+    end
+    assert_equal('mytype.test', index_cmds.first['index']['_type'])
+  end
+
   def test_writes_to_target_type_key
     driver.configure("target_type_key @target_type\n")
     stub_elastic_ping

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - diogo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-27 00:00:00.000000000 Z
+date: 2017-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd