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

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 623defbb213ab566ae41a346e8832e6cc55e219f
4
- data.tar.gz: 22347efa354f456863a5edec29c1d7564b003fa3
3
+ metadata.gz: fa5fbdac4fd2fb30a485ec9778a610236ff8ca45
4
+ data.tar.gz: 28eecfbe678c87ece3dc3410d26d7a6a5696f0b5
5
5
  SHA512:
6
- metadata.gz: 4817d5557836d941f5f32bdaf8f88ebe135367b82e1610fe16c8c363f3facfbac4944be0d75613968dad52647dcf2623bd7d06f1cfb0210a2206ecb2df4e2945
7
- data.tar.gz: 197a2edb5fa253e4b8b735046802054b72c1869e323436494731b740f53d06c9998813792dbdebbbea9acd68d916e202bdd882af5fe220d9f6da73009ede3ab2
6
+ metadata.gz: 07f6c6347ab0742a03841ed9fb727818b1857bf3975a930a2d5a074900a4a2ce9a1edeef7c05a81aa51711253f44f4db4e95963403e3ffe93165190bca734464
7
+ data.tar.gz: 03d6fa7591ced17ecdde113a3939dfe169683d9b325710e0e54253583879366e39d0db69df6ca9e5d8ff2d1095f6fa462f2ad1647e49a4bd00a874865fbc1c04
@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
3
3
 
4
4
  Gem::Specification.new do |spec|
5
5
  spec.name = "fluent-plugin-kubernetes-log-level"
6
- spec.version = "0.1.3"
6
+ spec.version = "0.1.4"
7
7
  spec.authors = ["yaron-idan"]
8
8
  spec.email = ["yaronidan@gmail.com"]
9
9
 
@@ -55,7 +55,7 @@ module Fluent
55
55
  if record.has_key?("kubernetes")
56
56
  if record["kubernetes"].has_key?("labels")
57
57
  if record["kubernetes"]["labels"].has_key?(@log_level_label)
58
- log.debug "kubernetes.labels.logging-level found with the value #{record['kubernetes']['labels'][@log_level_label]}"
58
+ log.debug "[App: #{record['kubernetes']['labels']['app']}]: kubernetes.labels.logging-level found with the value #{record['kubernetes']['labels'][@log_level_label]}"
59
59
  numeric_logging_level = level_to_num(record['kubernetes']['labels'][@log_level_label])
60
60
  is_logging_label_exist = true
61
61
  end
@@ -65,26 +65,26 @@ module Fluent
65
65
  log.trace "Check for logging level existence"
66
66
  if is_logging_label_exist == false
67
67
  log.debug "No logging-level label was found"
68
- if @default_logging_level.nil?
68
+ if @default_logging_level.nil?
69
69
  record
70
70
  else
71
71
  numeric_logging_level = level_to_num(@default_logging_level)
72
- log.debug "Logging level set to #{@default_logging_level}"
72
+ log.debug "[App: #{record['kubernetes']['labels']['app']}]: Logging level set to #{@default_logging_level}"
73
73
  end
74
74
  end
75
75
 
76
76
  log.trace "Process current log level"
77
77
  if record.has_key?(@log_level_key.capitalize)
78
- log.debug "Downcasing capitalized log_level from #{@log_level_key.capitalize}"
78
+ log.debug "[App: #{record['kubernetes']['labels']['app']}]: Downcasing capitalized log_level from #{@log_level_key.capitalize}"
79
79
  record[@log_level_key] = record[@log_level_key.capitalize]
80
80
  end
81
81
 
82
82
  numeric_level = level_to_num(record[@log_level_key])
83
83
  if numeric_level >= numeric_logging_level
84
- log.debug "Emitting record with #{record[@log_level_key]} level"
84
+ log.debug "[App: #{record['kubernetes']['labels']['app']}]: Emitting record with #{record[@log_level_key]} level"
85
85
  record
86
86
  else
87
- log.debug "Dropping record with #{record[@log_level_key]} level"
87
+ log.debug "[App: #{record['kubernetes']['labels']['app']}]: Dropping record with #{record[@log_level_key]} level"
88
88
  nil
89
89
  end
90
90
  end
@@ -8,7 +8,8 @@ class KubernetesLogLevelFilterTest < Test::Unit::TestCase
8
8
  'level' => 'warning',
9
9
  'kubernetes' => {
10
10
  'labels' => {
11
- 'logging-level' => 'warning'
11
+ 'logging-level' => 'warning',
12
+ 'app' => 'demo'
12
13
  }
13
14
  }
14
15
  }]
@@ -17,7 +18,8 @@ class KubernetesLogLevelFilterTest < Test::Unit::TestCase
17
18
  'level' => 'error',
18
19
  'kubernetes' => {
19
20
  'labels' => {
20
- 'logging-level' => 'warning'
21
+ 'logging-level' => 'warning',
22
+ 'app' => 'demo'
21
23
  }
22
24
  }
23
25
  }]
@@ -25,20 +27,31 @@ class KubernetesLogLevelFilterTest < Test::Unit::TestCase
25
27
  @expected_info = []
26
28
 
27
29
  @expected_static_warning_default = [{
28
- 'level' => 'warning'
30
+ 'level' => 'warning',
31
+ 'kubernetes' => {
32
+ 'labels' => {
33
+ 'app' => 'demo'
34
+ }
35
+ }
29
36
  }]
30
37
 
31
38
 
32
39
  @expected_static_capital_level = [{
33
40
  'Level' => 'Warning',
34
- 'level' => 'Warning'
41
+ 'level' => 'Warning',
42
+ 'kubernetes' => {
43
+ 'labels' => {
44
+ 'app' => 'demo'
45
+ }
46
+ }
35
47
  }]
36
48
 
37
49
  @expected_warning_serilog = [{
38
50
  'level' => 'Warning',
39
51
  'kubernetes' => {
40
52
  'labels' => {
41
- 'logging-level' => 'Warning'
53
+ 'logging-level' => 'Warning',
54
+ 'app' => 'demo'
42
55
  }
43
56
  }
44
57
  }]
@@ -70,26 +83,22 @@ class KubernetesLogLevelFilterTest < Test::Unit::TestCase
70
83
  end
71
84
 
72
85
  def test_log_level_higher_then_threshold
73
- assert_equal @expected_error, filter({"level"=>"error", "kubernetes"=>{"labels"=>{"logging-level"=>"warning"}}})
86
+ assert_equal @expected_error, filter({"level"=>"error", "kubernetes"=>{"labels"=>{"logging-level"=>"warning","app"=>"demo"}}})
74
87
  end
75
88
 
76
89
  def test_log_level_equal_to_threshold
77
- assert_equal @expected_warning, filter({"level"=>"warning", "kubernetes"=>{"labels"=>{"logging-level"=>"warning"}}})
90
+ assert_equal @expected_warning, filter({"level"=>"warning", "kubernetes"=>{"labels"=>{"logging-level"=>"warning","app"=>"demo"}}})
78
91
  end
79
92
 
80
93
  def test_log_level_lower_then_threshold
81
- assert_equal @expected_info, filter({"level"=>"info", "kubernetes"=>{"labels"=>{"logging-level"=>"warning"}}})
94
+ assert_equal @expected_info, filter({"level"=>"info", "kubernetes"=>{"labels"=>{"logging-level"=>"warning","app"=>"demo"}}})
82
95
  end
83
96
 
84
97
  def test_static_log
85
- assert_equal @expected_static_warning_default, filter({"level"=>"warning"})
86
- end
87
-
88
- def test_insensitive_level_key
89
- assert_equal @expected_static_capital_level, filter({"Level"=>"Warning"})
98
+ assert_equal @expected_static_warning_default, filter({"level"=>"warning", "kubernetes"=>{"labels"=>{"app"=>"demo"}}})
90
99
  end
91
100
 
92
101
  def test_serilog_structure
93
- assert_equal @expected_static_capital_level, filter({"Level"=>"Warning"})
102
+ assert_equal @expected_static_capital_level, filter({"Level"=>"Warning", "kubernetes"=>{"labels"=>{"app"=>"demo"}}})
94
103
  end
95
104
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fluent-plugin-kubernetes-log-level
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.3
4
+ version: 0.1.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - yaron-idan
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-06-17 00:00:00.000000000 Z
11
+ date: 2018-06-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler