fluent-plugin-elasticsearch-timestamp-check 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e481bd9c704562d1e7ef761c88303c4135f1e294
-  data.tar.gz: 7b8df7d6997549b899d400ddf283239110c992dc
+  metadata.gz: 9b723fb7f5bb581fc468368d1b84621373e1e539
+  data.tar.gz: c898e8ee3dd0d463fec076344186b5840a746de4
 SHA512:
-  metadata.gz: 10fdcaa2082b797e534566403b440067404ceef6dc4f633181266bb7b0f86f0790bce8f1018c732e7631aaa3b8b4053e50a61af5cc5b8e7e80084733a90106c5
-  data.tar.gz: bc6a9b174b5ac08a7c0b1dbd5881acbfdd3cd29fafc5ab073ec083189f8302ce3982138d7180d4107c8e0945c46e4cb1a00348b1d1fa324078462b88729d0887
+  metadata.gz: 9e5f34fce88a87aef457bb0f1241b17e08a333bb25be5cbe138169c41d306d1fd3d3a49f982ef986f3cb544e6aaf556c321b99134ae4fe4e8c241bc2c26406a8
+  data.tar.gz: 1164d64c16a87a4cd6091ce1f8ab60defc70372a6629d3b302d6607814257dcca7eb5b6316fa66095c2840abfaa7e12b98094d137fe3b0c01ae702bed50188ae

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

@@ -1,4 +1,6 @@
-module Fluent
+require 'fluent/plugin/filter'
+
+module Fluent::Plugin
   class ElasticsearchTimestampCheckFilter < Filter
     Fluent::Plugin.register_filter('elasticsearch_timestamp_check', self)
 
@@ -16,12 +18,24 @@ module Fluent
     end
 
     def filter(tag, time, record)
-      existing = record['@timestamp'] || record['timestamp'] || record['time']
-      if existing
+      timestamps = [ record['@timestamp'], record['timestamp'], record['time'] ]
+      timestamps.each do |timestamp|
+        begin
+          DateTime.parse(timestamp)
+          valid = timestamp
+          break
+        rescue ArgumentError
+          next
+        else
+          valid = false
+        end
+      end
+
+      if valid
         record['@timestamp'] =
-          DateTime.parse(existing).strftime('%Y-%m-%dT%H:%M:%S.%L%z')
+          DateTime.parse(valid).strftime('%Y-%m-%dT%H:%M:%S.%L%z')
         record['fluent_converted_timestamp'] =
-          DateTime.parse(existing).strftime('%Y-%m-%dT%H:%M:%S.%L%z')
+          DateTime.parse(valid).strftime('%Y-%m-%dT%H:%M:%S.%L%z')
         $log.debug("Timestamp parsed: #{record['@timestamp']}")
       else
         record['@timestamp'] = Time.now.strftime('%Y-%m-%dT%H:%M:%S.%L%z')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elasticsearch-timestamp-check
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Richard Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-21 00:00:00.000000000 Z
+date: 2017-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler