fluent-plugin-kubernetes-log-level 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa5fbdac4fd2fb30a485ec9778a610236ff8ca45
-  data.tar.gz: 28eecfbe678c87ece3dc3410d26d7a6a5696f0b5
+  metadata.gz: a8d151fecafb83c99cc458d6033eed3434173d07
+  data.tar.gz: 8f3e9ac1599e8dfb0a66c40021ece373005faaff
 SHA512:
-  metadata.gz: 07f6c6347ab0742a03841ed9fb727818b1857bf3975a930a2d5a074900a4a2ce9a1edeef7c05a81aa51711253f44f4db4e95963403e3ffe93165190bca734464
-  data.tar.gz: 03d6fa7591ced17ecdde113a3939dfe169683d9b325710e0e54253583879366e39d0db69df6ca9e5d8ff2d1095f6fa462f2ad1647e49a4bd00a874865fbc1c04
+  metadata.gz: 27a4af560a7f25cde3b84b2fa9bdcab549d127232bb8f8ad05bf488e7a6b22723c4d1cb1d8998f78b1adf8732ae40c631c8513f02e488cc3f22094039df88770
+  data.tar.gz: 698d60e02afaa5d4bce6cf866862914c86ff438950093b425f66455310e42173390accf43f94d27e2e68bf905c70f677b5baa0663467d06230960540d6cfe48d

data/README.md

@@ -33,7 +33,8 @@ $ bundle
 Configuration options for fluent.conf are:
 
 * `log_level_label` - kubernetes label name for setting current log level
-* `log_level_key` - key in log record to indicate the current record's level
+* `log_level_key_label` - kubernetes label name for getting current log level from record
+* `default_log_level_key` - default key in log record to indicate the current record's level
 * `default_logging_level` - default logging levels for kubernetes services missing a `log_level_label`
 
 ## Copyright

data/fluent-plugin-kubernetes-log-level.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-kubernetes-log-level"
-  spec.version = "0.1.4"
+  spec.version = "0.2.0"
   spec.authors = ["yaron-idan"]
   spec.email   = ["yaronidan@gmail.com"]
 

data/lib/fluent/plugin/filter_kubernetes_log_level.rb

@@ -20,28 +20,28 @@ module Fluent
     class KubernetesLogLevelFilter < Fluent::Plugin::Filter
       Fluent::Plugin.register_filter("kubernetes_log_level", self)
 
-      # TODO - solve default values problem
-      config_param :log_level_label, :string
-      config_param :log_level_key, :string
-      config_param :default_logging_level, :string
+      config_param :log_level_label, :string, :default => 'logging-level'
+      config_param :log_level_key_label, :string, :default => 'logging-level-key'
+      config_param :default_log_level_key, :string, :default => 'level'
+      config_param :default_logging_level, :string, :default => ''
 
       def configure(conf)
           super
       end
 
       def level_to_num(level)
-        case level
-        when 'trace', 'Verbose'
+        case level.downcase
+        when 'trace', 'verbose'
           10
-        when 'debug', 'Debug'
+        when 'debug'
           20
-        when 'info', 'Information'
+        when 'info', 'information'
           30
-        when 'warning', 'Warning'
+        when 'warning'
           40
-        when 'error', 'Error'
+        when 'error'
           50
-        when 'fatal', 'Fatal'
+        when 'fatal'
           60
         else
           0
@@ -51,40 +51,45 @@ module Fluent
       def filter(tag, time, record)
         
         log.trace "Start to process record"
-        is_logging_label_exist = false
+
+        log_level_key = @default_log_level_key
+        logging_level = @default_logging_level
+        app = 'app'
+
         if record.has_key?("kubernetes")
           if record["kubernetes"].has_key?("labels")
+            if record["kubernetes"]["labels"].has_key?('app')
+              app = record['kubernetes']['labels']['app']
+            end
+
+            if record["kubernetes"]["labels"].has_key?(@log_level_key_label)
+              log_level_key = record['kubernetes']['labels'][@log_level_key_label]
+              log.debug "[App: #{app}]: kubernetes.labels.#{@log_level_key_label} found with the value #{log_level_key}"
+            end
+
             if record["kubernetes"]["labels"].has_key?(@log_level_label)
-              log.debug "[App: #{record['kubernetes']['labels']['app']}]: kubernetes.labels.logging-level found with the value #{record['kubernetes']['labels'][@log_level_label]}"
-              numeric_logging_level = level_to_num(record['kubernetes']['labels'][@log_level_label])
-              is_logging_label_exist = true
+              logging_level = record['kubernetes']['labels'][@log_level_label]
+              log.debug "[App: #{app}]: kubernetes.labels.#{@log_level_label} found with the value #{logging_level}"
             end
           end
         end
