fluent-plugin-elasticsearch-timestamp-check 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dddb0ad42d2491532c832ae7d7e1a447c65431cd
-  data.tar.gz: 09b846178a4d199a69cced307fc4b9a489c790f7
+  metadata.gz: 5cd7b06f7edb4ce3f72d1c6dccf21929046ceb51
+  data.tar.gz: 9ef81ffc2b011bd4e8a06fbdf66b38562c59711f
 SHA512:
-  metadata.gz: 1d0d3fcb7ff42f8da5c38e3c2fc264a09de5a42178af961a06ed83c817608e08dfce337b1eea453c6a0ffcc1a87602536e9bdafaf9844ba0ec1d330e1427a3b2
-  data.tar.gz: 92fd025a3111678ea4d6351e0d1707f5eb6a85c585662fdfc32888033bf494640455c7ab9d657014d0c4d92a1c8eececdd155c71c5391e62dc4cc3f4d4548653
+  metadata.gz: a091f77db169760a13a1838c2d6e2a68b50f97274902f4506b467568f3c279f9b5e0763be181a9259ff7a5051a0ffd9ae8db5e06ef08534d85f20ecaa09a5fe8
+  data.tar.gz: 0da8c759f7c0d29b5970ccd0d3c06ac2317e2d411cd159321c178cea88bd8e9c538b80442a7c8cf83a9cf7b903ba9620bf43b28a83126cdf89e0bf0e8f45ea08

data/fluent-plugin-elasticsearch-timestamp-check.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-elasticsearch-timestamp-check"
-  spec.version       = "0.2.5"
+  spec.version       = "0.2.6"
   spec.authors       = ["Richard Li"]
   spec.email         = ["evilcat@wisewolfsolutions.com"]
   spec.description   = %q{fluent filter plugin to ensure @timestamp is in proper format}

data/lib/fluent/plugin/filter_elasticsearch_timestamp_check.rb

@@ -4,9 +4,13 @@ module Fluent::Plugin
   class ElasticsearchTimestampCheckFilter < Filter
     Fluent::Plugin.register_filter('elasticsearch_timestamp_check', self)
 
+    config_param :subsecond_precision, :integer, default: 3
+
     def configure(conf)
       super
       require 'date'
+      raise Fluent::ConfigError, "specify 1 or bigger number." if subsecond_precision < 1
+      @strftime_format = "%Y-%m-%dT%H:%M:%S.%#{@subsecond_precision}N%z".freeze
     end
 
     def start
@@ -32,13 +36,13 @@ module Fluent::Plugin
             record['@timestamp'] = record['fluent_converted_timestamp'] =
               Time.at(
                 num / (10 ** ((Math.log10(num).to_i + 1) - 10))
-              ).strftime('%Y-%m-%dT%H:%M:%S.%L%z')
+              ).strftime(@strftime_format)
             break
           end
 
           # normal timestamp string processing
           record['@timestamp'] = record['fluent_converted_timestamp'] =
-            DateTime.parse(timestamp).strftime('%Y-%m-%dT%H:%M:%S.%L%z')
+            DateTime.parse(timestamp).strftime(@strftime_format)
           $log.debug("Timestamp parsed: #{record['@timestamp']}")
           break
         rescue ArgumentError
@@ -47,7 +51,7 @@ module Fluent::Plugin
 
       unless record['fluent_converted_timestamp']
         record['@timestamp'] = record['fluent_added_timestamp'] =
-          Time.now.strftime('%Y-%m-%dT%H:%M:%S.%L%z')
+          Time.now.strftime(@strftime_format)
         $log.debug("Timestamp added: #{record['@timestamp']}")
       end
 

data/test/plugin/test_filter_elasticsearch_timestamp_check.rb

@@ -9,6 +9,18 @@ class TestElasticsearchTimestampCheckFilter < Test::Unit::TestCase
     Fluent::Test::Driver::Filter.new(Fluent::Plugin::ElasticsearchTimestampCheckFilter).configure(conf)
   end
 
+  def test_configure
+    assert_raise(Fluent::ConfigError) do
+      create_driver(%[subsecond_precision -3])
+    end
+    assert_raise(Fluent::ConfigError) do
+      create_driver(%[subsecond_precision 0])
+    end
+    assert_nothing_raised do
+      create_driver(%[subsecond_precision 1])
+    end
+  end
+
   def test_added_timestamp
     d = create_driver
     d.run(default_tag: 'test') do
@@ -51,7 +63,29 @@ class TestElasticsearchTimestampCheckFilter < Test::Unit::TestCase
     num = timestamp.to_f
     formatted_time = Time.at(
       num / (10 ** ((Math.log10(num).to_i + 1) - 10))
-    ).strftime('%Y-%m-%dT%H:%M:%S.%L%z')
+    ).strftime('%Y-%m-%dT%H:%M:%S.%3N%z')
+    assert_true(filtered.key?("@timestamp"))
+    assert_true(filtered.key?("fluent_converted_timestamp"))
+    assert_equal(formatted_time, filtered["fluent_converted_timestamp"])
+  end
+
+  data('@timestamp'       => '@timestamp',
+       'timestamp'        => 'timestamp',
+       'time'             => 'time',
+       'syslog_timestamp' => 'syslog_timestamp')
+  def test_timestamp_with_digit_and_nano_precision(data)
+    timekey = data
+    precision = 9
+    d = create_driver(%[subsecond_precision #{precision}])
+    timestamp = '1505800348899'
+    d.run(default_tag: 'test') do
+      d.feed({'test' => 'notime'}.merge(timekey => timestamp))
+    end
+    filtered = d.filtered.map{|e| e.last}.first
+    num = timestamp.to_f
+    formatted_time = Time.at(
+      num / (10 ** ((Math.log10(num).to_i + 1) - 10))
+    ).strftime("%Y-%m-%dT%H:%M:%S.%#{precision}N%z")
     assert_true(filtered.key?("@timestamp"))
     assert_true(filtered.key?("fluent_converted_timestamp"))
     assert_equal(formatted_time, filtered["fluent_converted_timestamp"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elasticsearch-timestamp-check
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Richard Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-20 00:00:00.000000000 Z
+date: 2018-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: fluent timestamp checker filter