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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d6428e2597ae949d42c4c296af87a7485d1ebbad75739d541a2138e67a2f79c
-  data.tar.gz: 2a2a2bcadf07e6833af53227bdda111f34e277da9de2b78d52c17e3540568ee4
+  metadata.gz: af49890ee89485b846d5eb108ab427be93ebd46d65529e037fd89f090a729686
+  data.tar.gz: f3a0df69adce30eedd04f3ad807f3038d97b8e9e447702c0a49d1f66322b0184
 SHA512:
-  metadata.gz: 06a67900625f7d0ce5cb5d06083b57fcb21860bbfcd09c29d12eccfef1b57153cdcd5cdc5c5dd06559d0e648111ff363f5d222999a9f4e845902ff8172b4c9bd
-  data.tar.gz: 6419352d93f4f6341cee6b429a9ca77e3cd47b0796ccae8962aa9593fb19db4df99969bc38b33bd6b287ea368d8aba879effb224926016d4f1cf436a1b6ba3cc
+  metadata.gz: 00e7f370299bf9bb2a7061d4618e5a1afaabf4e5e22b1259dcd148c3adfadaf81fb330fa55be390b4eb12061c9b683861a7e91341ca1e16896d03592c613350e
+  data.tar.gz: e5039bd81d35e0af1105deaa380db1864c4feca93bb09ad8210f4ca1e38561eb7fbe7242ffcc9a49f7e916e8247c032ac340505949e62c962ba6c36e1abaed54

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

@@ -1,5 +1,13 @@
 require 'fluent/plugin/filter'
 
+def decomposite_key(key)
+  key.split('.')
+end
+
+def getin(hash, key)
+  hash.dig(*decomposite_key(key))
+end
+
 module Fluent::Plugin
   class KubEventsTimestampFilter < Filter
 
@@ -26,7 +34,7 @@ module Fluent::Plugin
 
     def filter(tag, time, record)
 
-      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]]
+      record[@mapped_time_key] = (getin(record,@timestamp_fields[0]).to_s.empty?) ? (getin(record,@timestamp_fields[1]).to_s.empty?) ? getin(record,@timestamp_fields[2]) : getin(record,@timestamp_fields[1]) : getin(record,@timestamp_fields[0])
 
       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)

data/test/plugin/test_filter_kube_events_timestamp.rb

@@ -47,7 +47,8 @@ class TestKubEventsTimestampFilter < Test::Unit::TestCase
   end
 
   def test_notime()
-    data={'event.eventTime' => nil,'event.lastTimestamp'  => nil, 'event.firstTimestamp' => nil}
+    # data={'event.eventTime' => nil,'event.lastTimestamp'  => nil, 'event.firstTimestamp' => nil}
+    data={'event' => {'eventTime' => nil, 'lastTimestamp'  => nil, 'firstTimestamp' => nil}}
     puts "testcase => " + data.to_s
     d = create_driver
     d.run(default_tag: 'test') do
@@ -60,13 +61,13 @@ class TestKubEventsTimestampFilter < Test::Unit::TestCase
 
   def test_expected_mappings()
     data=[
-      {'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'  => 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'}
+      {'expected' => 'event.eventTime', 'event'=> {'eventTime' => '2021-09-21T21:39:16.000+0200','lastTimestamp'  => nil, 'firstTimestamp' => nil}},
+      {'expected' => 'event.eventTime', 'event'=> {'eventTime' => '2021-09-21T21:39:16.000+0200','lastTimestamp'  => 'notempty', 'firstTimestamp' => nil}},
+      {'expected' => 'event.eventTime', 'event'=> {'eventTime' => '2021-09-21T21:39:16.000+0200','lastTimestamp'  => 'notempty', 'firstTimestamp' => 'alsonotempty'}},
+      {'expected' => 'event.eventTime', 'event'=> {'eventTime' => '2021-09-21T21:39:16.000+0200','lastTimestamp'  => nil, 'firstTimestamp' => 'nonempty'}},
+      {'expected' => 'event.lastTimestamp', 'event'=> {'eventTime' => nil,'lastTimestamp'  => 'exists', 'firstTimestamp' => nil}},
+      {'expected' => 'event.lastTimestamp', 'event'=> {'eventTime' => nil,'lastTimestamp'  => 'exists', 'firstTimestamp' => 'alsoexists'}},
+      {'expected' => 'event.firstTimestamp', 'event'=> {'eventTime' => nil,'lastTimestamp'  => nil, 'firstTimestamp' => 'exists'}}
     ]
     data.each do |testcase|
       puts "testcase => " + testcase.to_s
@@ -76,7 +77,7 @@ class TestKubEventsTimestampFilter < Test::Unit::TestCase
       end
       filtered = d.filtered.map {|e| e.last}.first
       puts "result => " + filtered.to_s
-      assert_equal(filtered[filtered['expected']], filtered['triggerts'])
+      assert_equal(getin(filtered, filtered['expected']), filtered['triggerts'])
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kube-events-timestamp
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Banzai Cloud
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-22 00:00:00.000000000 Z
+date: 2021-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd