fluent-plugin-elasticsearch-timestamp-check 0.2.7 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 507e9c8bcb7590f680c4c72c39b26a86ef9029d3
-  data.tar.gz: c709c47aa550498ffef8ab50f8493dda0ed154a9
+SHA256:
+  metadata.gz: 5b5110d2d7f9ead5fa29dfac4bcfb437c0bc8224beaaef3a4dc0e4b9aea65903
+  data.tar.gz: 48969cf63eb856e576ce0d928403b02c369e0e9dd089baace0fb0abd7f3eb376
 SHA512:
-  metadata.gz: '082a9b6262d7bdd1d0eff963c4b3d30a4e0983012a802192e5c2b8bd2a50241ac65dd2795890c3a3fdfe760624139fa28e14273142165925bc8f2fce67b95d1b'
-  data.tar.gz: 02c0c8ce935610f5024f2a39d69670e85ef8474690454f2e5c171a027ce8b6358534662cce83068c039de9d2045ee110430ade8671d47fbf50d47301e94dc4c9
+  metadata.gz: 4c5b95db8961d6f0ef563982ff67dae7c6e517767ba5d712010231b7832ecbacef397f0405211ec9cb2062ba3257cdb04b01f6e50438e734f5a2f013bdc40276
+  data.tar.gz: fd418940aa39d78be9c40873d04aa9c6cce5feb47dfbe2eef5250ba89d4bf1564dfcd18d24cd37db3ad0f16535fc360e74468d4a4b5d12bb33d31930d9be14b4

data/README.md

@@ -19,12 +19,17 @@ elasticsearch.
   such value is detected, it will be converted to iso8601 format for easier
   consumption of elasticsearch when dynamic mapping is used.**
 
-* If a field named `timestamp` or `time` or `syslog_timestamp` exists, it will
-  parse that field and conver it to format '%Y-%m-%dT%H:%M:%S.%L%z' then store it
-  in `@timestamp` field. In addition, a field `fluent_converted_timestamp`
-  is added to the object with the same value.
+* By default, it will check whether fields named `timestamp`, `time`, or
+  `syslog_timestamp` exists, if so it will parse that field and conver it to
+  format '%Y-%m-%dT%H:%M:%S.%L%z' then store it in `@timestamp` field. In
+  addition, a field `fluent_converted_timestamp` is added to the object with
+  the same value.
 
-* If none of the above field exists, it will insert current time in
+* (>=0.3.0) the list of fields can be overriden by setting the
+  `timestamp_fields` parameter. It accepts a list of strings, the default is set
+  to: `['@timestamp', 'timestamp', 'time', 'syslog_timestamp']`
+
+* If none of the above field exists, it will insert current event time in
   '%Y-%m-%dT%H:%M:%S.%L%z' format as the `@timestamp` field. A field
   `fluent_added_timestamp` is added to the object with same value.
 

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.7"
+  spec.version       = "0.3.1"
   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

@@ -7,6 +7,7 @@ module Fluent::Plugin
     Fluent::Plugin.register_filter('elasticsearch_timestamp_check', self)
 
     config_param :subsecond_precision, :integer, default: 3
+    config_param :timestamp_fields, :array, default: ['@timestamp', 'timestamp', 'time', 'syslog_timestamp'], value_type: :string
 
     def configure(conf)
       super
@@ -33,7 +34,7 @@ module Fluent::Plugin
     end
 
     def filter(tag, time, record)
-      %w{@timestamp timestamp time syslog_timestamp}.map do |field|
+      @timestamp_fields.map do |field|
         record[field]
       end.compact.each do |timestamp|
         begin
@@ -58,12 +59,13 @@ module Fluent::Plugin
           $log.debug("Timestamp parsed: #{record['@timestamp']}")
           break
         rescue ArgumentError
+          $log.debug("#{field} (#{timestamp}) failed to parse, trying next")
         end
       end
 
       unless record['fluent_converted_timestamp']
         record['@timestamp'] = record['fluent_added_timestamp'] =
-          Time.now.strftime(@strftime_format)
+          Time.at(time.is_a?(Fluent::EventTime) ? time.to_r : time).strftime(@strftime_format)
         $log.debug("Timestamp added: #{record['@timestamp']}")
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elasticsearch-timestamp-check
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.1
 platform: ruby
 authors:
 - Richard Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-06 00:00:00.000000000 Z
+date: 2022-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -107,8 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: fluent timestamp checker filter