fluent-plugin-elasticsearch 2.8.3 → 2.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c41a1b3ed19d37587d26b58af1f486d8f9ff5defaa56083e4ec1107e1b5022b8
-  data.tar.gz: 8e240e97ec2544b86c892c139c6dd713fb0cbcf044a600f03290d03976227de8
+  metadata.gz: 99d4765746584010b4516e0578981297209f154490d556a3dc4d03a085cd1322
+  data.tar.gz: e2562b75d8728b878ae9d8daadb179a4b362301ac5d124732e6b2e4751ecc0db
 SHA512:
-  metadata.gz: d56c9d45f769cb9c2c0bbaf16541b93813a86ae00708c937c37f75b8719cdda771c8c10181eb87e6e1b227fc90e469f48d5ab9e8048002ffd224b596bd19e012
-  data.tar.gz: b7da3ba38759a9ee69832753bb4a4c2e96c602673b547ad04e64309a6afbe3fb0708a21b7cc26f7f3663481bfdc91ff1bad31342251e6e9c7fdae0a2a868b356
+  metadata.gz: bfa2dc9c4f11a42e6b77c6504377cd115a3676715d06ec99481420edb8f0cf20a88764c840363c577f5169b635918b91029c648d2303a3af5e285b6f4f0ce701
+  data.tar.gz: 84c989522629c9942de5982d55473b42c5875c928ed7c217110bcd1ce6b81c6c1a1a7f9b1e1430cd90cb6119a3976c235571047f25f2cbab9763a035b5d44277

data/History.md

@@ -4,6 +4,9 @@
 - Log ES response errors (#230)
 - Use latest elasticsearch-ruby (#240)
 
+### 2.8.4
+- Use nanosecond precision in elasticsearch_dynamic (#387)
+
 ### 2.8.3
 - Specify SSL/TLS version in out_elasticsearch_dynamic (#385)
 

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.8.3'
+  s.version       = '2.8.4'
   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_dynamic.rb

@@ -160,7 +160,7 @@ module Fluent::Plugin
             time = Time.parse record[dynamic_conf['time_key']]
             record['@timestamp'] = record[dynamic_conf['time_key']] unless time_key_exclude_timestamp
           else
-            record.merge!({"@timestamp" => Time.at(time).to_datetime.to_s})
+            record.merge!({"@timestamp" => Time.at(time).iso8601(@time_precision)})
           end
         end
 

data/test/plugin/test_out_elasticsearch.rb

@@ -647,8 +647,13 @@ class ElasticsearchOutput < Test::Unit::TestCase
   def test_content_type_header
     stub_request(:head, "http://localhost:9200/").
       to_return(:status => 200, :body => "", :headers => {})
-    elastic_request = stub_request(:post, "http://localhost:9200/_bulk").
-      with(headers: { "Content-Type" => "application/json" })
+    if Elasticsearch::VERSION >= "6.0.2"
+      elastic_request = stub_request(:post, "http://localhost:9200/_bulk").
+                          with(headers: { "Content-Type" => "application/x-ndjson" })
+    else
+      elastic_request = stub_request(:post, "http://localhost:9200/_bulk").
+                          with(headers: { "Content-Type" => "application/json" })
+    end
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
@@ -1390,13 +1395,9 @@ class ElasticsearchOutput < Test::Unit::TestCase
     driver.configure("logstash_format true\n")
     stub_elastic_ping
     stub_elastic
-    begin
-      time = Fluent::EventTime.new(Time.now.to_i, 000000000)
-    rescue
-      time = Fluent::Engine.now
-    end
+    time = Fluent::EventTime.new(Time.now.to_i, 123456789)
     driver.run(default_tag: 'test') do
-      driver.feed(time.to_i, sample_record)
+      driver.feed(time, sample_record)
     end
     assert(index_cmds[1].has_key? '@timestamp')
     assert_equal(index_cmds[1]['@timestamp'], Time.at(time).iso8601(9))
@@ -1407,13 +1408,9 @@ class ElasticsearchOutput < Test::Unit::TestCase
                       time_precision 3\n")
     stub_elastic_ping
     stub_elastic
-    begin
-    time = Fluent::EventTime.new(Time.now.to_i, 000000000)
-    rescue
-      time = Fluent::Engine.now
-    end
+    time = Fluent::EventTime.new(Time.now.to_i, 123456789)
     driver.run(default_tag: 'test') do
-      driver.feed(time.to_i, sample_record)
+      driver.feed(time, sample_record)
     end
     assert(index_cmds[1].has_key? '@timestamp')
     assert_equal(index_cmds[1]['@timestamp'], Time.at(time).iso8601(3))

data/test/plugin/test_out_elasticsearch_dynamic.rb

@@ -256,8 +256,13 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
   def test_content_type_header
     stub_request(:head, "http://localhost:9200/").
       to_return(:status => 200, :body => "", :headers => {})
-    elastic_request = stub_request(:post, "http://localhost:9200/_bulk").
-      with(headers: { "Content-Type" => "application/json" })
+    if Elasticsearch::VERSION >= "6.0.2"
+      elastic_request = stub_request(:post, "http://localhost:9200/_bulk").
+                          with(headers: { "Content-Type" => "application/x-ndjson" })
+    else
+      elastic_request = stub_request(:post, "http://localhost:9200/_bulk").
+                          with(headers: { "Content-Type" => "application/json" })
+    end
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
@@ -474,13 +479,25 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
     driver.configure("logstash_format true\n")
     stub_elastic_ping
     stub_elastic
-    ts = DateTime.now
-    time = Fluent::EventTime.from_time(ts.to_time)
+    time = Fluent::EventTime.new(Time.now.to_i, 123456789)
     driver.run(default_tag: 'test') do
       driver.feed(time, sample_record)
     end
     assert(index_cmds[1].has_key? '@timestamp')
-    assert_equal(index_cmds[1]['@timestamp'], ts.iso8601)
+    assert_equal(index_cmds[1]['@timestamp'], Time.at(time).iso8601(9))
+  end
+
+  def test_uses_subsecond_precision_when_configured
+    driver.configure("logstash_format true
+                      time_precision 3\n")
+    stub_elastic_ping
+    stub_elastic
+    time = Fluent::EventTime.new(Time.now.to_i, 123456789)
+    driver.run(default_tag: 'test') do
+      driver.feed(time, sample_record)
+    end
+    assert(index_cmds[1].has_key? '@timestamp')
+    assert_equal(index_cmds[1]['@timestamp'], Time.at(time).iso8601(3))
   end
 
   def test_uses_custom_timestamp_when_included_in_record
@@ -847,7 +864,7 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
     stub_request(:post, "http://localhost:9200/_bulk").with do |req|
       raise ZeroDivisionError, "any not host_unreachable_exceptions exception"
     end
-    
+
     driver.configure("reconnect_on_error true\n")
 
     assert_raise(ZeroDivisionError) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 2.8.3
+  version: 2.8.4
 platform: ruby
 authors:
 - diogo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-22 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd