fluent-plugin-nais 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52ee1dfd02d686dec82f927d90333c1a52cff76c
-  data.tar.gz: 5c160f964bf12372b7a80b48591e28771bf114ac
+  metadata.gz: cafcdba13c9cd44153ba0cb060036f6b2c3e9bf9
+  data.tar.gz: 1d95d13447c82d98a11a3c3f74ccb499871d15e5
 SHA512:
-  metadata.gz: 19f4110b62c360d3f1ccf608cca8620746920c70c94042d5ecaefc0f6a8b85cdd44428c7e27f74248f3c1905c6891104c452117d0bee12986621d57ad8e63eed
-  data.tar.gz: b6c72c7af749da8fb0ebc1a2165bee1c072c16ac421055b3f7d0066e67b49e991df8c3ca11cdd730007a6091814d4a34ccddbef1403a68a425716a067f6488ee
+  metadata.gz: 0ee8c9fdddfdf4e9f52ce0fe07fd86022fece2d87e64b355bacb313370c75361480e43783790d9e90b8fcb3c8850f2fa0cac398acefe5cc0e054231f15be9724
+  data.tar.gz: c5e7f180fe46f332f6e61f98213df5e54db4ce298617b04a7648fdff9da6e40e0dc6507c0109ee08e56f660d33a68fad4da1e3a49be69687cc682d372b0f6430

data/lib/fluent/plugin/filter_nais_logformat.rb

@@ -19,10 +19,14 @@ module Fluent::Plugin
           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'])
           r['log'] = r.delete('request') unless r.nil?
+          level = ::Nais::Log::Parser.loglevel_from_http_response(r['response_code'])
+          r['level'] = level unless level.nil?
         elsif fmt == 'glog'
           r = ::Nais::Log::Parser.parse_glog(record['log'])
           unless r.nil?
@@ -36,6 +40,8 @@ module Fluent::Plugin
             if r['component'] == 'httpd'
               r['log'] = r.delete('request')
               r['request'] = r.delete('request_id')
+              level = ::Nais::Log::Parser.loglevel_from_http_response(r['response_code'])
+              r['level'] = level unless level.nil?
             else
               if r.has_key?('timestamp')
                 r['log'] = record['log'].sub(/^\S+ \S+ \S+ /, '')

data/lib/fluent/plugin/filter_nais_logtransform.rb

@@ -0,0 +1,32 @@
+require "fluent/plugin/nais/version"
+require 'fluent/plugin/filter'
+require 'nais/log/parser'
+
+module Fluent::Plugin
+  class NaisLogtransformFilter < Filter
+    Fluent::Plugin.register_filter('nais_logtransform', self)
+      
+    def configure(conf)
+      super
+    end
+      
+    def filter(tag, time, record)
+      r = nil
+      if record['kubernetes'].is_a?(Hash) && record['kubernetes']['annotations'].is_a?(Hash)
+        transformers = record['kubernetes']['annotations']['nais_io/logtransform']
+        unless transformers.nil?
+          transformer.split(/ *, */).each { |t|
+            if t == 'dns_loglevel'
+              r = ::Nais::Log::Parser.loglevel_from_dns_response(record['response_code'])
+              record['level'] = r unless r.nil?
+            elsif t == 'http_loglevel'
+              r = ::Nais::Log::Parser.loglevel_from_http_response(record['response_code'])
+              record['level'] = r unless r.nil?
+            end
+          }
+        end
+      end
+    end
+
+  end
+end

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

@@ -1,7 +1,7 @@
 module Fluent
   module Plugin
     module Nais
-      VERSION = "0.9.0"
+      VERSION = "0.10.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-nais
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Terje Sannum
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-04 00:00:00.000000000 Z
+date: 2017-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -100,6 +100,7 @@ files:
 - lib/fluent/plugin/filter_nais_exceptions.rb
 - lib/fluent/plugin/filter_nais_flatten_record.rb
 - lib/fluent/plugin/filter_nais_logformat.rb
+- lib/fluent/plugin/filter_nais_logtransform.rb
 - lib/fluent/plugin/filter_nais_prefix_fields.rb
 - lib/fluent/plugin/filter_nais_remap_elasticsearch.rb
 - lib/fluent/plugin/filter_nais_remap_java.rb