fluent-plugin-elasticsearch 3.2.3 → 3.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 386df98b3bdb0768fed0a39523212eb7a130a3649a3c62d816c47244ada798b4
-  data.tar.gz: a5b77aead07505926c2d000b3ea06a718024c9948a03b6a0306ed219d72bfc4d
+  metadata.gz: 87e8dce0d946717ddad6f80e9c43682ea3e66d470ce7593f3ddc894c2f2efa59
+  data.tar.gz: 2721ab242a253c8d14e50b37a6484d5d51b240b2561ff872e43a1c5a6b943eec
 SHA512:
-  metadata.gz: 87f31633a7d45390731927b6d4d51af0ab974d11678b338135cba97b2c8cd0363c561858dcc24c9d7885cb380ffc9869827504d8884e650b5d611fe8e27b9906
-  data.tar.gz: a58a987a97ec793d21d06a06e2a988e5d401a74dbbe8677c020fbc5f22a9137cc4dea44501e936c660caee44ea1732a6fabe9bbcbea20b1269d0259314eebc04
+  metadata.gz: bc68a120c99d8951c74bbe91e283a6229539c5b8a5d5afb41ccc4aea76ed528459b6debee8843e62547628bba57d243e87ac7a6aea0389ea617610c5ed1ad374
+  data.tar.gz: c2a7f70b7cc0ee50f0344775662969fddff4812cc01652e894739eb72fe5ee0fcf1483a53bbabc7067f509df3084988dbbe9cad5166891394e722b90ff5af6d1

data/History.md

@@ -1,6 +1,8 @@
 ## Changelog [[tags]](https://github.com/uken/fluent-plugin-elasticsearch/tags)
 
 ### [Unreleased]
+### 3.2.4
+- Pass chunk for built in placeholders (#553)
 
 ### 3.2.3
 - Expose exception backtrace for typhoeus gem loading error (#550)

data/ISSUE_TEMPLATE.md

@@ -24,3 +24,4 @@ Provide example config and message
   * paste boot log of fluentd or td-agent
   * paste result of ``fluent-gem list``, ``td-agent-gem list`` or your Gemfile.lock
 * ES version (optional)
+* ES template(s) (optional)

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.2.3'
+  s.version       = '3.2.4'
   s.authors       = ['diogo', 'pitr']
   s.email         = ['pitr.vern@gmail.com', 'me@diogoterror.com']
   s.description   = %q{Elasticsearch output plugin for Fluent event collector}
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = Gem::Requirement.new(">= 2.0".freeze)
 
-  s.add_runtime_dependency 'fluentd', '>= 0.14.20'
+  s.add_runtime_dependency 'fluentd', '>= 0.14.22'
   s.add_runtime_dependency 'excon', '>= 0'
   s.add_runtime_dependency 'elasticsearch'
 

data/lib/fluent/plugin/out_elasticsearch.rb

@@ -500,10 +500,10 @@ EOC
       ret
     end
 
-    def expand_placeholders(metadata)
-      logstash_prefix = extract_placeholders(@logstash_prefix, metadata)
-      index_name = extract_placeholders(@index_name, metadata)
-      type_name = extract_placeholders(@type_name, metadata)
+    def expand_placeholders(chunk)
+      logstash_prefix = extract_placeholders(@logstash_prefix, chunk)
+      index_name = extract_placeholders(@index_name, chunk)
+      type_name = extract_placeholders(@type_name, chunk)
       return logstash_prefix, index_name, type_name
     end
 
@@ -518,7 +518,7 @@ EOC
       meta = {}
 
       tag = chunk.metadata.tag
-      extracted_values = expand_placeholders(chunk.metadata)
+      extracted_values = expand_placeholders(chunk)
 
       chunk.msgpack_each do |time, record|
         next unless record.is_a? Hash

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 3.2.3
+  version: 3.2.4
 platform: ruby
 authors:
 - diogo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-19 00:00:00.000000000 Z
+date: 2019-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.20
+        version: 0.14.22
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.20
+        version: 0.14.22
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement