fluent-plugin-nais 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5627059538ead54ddd985dd312c7e064a303797f
-  data.tar.gz: 770e069bf9364d43afb30bed81b378e04639fafe
+  metadata.gz: f9395588b43c57ae5d342195e7bc5e9aa604cd04
+  data.tar.gz: a31f8e3b11a2b5e376a846dce8d406413856fe40
 SHA512:
-  metadata.gz: 63771d71fb94a791e5720bc5fd5ddcb8d6f353cb7d8a60a93c7ad5d94b34d1320fcd8442c84d1052e49709360c624ed80d75a0f4e7eb1b65dc73d2f5fb271d6d
-  data.tar.gz: 8807a807b02266775cbc80c29c93790e1c5d7f5c60afb0d928479023933b347e6cff8b87cdcb614e05028f26f71b855a9703e97ec98da0eded699769535fca73
+  metadata.gz: 43d44fe4f9e443c3955de3806b395f4a491945445d48634cd6120043f3c05f8ffefc73d5f3da0afffed9b6ce1a2b07d58c725488bb6b95c0c686d8d075681812
+  data.tar.gz: 78efb32a9e6b9c3fdbd7a35b4012bec3314d5d24960e99605d77f946a75132e5df429c42b49b9f4c9fe635694045ac76bbc84b058b5a8f66f78c5c850387d979

data/lib/fluent/plugin/filter_nais_logformat.rb

@@ -13,47 +13,52 @@ module Fluent::Plugin
     def filter(tag, time, record)
       r = nil
       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')
-            level = ::Nais::Log::Parser.loglevel_from_http_response(r['response_code'])
-            r['level'] = level unless level.nil?
-          end
-        elsif fmt == 'accesslog_with_processing_time'
-          r = ::Nais::Log::Parser.parse_accesslog_with_processing_time(record['log'])
-          unless r.nil?
-            r['log'] = r.delete('request')
-            level = ::Nais::Log::Parser.loglevel_from_http_response(r['response_code'])
-            r['level'] = level unless level.nil?
-          end
-        elsif fmt == 'accesslog_with_referer_useragent'
-          r = ::Nais::Log::Parser.parse_accesslog_with_referer_useragent(record['log'])
-          unless r.nil?
-            r['log'] = r.delete('request')
-            level = ::Nais::Log::Parser.loglevel_from_http_response(r['response_code'])
-            r['level'] = level unless level.nil?
-          end
-        elsif fmt == 'glog'
-          r = ::Nais::Log::Parser.parse_glog(record['log'])
-          unless r.nil?
-            r['source'] = r['file']+':'+r.delete('line')
-            r['component'] = r.delete('file')
-            r['log'] = r.delete('message')
-          end
-        elsif fmt == 'influxdb'
-          r = ::Nais::Log::Parser.parse_influxdb(record['log'])
-          unless r.nil?
-            r['log'] = r.delete('message')
-            if r['component'] == 'httpd'
-              level = ::Nais::Log::Parser.loglevel_from_http_response(r['response_code'])
-              r['level'] = level unless level.nil?
+        annotation = record['kubernetes']['annotations']['nais_io/logformat']
+        unless annotation.nil?
+          annotation.split(',').each {|fmt|
+            if fmt == 'accesslog'
+              r = ::Nais::Log::Parser.parse_accesslog(record['log'])
+              unless r.nil?
+                r = r[0]
+                r['log'] = r.delete('request')
+                level = ::Nais::Log::Parser.loglevel_from_http_response(r['response_code'])
+                r['level'] = level unless level.nil?
+              end
+            elsif fmt == 'accesslog_with_processing_time'
+              r = ::Nais::Log::Parser.parse_accesslog_with_processing_time(record['log'])
+              unless r.nil?
+                r['log'] = r.delete('request')
+                level = ::Nais::Log::Parser.loglevel_from_http_response(r['response_code'])
+                r['level'] = level unless level.nil?
+              end
+            elsif fmt == 'accesslog_with_referer_useragent'
+              r = ::Nais::Log::Parser.parse_accesslog_with_referer_useragent(record['log'])
+              unless r.nil?
+                r['log'] = r.delete('request')
+                level = ::Nais::Log::Parser.loglevel_from_http_response(r['response_code'])
+                r['level'] = level unless level.nil?
+              end
+            elsif fmt == 'glog'
+              r = ::Nais::Log::Parser.parse_glog(record['log'])
+              unless r.nil?
+                r['source'] = r['file']+':'+r.delete('line')
+                r['component'] = r.delete('file')
+                r['log'] = r.delete('message')
+              end
+            elsif fmt == 'influxdb'
+              r = ::Nais::Log::Parser.parse_influxdb(record['log'])
+              unless r.nil?
+                r['log'] = r.delete('message')
+                if r['component'] == 'httpd'
+                  level = ::Nais::Log::Parser.loglevel_from_http_response(r['response_code'])
+                  r['level'] = level unless level.nil?
+                end
+              end
+            elsif fmt == 'log15'
+              ::Nais::Log::Parser.remap_log15(record)
             end
-          end
-        elsif fmt == 'log15'
-          ::Nais::Log::Parser.remap_log15(record)
+            break unless r.nil?
+          }
         end
       end
       if r.nil?
@@ -62,6 +67,5 @@ module Fluent::Plugin
         record.merge(r)
       end
     end
-    
   end
 end

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

@@ -1,7 +1,7 @@
 module Fluent
   module Plugin
     module Nais
-      VERSION = "0.17.0"
+      VERSION = "0.18.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-nais
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Terje Sannum
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-21 00:00:00.000000000 Z
+date: 2017-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd