fluent-plugin-kube-events-timestamp 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dfe5a8c690dc78e410526e16bcab7a300eb2ec2e94120514d4a5d506b0cbf6a
-  data.tar.gz: f012d1226ebaa0294bab225d9718d6a0de21a9808e562a5e2582902f69ede398
+  metadata.gz: 1d6428e2597ae949d42c4c296af87a7485d1ebbad75739d541a2138e67a2f79c
+  data.tar.gz: 2a2a2bcadf07e6833af53227bdda111f34e277da9de2b78d52c17e3540568ee4
 SHA512:
-  metadata.gz: c7d97dede27902bd9f8d8fe246a59bc826db32133573325d3ccf38ff99c22d50bb233517448b236a8f101d8ed520bb410db0d7c26d2008be9441346574b839a1
-  data.tar.gz: 60ba72bdb67f23c8e822a50cde4a944bc0a369285953f096c045eaded114bf91c5af6fead3436e760b82fdde17e8fcee7bbeffe7dacdb9492ee9d84ead090809
+  metadata.gz: 06a67900625f7d0ce5cb5d06083b57fcb21860bbfcd09c29d12eccfef1b57153cdcd5cdc5c5dd06559d0e648111ff363f5d222999a9f4e845902ff8172b4c9bd
+  data.tar.gz: 6419352d93f4f6341cee6b429a9ca77e3cd47b0796ccae8962aa9593fb19db4df99969bc38b33bd6b287ea368d8aba879effb224926016d4f1cf436a1b6ba3cc

data/fluent-plugin-kube-events-timestamp.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-kube-events-timestamp"
-  spec.version = "0.1.0"
+  spec.version = "0.1.1"
   spec.authors = ["Banzai Cloud"]
   spec.email   = ["info@banzaicloud.com"]
   spec.description   = %q{fluent filter plugin to map multiple timestamps into an additional one}

data/lib/fluent/plugin/filter_kube_events_timestamp.rb

@@ -12,7 +12,7 @@ module Fluent::Plugin
       super
       require 'date'
       @strftime_format = "%Y-%m-%dT%H:%M:%S.%3N%z".freeze
-      raise Fluent::ConfigError, "mapped_time_key can not be empty" if mapped_time_key == ""
+      raise Fluent::ConfigError, "mapped_time_key can not be empty" if mapped_time_key.to_s.empty?
       raise Fluent::ConfigError, "timestamp_fields must have 3 items" if timestamp_fields.length != 3
     end
 
@@ -26,18 +26,12 @@ module Fluent::Plugin
 
     def filter(tag, time, record)
 
-      @timestamp_fields.map do |field|
-        record[field]
-      end.compact.each do |timestamp|
-        begin
-          record[@mapped_time_key] = record[timestamp_fields[0]] == "" ? record[timestamp_fields[1]] == "" ? record[timestamp_fields[2]] : record[timestamp_fields[1]] : record[timestamp_fields[0]]
-        end
-      end
+      record[@mapped_time_key] = (record[@timestamp_fields[0]].to_s.empty?) ? (record[@timestamp_fields[1]].to_s.empty?) ? record[@timestamp_fields[2]] : record[@timestamp_fields[1]] : record[@timestamp_fields[0]]
 
-        unless record[@mapped_time_key] != ""
-          record[@mapped_time_key] = Time.at(time.is_a?(Fluent::EventTime) ? time.to_int : time).strftime(@strftime_format)
-          $log.debug("Timestamp added: #{record[@mapped_time_key]}")
-        end
+      if record[@mapped_time_key].to_s.empty?
+        record[@mapped_time_key] = Time.at(time.is_a?(Fluent::EventTime) ? time.to_int : time).strftime(@strftime_format)
+      end
+      $log.debug("Timestamp added: #{@mapped_time_key}:#{record[@mapped_time_key]}")
   
       record
     end

data/test/plugin/test_filter_kube_events_timestamp.rb

@@ -25,18 +25,18 @@ class TestKubEventsTimestampFilter < Test::Unit::TestCase
   end
 
   def test_config_mapped_time_key()
-    data={'event.eventTime' => '','event.lastTimestamp'  => '', 'event.firstTimestamp' => ''}
+    data={'event.eventTime' => nil, 'event.lastTimestamp'  => nil, 'event.firstTimestamp' => nil}
     d = create_driver('mapped_time_key "foobar"')
     d.run(default_tag: 'test') do
       d.feed({'test' => 'config_mapped_time_key'}.merge(data))
     end
     filtered = d.filtered.map {|e| e.last}.first
     puts "result => " + filtered.to_s
-    assert_true(filtered['foobar'] != nil)
+    assert_false(filtered['foobar'].to_s.empty?)
   end
 
   def test_config_timestamp_fields()
-    data={'event.eventTime' => 'also set','event.lastTimestamp'  => '', 'event.firstTimestamp' => '', 'foo' => 'SET', 'bar' => '', 'baz' => ''}
+    data={'event.eventTime' => 'also set','event.lastTimestamp'  => nil, 'event.firstTimestamp' => nil, 'foo' => 'SET', 'bar' => nil, 'baz' => nil}
     d = create_driver('timestamp_fields ["foo","bar","baz"]')
     d.run(default_tag: 'test') do
       d.feed({'test' => 'timestamp_fields'}.merge(data))
@@ -47,7 +47,7 @@ class TestKubEventsTimestampFilter < Test::Unit::TestCase
   end
 
   def test_notime()
-    data={'event.eventTime' => '','event.lastTimestamp'  => '', 'event.firstTimestamp' => ''}
+    data={'event.eventTime' => nil,'event.lastTimestamp'  => nil, 'event.firstTimestamp' => nil}
     puts "testcase => " + data.to_s
     d = create_driver
     d.run(default_tag: 'test') do
@@ -55,18 +55,18 @@ class TestKubEventsTimestampFilter < Test::Unit::TestCase
     end
     filtered = d.filtered.map {|e| e.last}.first
     puts "result => " + filtered.to_s
-    assert_true(filtered['triggerts'] != nil)
+    assert_false(filtered['triggerts'].to_s.empty?)
   end
 
   def test_expected_mappings()
     data=[
-      {'expected' => 'event.eventTime', 'event.eventTime' => '2021-09-21T21:39:16.000+0200','event.lastTimestamp'  => '', 'event.firstTimestamp' => ''},
-      {'expected' => 'event.eventTime', 'event.eventTime' => '2021-09-21T21:39:16.000+0200','event.lastTimestamp'  => 'notempty', 'event.firstTimestamp' => ''},
+      {'expected' => 'event.eventTime', 'event.eventTime' => '2021-09-21T21:39:16.000+0200','event.lastTimestamp'  => nil, 'event.firstTimestamp' => nil},
+      {'expected' => 'event.eventTime', 'event.eventTime' => '2021-09-21T21:39:16.000+0200','event.lastTimestamp'  => 'notempty', 'event.firstTimestamp' => nil},
       {'expected' => 'event.eventTime', 'event.eventTime' => '2021-09-21T21:39:16.000+0200','event.lastTimestamp'  => 'notempty', 'event.firstTimestamp' => 'alsonotempty'},
-      {'expected' => 'event.eventTime', 'event.eventTime' => '2021-09-21T21:39:16.000+0200','event.lastTimestamp'  => '', 'event.firstTimestamp' => 'nonempty'},
-      {'expected' => 'event.lastTimestamp', 'event.eventTime' => '','event.lastTimestamp'  => 'exists', 'event.firstTimestamp' => ''},
-      {'expected' => 'event.lastTimestamp', 'event.eventTime' => '','event.lastTimestamp'  => 'exists', 'event.firstTimestamp' => 'alsoexists'},
-      {'expected' => 'event.firstTimestamp', 'event.eventTime' => '','event.lastTimestamp'  => '', 'event.firstTimestamp' => 'exists'}
+      {'expected' => 'event.eventTime', 'event.eventTime' => '2021-09-21T21:39:16.000+0200','event.lastTimestamp'  => nil, 'event.firstTimestamp' => 'nonempty'},
+      {'expected' => 'event.lastTimestamp', 'event.eventTime' => nil,'event.lastTimestamp'  => 'exists', 'event.firstTimestamp' => nil},
+      {'expected' => 'event.lastTimestamp', 'event.eventTime' => nil,'event.lastTimestamp'  => 'exists', 'event.firstTimestamp' => 'alsoexists'},
+      {'expected' => 'event.firstTimestamp', 'event.eventTime' => nil,'event.lastTimestamp'  => nil, 'event.firstTimestamp' => 'exists'}
     ]
     data.each do |testcase|
       puts "testcase => " + testcase.to_s
@@ -76,7 +76,7 @@ class TestKubEventsTimestampFilter < Test::Unit::TestCase
       end
       filtered = d.filtered.map {|e| e.last}.first
       puts "result => " + filtered.to_s
-      assert_equal(filtered['triggerts'], filtered[filtered['expected']])
+      assert_equal(filtered[filtered['expected']], filtered['triggerts'])
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kube-events-timestamp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Banzai Cloud