fluent-plugin-elasticsearch 1.9.5 → 1.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8af381642b4168628152b2baf959f30d85ecb3aa
-  data.tar.gz: 64f4f74cf949f999db949489a59ea264d524b41e
+  metadata.gz: d696775b6819b452db82ff73075b683f582be7b8
+  data.tar.gz: 36f83a83adeb5faad0c3844749995b4893464304
 SHA512:
-  metadata.gz: 3b1da6085fb920f79bf1fd1951da9aa00fea43ad78cf1dc48febb51973cc075e6d6339b050254cd5f8eb5e08c5ec77db2ced1140abd0c3e918aeced9f560a7fb
-  data.tar.gz: e8701fbad7986ddb9be19659a6d27d79b180b5ec25ca95384bd888af0edef5e3b9ea112ad82fd905f7dab6da2992006dda3234caf3875bacea6f5eab3ef81bee
+  metadata.gz: 33961582ffb9cda14ef7d0e9d594c9a500b3dd421c816211b6e9522f66d8eda969c7f3f9c7f89e335022d91d452e3d9a975ca5fdb9e4a964c6c59d6e8021d77d
+  data.tar.gz: 2b13ac54761a25e4c9b74d479238afa2e1a8ecb6241224cd74bc0ebdbeef8c10b7150448a5aa8b4c5f85fdb06df719061960f1b7d2d31bae17d54562334e9122

data/History.md

@@ -4,6 +4,9 @@
 - Log ES response errors (#230)
 - Use latest elasticsearch-ruby (#240)
 
+### 1.9.6
+- add pipeline parameter (#266)
+
 ### 1.9.5
 - sub-second time precision [(#249)](https://github.com/uken/fluent-plugin-elasticsearch/pull/249)
 

data/README.md

@@ -20,6 +20,7 @@ Note: For Amazon Elasticsearch Service please consider using [fluent-plugin-aws-
   + [logstash_format](#logstash_format)
   + [logstash_prefix](#logstash_prefix)
   + [logstash_dateformat](#logstash_dateformat)
+  + [pipeline](#pipeline)
   + [time_key_format](#time_key_format)
   + [time_precision](#time_precision)
   + [time_key](#time_key)
@@ -129,6 +130,16 @@ The strftime format to generate index target index name when `logstash_format` i
 logstash_dateformat %Y.%m. # defaults to "%Y.%m.%d"
 ```
 
+### pipeline
+
+Only in ES >= 5.x is available to use this parameter.
+This param is to set a pipeline id of your elasticsearch to be added into the request, you can configure ingest node.
+For more information: [![Ingest node](https://www.elastic.co/guide/en/elasticsearch/reference/master/ingest.html)]
+
+```
+pipeline pipeline_id
+```
+
 ### time_key_format
 
 The format of the time stamp field (`@timestamp` or what you specify with [time_key](#time_key)). This parameter only has an effect when [logstash_format](#logstash_format) is true as it only affects the name of the index we write to. Please see [Time#strftime](http://ruby-doc.org/core-1.9.3/Time.html#method-i-strftime) for information about the value of this format.

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.9.5'
+  s.version       = '1.9.6'
   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

@@ -61,6 +61,7 @@ class Fluent::ElasticsearchOutput < Fluent::ObjectBufferedOutput
   config_param :tag_key, :string, :default => 'tag'
   config_param :time_parse_error_tag, :string, :default => 'Fluent::ElasticsearchOutput::TimeParser.error'
   config_param :reconnect_on_error, :bool, :default => false
+  config_param :pipeline, :string, :default => nil
 
   include Fluent::ElasticsearchIndexTemplate
 
@@ -327,6 +328,10 @@ class Fluent::ElasticsearchOutput < Fluent::ObjectBufferedOutput
       meta["_index".freeze] = target_index
       meta["_type".freeze] = target_type
 
+      if @pipeline
+        meta["pipeline".freeze] = @pipeline
+      end
+
       @meta_config_map.each do |record_key, meta_key|
         meta[meta_key] = record[record_key] if record[record_key]
       end

data/test/plugin/test_out_elasticsearch.rb

@@ -407,6 +407,16 @@ class ElasticsearchOutput < Test::Unit::TestCase
     assert_equal('local-override', index_cmds.first['index']['_index'])
   end
 
+  def test_writes_to_default_index_with_pipeline
+    pipeline = "fluentd"
+    driver.configure("pipeline #{pipeline}")
+    stub_elastic_ping
+    stub_elastic
+    driver.emit(sample_record)
+    driver.run
+    assert_equal(pipeline, index_cmds.first['index']['pipeline'])
+  end
+
   def test_writes_to_target_index_key_fallack
     driver.configure("target_index_key @target_index\n")
     stub_elastic_ping
@@ -716,6 +726,20 @@ class ElasticsearchOutput < Test::Unit::TestCase
     assert_equal(index_cmds[1]['@timestamp'], ts)
   end
 
+  def test_uses_custom_time_key_with_format
+    driver.configure("logstash_format true
+                      time_key_format %Y-%m-%d %H:%M:%S.%N%z
+                      time_key vtm\n")
+    stub_elastic_ping
+    stub_elastic
+    ts = "2001-02-03 13:14:01.673+02:00"
+    driver.emit(sample_record.merge!('vtm' => ts))
+    driver.run
+    assert(index_cmds[1].has_key? '@timestamp')
+    assert_equal(index_cmds[1]['@timestamp'], ts)
+    assert_equal("logstash-2001.02.03", index_cmds[0]['index']['_index'])
+  end
+  
   def test_uses_custom_time_key_exclude_timekey
     driver.configure("logstash_format true
                       time_key vtm

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 1.9.5
+  version: 1.9.6
 platform: ruby
 authors:
 - diogo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-11 00:00:00.000000000 Z
+date: 2017-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: ElasticSearch output plugin for Fluent event collector