-        
-        log.trace "Check for logging level existence"
-        if is_logging_label_exist == false
-          log.debug "No logging-level label was found"
-          if @default_logging_level.nil?          
-            record
-          else
-            numeric_logging_level = level_to_num(@default_logging_level)
-            log.debug "[App: #{record['kubernetes']['labels']['app']}]: Logging level set to #{@default_logging_level}"
-          end
-        end
-        
+
+        numeric_logging_level = level_to_num(logging_level)
+
         log.trace "Process current log level"
-        if record.has_key?(@log_level_key.capitalize)
-          log.debug "[App: #{record['kubernetes']['labels']['app']}]: Downcasing capitalized log_level from #{@log_level_key.capitalize}"
-          record[@log_level_key] = record[@log_level_key.capitalize]  
+        if record.has_key?(log_level_key.capitalize)
+          log.debug "[App: #{app}]: Downcasing capitalized log_level from #{log_level_key.capitalize}"
+          current_log_level = record[log_level_key.capitalize]
+        else
+          current_log_level = record[log_level_key]
         end
         
-        numeric_level = level_to_num(record[@log_level_key])
+        numeric_level = level_to_num(current_log_level)
         if numeric_level >= numeric_logging_level
-          log.debug "[App: #{record['kubernetes']['labels']['app']}]: Emitting record with #{record[@log_level_key]} level"
+          log.debug "[App: #{app}]: Emitting record with #{current_log_level} level"
           record
         else
-          log.debug "[App: #{record['kubernetes']['labels']['app']}]: Dropping record with #{record[@log_level_key]} level"
+          log.debug "[App: #{app}]: Dropping record with #{current_log_level} level"
           nil
         end
       end

data/test/plugin/test_filter_kubernetes_log_level.rb

@@ -38,7 +38,6 @@ class KubernetesLogLevelFilterTest < Test::Unit::TestCase
 
     @expected_static_capital_level = [{
       'Level' => 'Warning',
-      'level' => 'Warning',
       'kubernetes' => {
         'labels' => {
           'app' => 'demo'
@@ -55,11 +54,28 @@ class KubernetesLogLevelFilterTest < Test::Unit::TestCase
         }
       }
     }]
+
+    @expected_no_default_log_level = [{
+      'level'  => 'error',
+      'kubernetes' => {
+        'labels' => {
+          'app' => 'demo'
+        }
+      }
+    }]
+
+    @expected_log_level_key = [{
+      'levelname'  => 'error',
+      'kubernetes' => {
+        'labels' => {
+          'logging-level-key' => 'levelname',
+          'app'               => 'demo'
+        }
+      }
+    }]
   end
 
   CONFIG = %[
-    log_level_label logging-level
-    log_level_key level
     default_logging_level warning
   ]
 
@@ -69,16 +85,24 @@ class KubernetesLogLevelFilterTest < Test::Unit::TestCase
     Fluent::Test::Driver::Filter.new(Fluent::Plugin::KubernetesLogLevelFilter).configure(conf)
   end
 
-  def filter(msg, time = event_time("2017-07-12 19:20:21 UTC"))
-    d = create_driver
+  def filter(msg, conf = CONFIG, time = event_time("2017-07-12 19:20:21 UTC"))
+    d = create_driver(conf)
     d.run { d.feed('kubernetes', time, msg) }
     d.filtered_records
   end
 
   def test_default_configuration
-    d = create_driver
+    conf = %[
+      log_level_label logging-level
+      log_level_key_label logging-level-key
+      default_log_level_key level
+      default_logging_level warning
+    ]
+
+    d = create_driver(conf)
     assert_equal 'logging-level', d.instance.config['log_level_label']
-    assert_equal 'level', d.instance.config['log_level_key']
+    assert_equal 'logging-level-key', d.instance.config['log_level_key_label']
+    assert_equal 'level', d.instance.config['default_log_level_key']
     assert_equal 'warning', d.instance.config['default_logging_level']
   end
 
@@ -101,4 +125,13 @@ class KubernetesLogLevelFilterTest < Test::Unit::TestCase
   def test_serilog_structure
     assert_equal @expected_static_capital_level, filter({"Level"=>"Warning", "kubernetes"=>{"labels"=>{"app"=>"demo"}}})
   end
+
+  def test_no_default_log_level
+    conf = %[]
+    assert_equal @expected_no_default_log_level, filter({"level"=>"error", "kubernetes"=>{"labels"=>{"app"=>"demo"}}}, conf)
+  end
+
+  def test_custom_log_level
+    assert_equal @expected_log_level_key, filter({"levelname"=>"error", "kubernetes"=>{"labels"=>{"logging-level-key"=>"levelname","app"=>"demo"}}})
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kubernetes-log-level
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - yaron-idan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-20 00:00:00.000000000 Z
+date: 2018-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler