Merge branch 'master' into travis

Author: yaron-idan

lib/fluent/plugin/filter_kubernetes_log_levels.rb

@@ -20,9 +20,11 @@ module Plugin
     class KubernetesLogLevelsFilter < Fluent::Plugin::Filter
       Fluent::Plugin.register_filter("kubernetes_log_levels", 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, :string, :default => 'level'
       def configure(conf)
           super
       end
@@ -31,7 +33,6 @@ def level_to_num(level)
         case level
         when 'trace'
           10
-          
         when 'debug'
           20
         when 'info'
@@ -48,24 +49,35 @@ def level_to_num(level)
       end
 
       def filter(tag, time, record)
-        numeric_logging_level = 0
+        puts @log_level_label
+        log.trace "Start to process record"
+        is_logging_label_exist = false
         if record.has_key?("kubernetes")
           if record["kubernetes"].has_key?("labels")
             if record["kubernetes"]["labels"].has_key?(@log_level_label)
+              log.trace "kubernetes.labels.logging-level found"
               numeric_logging_level = level_to_num(record['kubernetes']['labels'][@log_level_label])
+              is_logging_label_exist = true
             end
           end
         end
-        if numeric_logging_level === 0
-          record
-        else
-          numeric_level = level_to_num(record[@log_level_key])
-          if numeric_level >= numeric_logging_level
+        
+        log.trace "Check for logging level existance"
+        if is_logging_label_exist == false
+          if @default_logging_level.nil?
             record
           else
-            nil
+            numeric_logging_level = level_to_num(@default_logging_level)
           end
         end
+        
+        log.trace "Process current log level"
+        numeric_level = level_to_num(record[@log_level_key])
+        if numeric_level >= numeric_logging_level
+          record
+        else
+          nil
+        end
       end
     end
   end

test/plugin/test_filter_kubernetes_log_levels.rb

@@ -24,14 +24,15 @@ class KubernetesLogLevelsFilterTest < Test::Unit::TestCase
 
     @expected_info = []
 
-    @expected_static = [{
-      'level' => 'debug'
+    @expected_static_warning_default = [{
+      'level' => 'warning'
     }]
   end
 
   CONFIG = %[
     log_level_label logging-level
     log_level_key level
+    default_logging_level warning
   ]
 
  # private
@@ -42,14 +43,15 @@ def create_driver(conf = CONFIG)
 
   def filter(msg, time = event_time("2017-07-12 19:20:21 UTC"))
     d = create_driver
-    d.run { d.feed('moshe', time, msg) }
+    d.run { d.feed('kubernetes', time, msg) }
     d.filtered_records
   end
 
   def test_default_configuration
     d = create_driver
     assert_equal 'logging-level', d.instance.config['log_level_label']
     assert_equal 'level', d.instance.config['log_level_key']
+    assert_equal 'warning', d.instance.config['default_logging_level']
   end
 
   def test_log_level_higher_then_threshold
@@ -65,6 +67,6 @@ def test_log_level_lower_then_threshold
   end 
 
   def test_static_log
-    assert_equal @expected_static, filter({"level"=>"debug"})
+    assert_equal @expected_static_warning_default, filter({"level"=>"warning"})
   end
 end