fluent-plugin-nais 0.29.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5be2efe447b3a6b753c05f611252fe370fe65298
-  data.tar.gz: f9e010893502e2d7d4355e1cd3a3d8b350b2e560
+  metadata.gz: '088d42902132a64e080f5892e045e26408b344d6'
+  data.tar.gz: a1edd1c16515fa778d510d49b9928597133f73eb
 SHA512:
-  metadata.gz: 007f3742c2b31c10aacd9343e515aea15735ba9811564b12f870b6fdca0f62b3a3156add40ae15f7c36159350439cd7459aa6a0cedcd313fd93872ce19667555
-  data.tar.gz: a34db6100661ed56ed4d00ffe66e88e4d0e4f87d28fb401a6166e5b15f8c7544359b74a78ba0370990916c9555e894f08e3ea82ba109361c0a9d93f3ce6ed928
+  metadata.gz: b332324a0f4ff4c7e0672d6f99782a97bec7084c3c68f854e9c3358953755e7e8f5c3970640afabac518011f684b87f3e2fc5568b6b075e8f71d335f36b856c4
+  data.tar.gz: 3a0bbe8fcc1e99ac1eae855b20066ff71587157c24dc25b2a67e1322a3f3be3e315fd9520ebf97125c78128195ef6322eb9eab0e2d55acfcd808e478bd68a3ee

data/fluent-plugin-nais.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'fluentd', '~> 1.1'
-  spec.add_dependency 'nais-log-parser', '>= 0.29.0'
+  spec.add_dependency 'nais-log-parser', '>= 0.30.0'
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/fluent/plugin/filter_nais_logformat.rb

@@ -5,6 +5,7 @@ require 'nais/log/parser'
 module Fluent::Plugin
   class NaisLogformatFilter < Filter
     Fluent::Plugin.register_filter('nais_logformat', self)
+    config_param :logformat, :string, default: ""
       
     def configure(conf)
       super
@@ -12,75 +13,81 @@ module Fluent::Plugin
       
     def filter(tag, time, record)
       r = nil
+      formats = @logformat
       if record['kubernetes'].is_a?(Hash) && record['kubernetes']['annotations'].is_a?(Hash)
-        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')
+        formats = record['kubernetes']['annotations']['nais_io/logformat']
+      end
+      unless formats.nil? || formats == ""
+        formats.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 == 'capnslog'
+            r = ::Nais::Log::Parser.parse_capnslog(record['log'])
+            unless r.nil?
+              r['log'] = r.delete('message')
+            end
+          elsif fmt == 'logrus'
+            r = ::Nais::Log::Parser.parse_logrus(record['log'])
+            unless r.nil?
+              r['log'] = r.delete('msg')
+            end
+          elsif fmt == 'gokit'
+            r = ::Nais::Log::Parser.parse_gokit(record['log'])
+            unless r.nil?
+              r['msg'] = r['err'] if r.has_key?('err') && !r.has_key?('msg')
+              r['log'] = r.delete('msg')
+            end
+          elsif fmt == 'redis'
+            r = ::Nais::Log::Parser.parse_redis(record['log'])
+            unless r.nil?
+              r['log'] = r.delete('message')
+            end
+          elsif fmt == 'simple'
+            r = ::Nais::Log::Parser.parse_simple(record['log'])
+            unless r.nil?
+              r['log'] = r.delete('message')
+            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
-            elsif fmt == 'capnslog'
-              r = ::Nais::Log::Parser.parse_capnslog(record['log'])
-              unless r.nil?
-                r['log'] = r.delete('message')
-              end
-            elsif fmt == 'logrus'
-              r = ::Nais::Log::Parser.parse_logrus(record['log'])
-              unless r.nil?
-                r['log'] = r.delete('msg')
-              end
-            elsif fmt == 'gokit'
-              r = ::Nais::Log::Parser.parse_gokit(record['log'])
-              unless r.nil?
-                r['msg'] = r['err'] if r.has_key?('err') && !r.has_key?('msg')
-                r['log'] = r.delete('msg')
-              end
-            elsif fmt == 'simple'
-              r = ::Nais::Log::Parser.parse_simple(record['log'])
-              unless r.nil?
-                r['log'] = r.delete('message')
-              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
-            break unless r.nil?
-          }
-        end
+          elsif fmt == 'log15'
+            ::Nais::Log::Parser.remap_log15(record)
+          end
+          break unless r.nil?
+        }
       end
       if r.nil?
         record

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

@@ -1,7 +1,7 @@
 module Fluent
   module Plugin
     module Nais
-      VERSION = "0.29.0"
+      VERSION = "0.30.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-nais
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.30.0
 platform: ruby
 authors:
 - Terje Sannum
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-09 00:00:00.000000000 Z
+date: 2018-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.30.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.30.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement