fluent-plugin-elasticsearch 2.0.0.rc.1 → 2.0.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c847d28fe74087b06966351eb6fd5f9e88695e2
-  data.tar.gz: 989fcbfff8006eb3275522d2ed7c7e2cd92ef5e2
+  metadata.gz: 9c2133b6bd8b8961cb98cf10e6de22c9b86d6b17
+  data.tar.gz: 797ad2184b49f1a3fa508df533dd82d300a10af8
 SHA512:
-  metadata.gz: 0a2e7f76258f14ca000658b453958ef118f33456fd3bff1fd15391a4710052e48672f8fdb67c271d28156aebd2e93b01f0388466c569d224f5e8f65d8e4c98e8
-  data.tar.gz: fe7283edc63facf368b6344f4686ce3d0e8957297d09b0d6c22cc701156586ac3254dfed45dbea5007dd0a6792f0b84059e0a7e37705ff948fe171b838bb3365
+  metadata.gz: cc690dfb2d06e658c3cd14f9efac8f37c07f97de7420624ac3e358c79c4dda5a492dbd0bd055edd8bb4ed10a4ff2f7defedf81811e8cdeb9d47502e110f10ffb
+  data.tar.gz: 04a4eb3bed694306c50b1b8c7b257ab83142d5049de10e4c7fe931371bf6b3024be7ef6a7580c47fcb009420430456792180e3deb4a3c5ffc2773916de0a0c9e

data/History.md

@@ -4,6 +4,9 @@
 - Log ES response errors (#230)
 - Use latest elasticsearch-ruby (#240)
 
+### 2.0.0.rc.2
+- add pipeline parameter (#290)
+
 ### 2.0.0.rc.1
 - Use v0.14 API to support nanosecond precision (#223)
 

data/README.md

@@ -22,6 +22,7 @@ Current maintainers: @cosmo0920
   + [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)
@@ -56,6 +57,16 @@ Current maintainers: @cosmo0920
 * [Contributing](#contributing)
 * [Running tests](#running-tests)
 
+## Requirements
+
+| fluent-plugin-elasticsearch  | fluentd | ruby |
+|-------------------|---------|------|
+| >= 2.0.0 | >= v0.14.0 | >= 2.1 |
+|  < 2.0.0 | >= v0.12.0 | >= 1.9 |
+
+NOTE: fluent-plugin-elasticsearch v2.0.0 is now RC. We will release stable v2.0.0 soon.
+NOTE: For v0.12 version, you should use 1.x.y version. Please send patch into v0.12 branch if you encountered 1.x version's bug.
+
 ## Installation
 
 ```sh
@@ -131,6 +142,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       = '2.0.0.rc.1'
+  s.version       = '2.0.0.rc.2'
   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

@@ -66,6 +66,8 @@ module Fluent::Plugin
     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
+
 
     config_section :buffer do
       config_set_default :@type, DEFAULT_BUFFER_TYPE
@@ -343,6 +345,10 @@ module Fluent::Plugin
         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

@@ -439,6 +439,17 @@ 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.run(default_tag: 'test') do
+      driver.feed(sample_record)
+    end
+    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
@@ -793,6 +804,21 @@ 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.run(default_tag: 'test') do
+      driver.feed(sample_record.merge!('vtm' => ts))
+    end
+    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: 2.0.0.rc.1
+  version: 2.0.0.rc.2
 platform: ruby
 authors:
 - diogo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-08 00:00:00.000000000 Z
+date: 2017-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd