Skip to content

Commit 2ebbc1a

Browse files
authored
Merge pull request #6 from Soluto/add-serilog-support
Add serilog support
2 parents c118265 + 240b2cb commit 2ebbc1a

File tree

3 files changed

+21
-7
lines changed

3 files changed

+21
-7
lines changed

fluent-plugin-kubernetes-log-level.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
33

44
Gem::Specification.new do |spec|
55
spec.name = "fluent-plugin-kubernetes-log-level"
6-
spec.version = "0.1.0"
6+
spec.version = "0.1.1"
77
spec.authors = ["yaron-idan"]
88
spec.email = ["yaronidan@gmail.com"]
99

lib/fluent/plugin/filter_kubernetes_log_level.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,17 @@ def configure(conf)
3131

3232
def level_to_num(level)
3333
case level
34-
when 'trace'
34+
when 'trace', 'Verbose'
3535
10
36-
when 'debug'
36+
when 'debug', 'Debug'
3737
20
38-
when 'info'
38+
when 'info', 'Information'
3939
30
40-
when 'warning'
40+
when 'warning', 'Warning'
4141
40
42-
when 'error'
42+
when 'error', 'Error'
4343
50
44-
when 'fatal'
44+
when 'fatal', 'Fatal'
4545
60
4646
else
4747
0

test/plugin/test_filter_kubernetes_log_level.rb

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,16 @@ class KubernetesLogLevelFilterTest < Test::Unit::TestCase
2727
@expected_static_warning_default = [{
2828
'level' => 'warning'
2929
}]
30+
31+
@expected_warning_serilog = [{
32+
'level' => 'Warning',
33+
'kubernetes' => {
34+
'labels' => {
35+
'logging-level' => 'Warning'
36+
}
37+
}
38+
}]
39+
3040
end
3141

3242
CONFIG = %[
@@ -69,4 +79,8 @@ def test_log_level_lower_then_threshold
6979
def test_static_log
7080
assert_equal @expected_static_warning_default, filter({"level"=>"warning"})
7181
end
82+
83+
def test_serilog_structure
84+
assert_equal @expected_warning_serilog, filter({"level"=>"Warning", "kubernetes"=>{"labels"=>{"logging-level"=>"Warning"}}})
85+
end
7286
end

0 commit comments

Comments
 (0)