fluent-plugin-elasticsearch-timestamp-check 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f860468271772cde0739a1b000e5bc06163bf25c
-  data.tar.gz: 0ea1133ff3a30c8c840a0f2a193d9ef6de977099
+  metadata.gz: 3a0af9963774d5d11e0fd569c18017ba307572c0
+  data.tar.gz: 29a7a6840726c287338520259c7c558647426d7f
 SHA512:
-  metadata.gz: 059f6f97346bdb6d92767fd479ece1f8ff66113b39b64c92bdd0708c81a175be75805e5da6308265e9582f092a7e0e37931605f3c19e3264e9240ae7897a2fcf
-  data.tar.gz: 003856228c7ee15a67a3e72a0f21a6eea1b4b8fec8ac6bea7af10fa1adbdc79a3eb4b59e8d7a555b751991fa7c117ac89c3d2108b94b601320b5c49d4f5b2d26
+  metadata.gz: e56942ca9ca13036e4d07b7256daa46cd7de5d8e2b55462adb46ef87eea6374cf74c72a2669a6f48eff7d7e7e1d28bd6c6248091835f115aaaf877075b8eafa4
+  data.tar.gz: adae81c6a571fc8803c81294da883eb9517b06abaa9a174d5cf6742a754d41b758b72a2eb8b2c923217f8a92cb7134ad8a59a2acfd1a3faa5ea015ab069fbaf5

data/README.md

@@ -16,10 +16,11 @@ elasticsearch.
 * If *@timestamp* field already exists, it will ensure the format is correct
   by parse and convert to format '%Y-%m-%dT%H:%M:%S%z'.
 
-* If a field named *timestamp* exists, it will parse that field and conver it to
-  format '%Y-%m-%dT%H:%M:%S%z' then store it in *@timestamp* field.
+* 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%z' then store it
+  in *@timestamp* field.
 
-* If neither of the above field exists, it will insert current time in
+* If none of the above field exists, it will insert current time in
   '%Y-%m-%dT%H:%M:%S%z' format as the *@timestamp* field.
 
 ## Usage

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

@@ -18,32 +18,24 @@ module Fluent::Plugin
     end
 
     def filter(tag, time, record)
-      timestamps = [ record['@timestamp'], record['timestamp'], record['time'] ]
-      valid = false
-      timestamps.each do |timestamp|
+      %w{@timestamp timestamp time syslog_timestamp}.map do |field|
+        record[field]
+      end.compact.each do |timestamp|
         begin
-          if timestamp then
-            DateTime.parse(timestamp)
-            valid = timestamp
-            break
-          end
+          record['@timestamp'] = record['fluent_converted_timestamp'] =
+            DateTime.parse(timestamp).strftime('%Y-%m-%dT%H:%M:%S.%L%z')
+          $log.debug("Timestamp parsed: #{record['@timestamp']}")
+          break
         rescue ArgumentError
-          next
         end
       end
 
-      if valid
-        record['@timestamp'] =
-          DateTime.parse(valid).strftime('%Y-%m-%dT%H:%M:%S.%L%z')
-        record['fluent_converted_timestamp'] =
-          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')
-        record['fluent_added_timestamp'] =
+      unless record['fluent_converted_timestamp']
+        record['@timestamp'] = record['fluent_added_timestamp'] =
           Time.now.strftime('%Y-%m-%dT%H:%M:%S.%L%z')
         $log.debug("Timestamp added: #{record['@timestamp']}")
       end
+
       record
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elasticsearch-timestamp-check
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Richard Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-15 00:00:00.000000000 Z
+date: 2017-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler