fluent-plugin-nais 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c85c792522daf8accb958d554993e69f07eb3fa
-  data.tar.gz: 03b923b8d36626915a92ed95c9a4b699368ff348
+  metadata.gz: f425cdac537c950a9682ecccb1810947b63c1988
+  data.tar.gz: dc7d0a3989a4deed1f36e8c78c32c1fec1fe0ae8
 SHA512:
-  metadata.gz: c0510b12d30fc832178bedee7b4faa781dc44503d6a51ea53aa259d045761620b0f6ebff2bd499c0393f303ab9e6a3cb346497a18423c702ed9ec321ba6f4f5d
-  data.tar.gz: ad1e5b980be8889625f712c2ae0229e312b636f8b6af259e765902ca9af23f51a9e0097b5ded43e62850fa318d6e7f59fe28c887e1bd95812deae663321df6d8
+  metadata.gz: 1912bbe15d0a5b03d706b967125781349b842ac99ea38e3c3cc38bdc14a8f27bf5714d9f98abe8cd0a532f8affb0d145cce86fa1c56566abb97e740e384eff5b
+  data.tar.gz: 9f318090fd16e45db1e84ed7bae2d95a71f3e4bc98b2ea95dda8641b6e91a88a1580237535cc5a233ae371275d3687cb735fca6fe3075751ef620f563578158a

data/lib/fluent/plugin/filter_nais_logformat.rb

@@ -11,22 +11,24 @@ module Fluent::Plugin
     end
       
     def filter(tag, time, record)
-      fmt = record['kubernetes']['annotations']['nais_io/logformat']
       r = nil
-      if fmt == 'accesslog'
-        r = ::Nais::Log::Parser.parse_accesslog(record['log'])
-        unless r.nil?
-          r = r[0]
-          r['log'] = r.delete('request')
-        end
-      elsif fmt == 'accesslog_with_processing_time'
-        r = ::Nais::Log::Parser.parse_accesslog_with_processing_time(record['log'])
-        r['log'] = r.delete('request') unless r.nil?
-      elsif fmt == 'glog'
-        r = ::Nais::Log::Parser.parse_glog(record['log'])
-        unless r.nil?
-          r['component'] = r.delete('file')+':'+r.delete('line')
-          r['log'] = r.delete('message')
+      if record['kubernetes'].is_a?(Hash) && record['kubernetes']['annotations'].is_a?(Hash)
+        fmt = record['kubernetes']['annotations']['nais_io/logformat']
+        if fmt == 'accesslog'
+          r = ::Nais::Log::Parser.parse_accesslog(record['log'])
+          unless r.nil?
+            r = r[0]
+            r['log'] = r.delete('request')
+          end
+        elsif fmt == 'accesslog_with_processing_time'
+          r = ::Nais::Log::Parser.parse_accesslog_with_processing_time(record['log'])
+          r['log'] = r.delete('request') unless r.nil?
+        elsif fmt == 'glog'
+          r = ::Nais::Log::Parser.parse_glog(record['log'])
+          unless r.nil?
+            r['component'] = r.delete('file')+':'+r.delete('line')
+            r['log'] = r.delete('message')
+          end
         end
       end
       if r.nil?

data/lib/fluent/plugin/nais/version.rb

@@ -1,7 +1,7 @@
 module Fluent
   module Plugin
     module Nais
-      VERSION = "0.4.1"
+      VERSION = "0.4.2"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-nais
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Terje Sannum