fluent-plugin-kubernetes_metadata_filter 2.11.1 → 3.1.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +0 -1
- data/Gemfile.lock +25 -25
- data/README.md +5 -52
- data/doc/benchmark/5m-1-2500lps-256b-baseline-01/cpu.png +0 -0
- data/doc/benchmark/5m-1-2500lps-256b-baseline-01/latency.png +0 -0
- data/doc/benchmark/5m-1-2500lps-256b-baseline-01/loss.png +0 -0
- data/doc/benchmark/5m-1-2500lps-256b-baseline-01/mem.png +0 -0
- data/doc/benchmark/5m-1-2500lps-256b-baseline-01/readme.md +88 -0
- data/doc/benchmark/5m-1-2500lps-256b-baseline-01/results.html +127 -0
- data/doc/benchmark/5m-1-2500lps-256b-kube-01-01/cpu.png +0 -0
- data/doc/benchmark/5m-1-2500lps-256b-kube-01-01/latency.png +0 -0
- data/doc/benchmark/5m-1-2500lps-256b-kube-01-01/loss.png +0 -0
- data/doc/benchmark/5m-1-2500lps-256b-kube-01-01/mem.png +0 -0
- data/doc/benchmark/5m-1-2500lps-256b-kube-01-01/readme.md +97 -0
- data/doc/benchmark/5m-1-2500lps-256b-kube-01-01/results.html +136 -0
- data/doc/benchmark/5m-1-2500lps-256b-kube-01-marshal-02/cpu.png +0 -0
- data/doc/benchmark/5m-1-2500lps-256b-kube-01-marshal-02/latency.png +0 -0
- data/doc/benchmark/5m-1-2500lps-256b-kube-01-marshal-02/loss.png +0 -0
- data/doc/benchmark/5m-1-2500lps-256b-kube-01-marshal-02/mem.png +0 -0
- data/doc/benchmark/5m-1-2500lps-256b-kube-01-marshal-02/readme.md +97 -0
- data/doc/benchmark/5m-1-2500lps-256b-kube-01-marshal-02/results.html +136 -0
- data/fluent-plugin-kubernetes_metadata_filter.gemspec +3 -3
- data/lib/fluent/plugin/filter_kubernetes_metadata.rb +33 -103
- data/lib/fluent/plugin/kubernetes_metadata_cache_strategy.rb +2 -2
- data/lib/fluent/plugin/kubernetes_metadata_common.rb +1 -16
- data/lib/fluent/plugin/kubernetes_metadata_stats.rb +16 -0
- data/lib/fluent/plugin/kubernetes_metadata_util.rb +0 -20
- data/lib/fluent/plugin/kubernetes_metadata_watch_pods.rb +1 -1
- data/test/plugin/test_filter_kubernetes_metadata.rb +23 -420
- metadata +23 -6
- data/test/plugin/test_utils.rb +0 -56
|
@@ -0,0 +1,136 @@
|
|
|
1
|
+
|
|
2
|
+
<html>
|
|
3
|
+
<div>
|
|
4
|
+
<div><b>Options</b><div>
|
|
5
|
+
<div>Image: quay.io/openshift-logging/fluentd:1.14.6</div>
|
|
6
|
+
<div>Total Log Stressors: 1</div>
|
|
7
|
+
<div>Lines Per Second: 2500</div>
|
|
8
|
+
<div>Run Duration: 5m</div>
|
|
9
|
+
<div>Payload Source: synthetic</div>
|
|
10
|
+
</div>
|
|
11
|
+
<div>
|
|
12
|
+
Latency of logs collected based on the time the log was generated and ingested
|
|
13
|
+
</div>
|
|
14
|
+
<table border="1">
|
|
15
|
+
<tr>
|
|
16
|
+
<th>Total</th>
|
|
17
|
+
<th>Size</th>
|
|
18
|
+
<th>Elapsed</th>
|
|
19
|
+
<th>Mean</th>
|
|
20
|
+
<th>Min</th>
|
|
21
|
+
<th>Max</th>
|
|
22
|
+
<th>Median</th>
|
|
23
|
+
</tr>
|
|
24
|
+
<tr>
|
|
25
|
+
<th>Msg</th>
|
|
26
|
+
<th></th>
|
|
27
|
+
<th>(s)</th>
|
|
28
|
+
<th>(s)</th>
|
|
29
|
+
<th>(s)</th>
|
|
30
|
+
<th>(s)</th>
|
|
31
|
+
<th>(s)</th>
|
|
32
|
+
</tr>
|
|
33
|
+
<tr>
|
|
34
|
+
<td>606542</td>
|
|
35
|
+
<td>256</td>
|
|
36
|
+
<td>5m0s</td>
|
|
37
|
+
<td>32.779</td>
|
|
38
|
+
<td>1.295</td>
|
|
39
|
+
<td>75.390</td>
|
|
40
|
+
<td>31.641</td>
|
|
41
|
+
</tr>
|
|
42
|
+
</table>
|
|
43
|
+
<div>
|
|
44
|
+
<img src="cpu.png">
|
|
45
|
+
</div>
|
|
46
|
+
<div>
|
|
47
|
+
<img src="mem.png">
|
|
48
|
+
</div>
|
|
49
|
+
<div>
|
|
50
|
+
<img src="latency.png">
|
|
51
|
+
</div>
|
|
52
|
+
<div>
|
|
53
|
+
<img src="loss.png">
|
|
54
|
+
</div>
|
|
55
|
+
<div>
|
|
56
|
+
<table border="1">
|
|
57
|
+
<tr>
|
|
58
|
+
<th>Stream</th>
|
|
59
|
+
<th>Min Seq</th>
|
|
60
|
+
<th>Max Seq</th>
|
|
61
|
+
<th>Purged</th>
|
|
62
|
+
<th>Collected</th>
|
|
63
|
+
<th>Percent Collected</th>
|
|
64
|
+
</tr>
|
|
65
|
+
<tr>
|
|
66
|
+
<tr><td>loader-0</td><td>0</td><td>606541</td><td>0</td><td>606542</td><td>100.0%</td><tr>
|
|
67
|
+
</table>
|
|
68
|
+
</div>
|
|
69
|
+
<div>
|
|
70
|
+
<code style="display:block;white-space:pre-wrap">
|
|
71
|
+
<system>
|
|
72
|
+
log_level debug
|
|
73
|
+
</system>
|
|
74
|
+
|
|
75
|
+
<source>
|
|
76
|
+
@type tail
|
|
77
|
+
@id container-input
|
|
78
|
+
path /var/log/pods/testhack-cyvquhgi_*/loader-*/*
|
|
79
|
+
exclude_path ["/var/log/pods/**/*/*.gz","/var/log/pods/**/*/*.tmp"]
|
|
80
|
+
pos_file "/var/lib/fluentd/pos/containers-app"
|
|
81
|
+
refresh_interval 5
|
|
82
|
+
rotate_wait 5
|
|
83
|
+
tag kubernetes.*
|
|
84
|
+
read_from_head "true"
|
|
85
|
+
<parse>
|
|
86
|
+
@type regexp
|
|
87
|
+
expression /^(?<@timestamp>[^\s]+) (?<stream>stdout|stderr) (?<logtag>[F|P]) (?<message>.*)$/
|
|
88
|
+
time_format '%Y-%m-%dT%H:%M:%S.%N%:z'
|
|
89
|
+
keep_time_key true
|
|
90
|
+
</parse>
|
|
91
|
+
</source>
|
|
92
|
+
|
|
93
|
+
<filter kubernetes.**>
|
|
94
|
+
@type concat
|
|
95
|
+
key message
|
|
96
|
+
partial_key logtag
|
|
97
|
+
partial_value P
|
|
98
|
+
separator ''
|
|
99
|
+
</filter>
|
|
100
|
+
|
|
101
|
+
<filter kubernetes.**>
|
|
102
|
+
@id kubernetes-metadata
|
|
103
|
+
@type kubernetes_metadata
|
|
104
|
+
kubernetes_url 'https://kubernetes.default.svc'
|
|
105
|
+
annotation_match ["^containerType\.logging\.openshift\.io\/.*$"]
|
|
106
|
+
allow_orphans false
|
|
107
|
+
cache_size '1000'
|
|
108
|
+
use_journal 'nil'
|
|
109
|
+
ssl_partial_chain 'true'
|
|
110
|
+
</filter>
|
|
111
|
+
|
|
112
|
+
<match **>
|
|
113
|
+
@type forward
|
|
114
|
+
heartbeat_type none
|
|
115
|
+
keepalive true
|
|
116
|
+
|
|
117
|
+
<buffer>
|
|
118
|
+
flush_mode interval
|
|
119
|
+
flush_interval 5s
|
|
120
|
+
flush_at_shutdown true
|
|
121
|
+
flush_thread_count 2
|
|
122
|
+
retry_type exponential_backoff
|
|
123
|
+
retry_wait 1s
|
|
124
|
+
retry_max_interval 60s
|
|
125
|
+
retry_forever true
|
|
126
|
+
overflow_action block
|
|
127
|
+
</buffer>
|
|
128
|
+
|
|
129
|
+
<server>
|
|
130
|
+
host 0.0.0.0
|
|
131
|
+
port 24224
|
|
132
|
+
</server>
|
|
133
|
+
</match>
|
|
134
|
+
</code>
|
|
135
|
+
</div>
|
|
136
|
+
</html>
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
|
|
2
|
+
# collector Functionl Benchmark Results
|
|
3
|
+
## Options
|
|
4
|
+
* Image: quay.io/jcantril/fluentd:marshal
|
|
5
|
+
* Total Log Stressors: 1
|
|
6
|
+
* Lines Per Second: 2500
|
|
7
|
+
* Run Duration: 5m
|
|
8
|
+
* Payload Source: synthetic
|
|
9
|
+
|
|
10
|
+
## Latency of logs collected based on the time the log was generated and ingested
|
|
11
|
+
|
|
12
|
+
Total Msg| Size | Elapsed (s) | Mean (s)| Min(s) | Max (s)| Median (s)
|
|
13
|
+
---------|------|-------------|---------|--------|--------|---
|
|
14
|
+
722919|256|5m0s|14.322|1.077|32.992|13.513
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
## Percent logs lost between first and last collected sequence ids
|
|
25
|
+
Stream | Min Seq | Max Seq | Purged | Collected | Percent Collected |
|
|
26
|
+
-------| ---------| --------| -------|-----------|--------------|
|
|
27
|
+
| loader-0|0|722918|0|722919|100.0%
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
## Config
|
|
31
|
+
|
|
32
|
+
```
|
|
33
|
+
<system>
|
|
34
|
+
log_level debug
|
|
35
|
+
</system>
|
|
36
|
+
|
|
37
|
+
<source>
|
|
38
|
+
@type tail
|
|
39
|
+
@id container-input
|
|
40
|
+
path /var/log/pods/testhack-ksowqntt_*/loader-*/*
|
|
41
|
+
exclude_path ["/var/log/pods/**/*/*.gz","/var/log/pods/**/*/*.tmp"]
|
|
42
|
+
pos_file "/var/lib/fluentd/pos/containers-app"
|
|
43
|
+
refresh_interval 5
|
|
44
|
+
rotate_wait 5
|
|
45
|
+
tag kubernetes.*
|
|
46
|
+
read_from_head "true"
|
|
47
|
+
<parse>
|
|
48
|
+
@type regexp
|
|
49
|
+
expression /^(?<@timestamp>[^\s]+) (?<stream>stdout|stderr) (?<logtag>[F|P]) (?<message>.*)$/
|
|
50
|
+
time_format '%Y-%m-%dT%H:%M:%S.%N%:z'
|
|
51
|
+
keep_time_key true
|
|
52
|
+
</parse>
|
|
53
|
+
</source>
|
|
54
|
+
|
|
55
|
+
<filter kubernetes.**>
|
|
56
|
+
@type concat
|
|
57
|
+
key message
|
|
58
|
+
partial_key logtag
|
|
59
|
+
partial_value P
|
|
60
|
+
separator ''
|
|
61
|
+
</filter>
|
|
62
|
+
|
|
63
|
+
<filter kubernetes.**>
|
|
64
|
+
@id kubernetes-metadata
|
|
65
|
+
@type kubernetes_metadata
|
|
66
|
+
kubernetes_url 'https://kubernetes.default.svc'
|
|
67
|
+
annotation_match ["^containerType\.logging\.openshift\.io\/.*$"]
|
|
68
|
+
allow_orphans false
|
|
69
|
+
cache_size '1000'
|
|
70
|
+
use_journal 'nil'
|
|
71
|
+
ssl_partial_chain 'true'
|
|
72
|
+
</filter>
|
|
73
|
+
|
|
74
|
+
<match **>
|
|
75
|
+
@type forward
|
|
76
|
+
heartbeat_type none
|
|
77
|
+
keepalive true
|
|
78
|
+
|
|
79
|
+
<buffer>
|
|
80
|
+
flush_mode interval
|
|
81
|
+
flush_interval 5s
|
|
82
|
+
flush_at_shutdown true
|
|
83
|
+
flush_thread_count 2
|
|
84
|
+
retry_type exponential_backoff
|
|
85
|
+
retry_wait 1s
|
|
86
|
+
retry_max_interval 60s
|
|
87
|
+
retry_forever true
|
|
88
|
+
overflow_action block
|
|
89
|
+
</buffer>
|
|
90
|
+
|
|
91
|
+
<server>
|
|
92
|
+
host 0.0.0.0
|
|
93
|
+
port 24224
|
|
94
|
+
</server>
|
|
95
|
+
</match>
|
|
96
|
+
```
|
|
97
|
+
|
|
@@ -0,0 +1,136 @@
|
|
|
1
|
+
|
|
2
|
+
<html>
|
|
3
|
+
<div>
|
|
4
|
+
<div><b>Options</b><div>
|
|
5
|
+
<div>Image: quay.io/jcantril/fluentd:marshal</div>
|
|
6
|
+
<div>Total Log Stressors: 1</div>
|
|
7
|
+
<div>Lines Per Second: 2500</div>
|
|
8
|
+
<div>Run Duration: 5m</div>
|
|
9
|
+
<div>Payload Source: synthetic</div>
|
|
10
|
+
</div>
|
|
11
|
+
<div>
|
|
12
|
+
Latency of logs collected based on the time the log was generated and ingested
|
|
13
|
+
</div>
|
|
14
|
+
<table border="1">
|
|
15
|
+
<tr>
|
|
16
|
+
<th>Total</th>
|
|
17
|
+
<th>Size</th>
|
|
18
|
+
<th>Elapsed</th>
|
|
19
|
+
<th>Mean</th>
|
|
20
|
+
<th>Min</th>
|
|
21
|
+
<th>Max</th>
|
|
22
|
+
<th>Median</th>
|
|
23
|
+
</tr>
|
|
24
|
+
<tr>
|
|
25
|
+
<th>Msg</th>
|
|
26
|
+
<th></th>
|
|
27
|
+
<th>(s)</th>
|
|
28
|
+
<th>(s)</th>
|
|
29
|
+
<th>(s)</th>
|
|
30
|
+
<th>(s)</th>
|
|
31
|
+
<th>(s)</th>
|
|
32
|
+
</tr>
|
|
33
|
+
<tr>
|
|
34
|
+
<td>722919</td>
|
|
35
|
+
<td>256</td>
|
|
36
|
+
<td>5m0s</td>
|
|
37
|
+
<td>14.322</td>
|
|
38
|
+
<td>1.077</td>
|
|
39
|
+
<td>32.992</td>
|
|
40
|
+
<td>13.513</td>
|
|
41
|
+
</tr>
|
|
42
|
+
</table>
|
|
43
|
+
<div>
|
|
44
|
+
<img src="cpu.png">
|
|
45
|
+
</div>
|
|
46
|
+
<div>
|
|
47
|
+
<img src="mem.png">
|
|
48
|
+
</div>
|
|
49
|
+
<div>
|
|
50
|
+
<img src="latency.png">
|
|
51
|
+
</div>
|
|
52
|
+
<div>
|
|
53
|
+
<img src="loss.png">
|
|
54
|
+
</div>
|
|
55
|
+
<div>
|
|
56
|
+
<table border="1">
|
|
57
|
+
<tr>
|
|
58
|
+
<th>Stream</th>
|
|
59
|
+
<th>Min Seq</th>
|
|
60
|
+
<th>Max Seq</th>
|
|
61
|
+
<th>Purged</th>
|
|
62
|
+
<th>Collected</th>
|
|
63
|
+
<th>Percent Collected</th>
|
|
64
|
+
</tr>
|
|
65
|
+
<tr>
|
|
66
|
+
<tr><td>loader-0</td><td>0</td><td>722918</td><td>0</td><td>722919</td><td>100.0%</td><tr>
|
|
67
|
+
</table>
|
|
68
|
+
</div>
|
|
69
|
+
<div>
|
|
70
|
+
<code style="display:block;white-space:pre-wrap">
|
|
71
|
+
<system>
|
|
72
|
+
log_level debug
|
|
73
|
+
</system>
|
|
74
|
+
|
|
75
|
+
<source>
|
|
76
|
+
@type tail
|
|
77
|
+
@id container-input
|
|
78
|
+
path /var/log/pods/testhack-ksowqntt_*/loader-*/*
|
|
79
|
+
exclude_path ["/var/log/pods/**/*/*.gz","/var/log/pods/**/*/*.tmp"]
|
|
80
|
+
pos_file "/var/lib/fluentd/pos/containers-app"
|
|
81
|
+
refresh_interval 5
|
|
82
|
+
rotate_wait 5
|
|
83
|
+
tag kubernetes.*
|
|
84
|
+
read_from_head "true"
|
|
85
|
+
<parse>
|
|
86
|
+
@type regexp
|
|
87
|
+
expression /^(?<@timestamp>[^\s]+) (?<stream>stdout|stderr) (?<logtag>[F|P]) (?<message>.*)$/
|
|
88
|
+
time_format '%Y-%m-%dT%H:%M:%S.%N%:z'
|
|
89
|
+
keep_time_key true
|
|
90
|
+
</parse>
|
|
91
|
+
</source>
|
|
92
|
+
|
|
93
|
+
<filter kubernetes.**>
|
|
94
|
+
@type concat
|
|
95
|
+
key message
|
|
96
|
+
partial_key logtag
|
|
97
|
+
partial_value P
|
|
98
|
+
separator ''
|
|
99
|
+
</filter>
|
|
100
|
+
|
|
101
|
+
<filter kubernetes.**>
|
|
102
|
+
@id kubernetes-metadata
|
|
103
|
+
@type kubernetes_metadata
|
|
104
|
+
kubernetes_url 'https://kubernetes.default.svc'
|
|
105
|
+
annotation_match ["^containerType\.logging\.openshift\.io\/.*$"]
|
|
106
|
+
allow_orphans false
|
|
107
|
+
cache_size '1000'
|
|
108
|
+
use_journal 'nil'
|
|
109
|
+
ssl_partial_chain 'true'
|
|
110
|
+
</filter>
|
|
111
|
+
|
|
112
|
+
<match **>
|
|
113
|
+
@type forward
|
|
114
|
+
heartbeat_type none
|
|
115
|
+
keepalive true
|
|
116
|
+
|
|
117
|
+
<buffer>
|
|
118
|
+
flush_mode interval
|
|
119
|
+
flush_interval 5s
|
|
120
|
+
flush_at_shutdown true
|
|
121
|
+
flush_thread_count 2
|
|
122
|
+
retry_type exponential_backoff
|
|
123
|
+
retry_wait 1s
|
|
124
|
+
retry_max_interval 60s
|
|
125
|
+
retry_forever true
|
|
126
|
+
overflow_action block
|
|
127
|
+
</buffer>
|
|
128
|
+
|
|
129
|
+
<server>
|
|
130
|
+
host 0.0.0.0
|
|
131
|
+
port 24224
|
|
132
|
+
</server>
|
|
133
|
+
</match>
|
|
134
|
+
</code>
|
|
135
|
+
</div>
|
|
136
|
+
</html>
|
|
@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
|
|
5
5
|
|
|
6
6
|
Gem::Specification.new do |gem|
|
|
7
7
|
gem.name = 'fluent-plugin-kubernetes_metadata_filter'
|
|
8
|
-
gem.version = '
|
|
8
|
+
gem.version = '3.1.1'
|
|
9
9
|
gem.authors = ['OpenShift Cluster Logging','Jimmi Dyson']
|
|
10
10
|
gem.email = ['team-logging@redhat.com','jimmidyson@gmail.com']
|
|
11
11
|
gem.description = 'Filter plugin to add Kubernetes metadata'
|
|
@@ -15,9 +15,9 @@ Gem::Specification.new do |gem|
|
|
|
15
15
|
|
|
16
16
|
gem.files = `git ls-files`.split($/)
|
|
17
17
|
|
|
18
|
-
gem.required_ruby_version = '>= 2.
|
|
18
|
+
gem.required_ruby_version = '>= 2.6.0'
|
|
19
19
|
|
|
20
|
-
gem.add_runtime_dependency 'fluentd', ['>= 0.14.0', '< 1.
|
|
20
|
+
gem.add_runtime_dependency 'fluentd', ['>= 0.14.0', '< 1.16']
|
|
21
21
|
gem.add_runtime_dependency 'kubeclient', ['>= 4.0.0', '< 5.0.0']
|
|
22
22
|
gem.add_runtime_dependency 'lru_redux'
|
|
23
23
|
|
|
@@ -36,7 +36,6 @@ module Fluent::Plugin
|
|
|
36
36
|
|
|
37
37
|
include KubernetesMetadata::CacheStrategy
|
|
38
38
|
include KubernetesMetadata::Common
|
|
39
|
-
include KubernetesMetadata::Util
|
|
40
39
|
include KubernetesMetadata::WatchNamespaces
|
|
41
40
|
include KubernetesMetadata::WatchPods
|
|
42
41
|
|
|
@@ -51,6 +50,8 @@ module Fluent::Plugin
|
|
|
51
50
|
config_param :client_key, :string, default: nil
|
|
52
51
|
config_param :ca_file, :string, default: nil
|
|
53
52
|
config_param :verify_ssl, :bool, default: true
|
|
53
|
+
config_param :open_timeout, :integer, default: 3
|
|
54
|
+
config_param :read_timeout, :integer, default: 10
|
|
54
55
|
|
|
55
56
|
REGEX_VAR_LOG_PODS = '(var\.log\.pods)\.(?<namespace>[^_]+)_(?<pod_name>[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*)_(?<pod_uuid>[a-z0-9-]*)\.(?<container_name>.+)\..*\.log$'
|
|
56
57
|
REGEX_VAR_LOG_CONTAINERS = '(var\.log\.containers)\.(?<pod_name>[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*)_(?<namespace>[^_]+)_(?<container_name>.+)-(?<docker_id>[a-z0-9]{64})\.log$'
|
|
@@ -64,22 +65,6 @@ module Fluent::Plugin
|
|
|
64
65
|
|
|
65
66
|
config_param :bearer_token_file, :string, default: nil
|
|
66
67
|
config_param :secret_dir, :string, default: '/var/run/secrets/kubernetes.io/serviceaccount'
|
|
67
|
-
config_param :de_dot, :bool, default: true
|
|
68
|
-
config_param :de_dot_separator, :string, default: '_'
|
|
69
|
-
config_param :de_slash, :bool, default: false
|
|
70
|
-
config_param :de_slash_separator, :string, default: '__'
|
|
71
|
-
# if reading from the journal, the record will contain the following fields in the following
|
|
72
|
-
# format:
|
|
73
|
-
# CONTAINER_NAME=k8s_$containername.$containerhash_$podname_$namespacename_$poduuid_$rand32bitashex
|
|
74
|
-
# CONTAINER_FULL_ID=dockeridassha256hexvalue
|
|
75
|
-
config_param :use_journal, :bool, default: nil
|
|
76
|
-
# Field 2 is the container_hash, field 5 is the pod_id, and field 6 is the pod_randhex
|
|
77
|
-
# I would have included them as named groups, but you can't have named groups that are
|
|
78
|
-
# non-capturing :P
|
|
79
|
-
# parse format is defined here: https://github.com/kubernetes/kubernetes/blob/release-1.6/pkg/kubelet/dockertools/docker.go#L317
|
|
80
|
-
config_param :container_name_to_kubernetes_regexp,
|
|
81
|
-
:string,
|
|
82
|
-
default: '^(?<name_prefix>[^_]+)_(?<container_name>[^\._]+)(\.(?<container_hash>[^_]+))?_(?<pod_name>[^_]+)_(?<namespace>[^_]+)_[^_]+_[^_]+$'
|
|
83
68
|
|
|
84
69
|
config_param :annotation_match, :array, default: []
|
|
85
70
|
config_param :stats_interval, :integer, default: 30
|
|
@@ -188,14 +173,11 @@ module Fluent::Plugin
|
|
|
188
173
|
|
|
189
174
|
require 'kubeclient'
|
|
190
175
|
require 'lru_redux'
|
|
191
|
-
@stats = KubernetesMetadata::Stats.new
|
|
192
|
-
|
|
193
|
-
if @de_dot && @de_dot_separator.include?('.')
|
|
194
|
-
raise Fluent::ConfigError, "Invalid de_dot_separator: cannot be or contain '.'"
|
|
195
|
-
end
|
|
196
176
|
|
|
197
|
-
|
|
198
|
-
|
|
177
|
+
@stats = KubernetesMetadata::Stats.new
|
|
178
|
+
if @stats_interval <= 0
|
|
179
|
+
@stats = KubernetesMetadata::NoOpStats.new
|
|
180
|
+
self.define_singleton_method(:dump_stats) {}
|
|
199
181
|
end
|
|
200
182
|
|
|
201
183
|
if @cache_ttl < 0
|
|
@@ -214,8 +196,6 @@ module Fluent::Plugin
|
|
|
214
196
|
|
|
215
197
|
@tag_to_kubernetes_name_regexp_compiled = Regexp.compile(@tag_to_kubernetes_name_regexp)
|
|
216
198
|
|
|
217
|
-
@container_name_to_kubernetes_regexp_compiled = Regexp.compile(@container_name_to_kubernetes_regexp)
|
|
218
|
-
|
|
219
199
|
# Use Kubernetes default service account if we're in a pod.
|
|
220
200
|
if @kubernetes_url.nil?
|
|
221
201
|
log.debug 'Kubernetes URL is not set - inspecting environ'
|
|
@@ -304,10 +284,6 @@ module Fluent::Plugin
|
|
|
304
284
|
namespace_thread.abort_on_exception = true
|
|
305
285
|
end
|
|
306
286
|
end
|
|
307
|
-
@time_fields = []
|
|
308
|
-
@time_fields.push('_SOURCE_REALTIME_TIMESTAMP', '__REALTIME_TIMESTAMP') if @use_journal || @use_journal.nil?
|
|
309
|
-
@time_fields.push('time') unless @use_journal
|
|
310
|
-
@time_fields.push('@timestamp') if @lookup_from_k8s_field
|
|
311
287
|
|
|
312
288
|
@annotations_regexps = []
|
|
313
289
|
@annotation_match.each do |regexp|
|
|
@@ -325,6 +301,10 @@ module Fluent::Plugin
|
|
|
325
301
|
@apiVersion,
|
|
326
302
|
ssl_options: @ssl_options,
|
|
327
303
|
auth_options: @auth_options,
|
|
304
|
+
timeouts: {
|
|
305
|
+
open: @open_timeout,
|
|
306
|
+
read: @read_timeout
|
|
307
|
+
},
|
|
328
308
|
as: :parsed_symbolized
|
|
329
309
|
)
|
|
330
310
|
end
|
|
@@ -355,82 +335,32 @@ module Fluent::Plugin
|
|
|
355
335
|
metadata
|
|
356
336
|
end
|
|
357
337
|
|
|
358
|
-
def
|
|
359
|
-
|
|
360
|
-
new_es = Fluent::MultiEventStream.new
|
|
361
|
-
tag_match_data = tag.match(@tag_to_kubernetes_name_regexp_compiled) unless @use_journal
|
|
362
|
-
tag_metadata = nil
|
|
338
|
+
def filter(tag, time, record)
|
|
339
|
+
tag_match_data = tag.match(@tag_to_kubernetes_name_regexp_compiled)
|
|
363
340
|
batch_miss_cache = {}
|
|
364
|
-
|
|
365
|
-
if tag_match_data &&
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
cache_key, create_time_from_record(record, time), batch_miss_cache, docker_id)
|
|
374
|
-
end
|
|
375
|
-
metadata = Marshal.load(Marshal.dump(tag_metadata)) if tag_metadata
|
|
376
|
-
if (@use_journal || @use_journal.nil?) &&
|
|
377
|
-
(j_metadata = get_metadata_for_journal_record(record, time, batch_miss_cache))
|
|
378
|
-
metadata = j_metadata
|
|
379
|
-
end
|
|
380
|
-
if @lookup_from_k8s_field && record.key?('kubernetes') && record.key?('docker') &&
|
|
381
|
-
record['kubernetes'].respond_to?(:has_key?) && record['docker'].respond_to?(:has_key?) &&
|
|
382
|
-
record['kubernetes'].key?('namespace_name') &&
|
|
383
|
-
record['kubernetes'].key?('pod_name') &&
|
|
384
|
-
record['kubernetes'].key?('container_name') &&
|
|
385
|
-
record['docker'].key?('container_id') &&
|
|
386
|
-
(k_metadata = get_metadata_for_record(record['kubernetes']['namespace_name'], record['kubernetes']['pod_name'],
|
|
387
|
-
record['kubernetes']['container_name'], record['docker']['container_id'],
|
|
388
|
-
create_time_from_record(record, time), batch_miss_cache, record['docker']['container_id']))
|
|
389
|
-
metadata = k_metadata
|
|
390
|
-
end
|
|
391
|
-
record = record.merge(metadata) if metadata
|
|
392
|
-
new_es.add(time, record)
|
|
393
|
-
end
|
|
394
|
-
dump_stats
|
|
395
|
-
new_es
|
|
396
|
-
end
|
|
397
|
-
|
|
398
|
-
def get_metadata_for_journal_record(record, time, batch_miss_cache)
|
|
399
|
-
metadata = nil
|
|
400
|
-
if record.key?('CONTAINER_NAME') && record.key?('CONTAINER_ID_FULL')
|
|
401
|
-
metadata = record['CONTAINER_NAME'].match(@container_name_to_kubernetes_regexp_compiled) do |match_data|
|
|
402
|
-
get_metadata_for_record(match_data['namespace'], match_data['pod_name'], match_data['container_name'],
|
|
403
|
-
record['CONTAINER_ID_FULL'], create_time_from_record(record, time), batch_miss_cache, record['CONTAINER_ID_FULL'])
|
|
404
|
-
end
|
|
405
|
-
unless metadata
|
|
406
|
-
log.debug "Error: could not match CONTAINER_NAME from record #{record}"
|
|
407
|
-
@stats.bump(:container_name_match_failed)
|
|
408
|
-
end
|
|
409
|
-
elsif record.key?('CONTAINER_NAME') && record['CONTAINER_NAME'].start_with?('k8s_')
|
|
410
|
-
log.debug "Error: no container name and id in record #{record}"
|
|
411
|
-
@stats.bump(:container_name_id_missing)
|
|
412
|
-
end
|
|
413
|
-
metadata
|
|
414
|
-
end
|
|
415
|
-
|
|
416
|
-
def de_dot!(h)
|
|
417
|
-
h.keys.each do |ref|
|
|
418
|
-
next unless h[ref] && ref =~ /\./
|
|
419
|
-
|
|
420
|
-
v = h.delete(ref)
|
|
421
|
-
newref = ref.to_s.gsub('.', @de_dot_separator)
|
|
422
|
-
h[newref] = v
|
|
341
|
+
if tag_match_data
|
|
342
|
+
cache_key = if tag_match_data.names.include?('pod_uuid') && !tag_match_data['pod_uuid'].nil?
|
|
343
|
+
tag_match_data['pod_uuid']
|
|
344
|
+
else
|
|
345
|
+
tag_match_data['docker_id']
|
|
346
|
+
end
|
|
347
|
+
docker_id = tag_match_data.names.include?('docker_id') ? tag_match_data['docker_id'] : nil
|
|
348
|
+
metadata = get_metadata_for_record(tag_match_data['namespace'], tag_match_data['pod_name'], tag_match_data['container_name'],
|
|
349
|
+
cache_key, time, batch_miss_cache, docker_id)
|
|
423
350
|
end
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
351
|
+
if @lookup_from_k8s_field && record.key?('kubernetes') && record.key?('docker') &&
|
|
352
|
+
record['kubernetes'].respond_to?(:has_key?) && record['docker'].respond_to?(:has_key?) &&
|
|
353
|
+
record['kubernetes'].key?('namespace_name') &&
|
|
354
|
+
record['kubernetes'].key?('pod_name') &&
|
|
355
|
+
record['kubernetes'].key?('container_name') &&
|
|
356
|
+
record['docker'].key?('container_id') &&
|
|
357
|
+
(k_metadata = get_metadata_for_record(record['kubernetes']['namespace_name'], record['kubernetes']['pod_name'],
|
|
358
|
+
record['kubernetes']['container_name'], record['docker']['container_id'],
|
|
359
|
+
time, batch_miss_cache, record['docker']['container_id']))
|
|
360
|
+
metadata = k_metadata
|
|
433
361
|
end
|
|
362
|
+
dump_stats
|
|
363
|
+
metadata ? record.merge(metadata) : record
|
|
434
364
|
end
|
|
435
365
|
|
|
436
366
|
# copied from activesupport
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
#
|
|
21
21
|
module KubernetesMetadata
|
|
22
22
|
module CacheStrategy
|
|
23
|
-
def get_pod_metadata(key, namespace_name, pod_name,
|
|
23
|
+
def get_pod_metadata(key, namespace_name, pod_name, time, batch_miss_cache)
|
|
24
24
|
metadata = {}
|
|
25
25
|
ids = @id_cache[key]
|
|
26
26
|
if ids.nil?
|
|
@@ -44,7 +44,7 @@ module KubernetesMetadata
|
|
|
44
44
|
# pod not found, but namespace found
|
|
45
45
|
@stats.bump(:id_cache_pod_not_found_namespace)
|
|
46
46
|
ns_time = Time.parse(namespace_metadata['creation_timestamp'])
|
|
47
|
-
if ns_time <=
|
|
47
|
+
if ns_time <= Time.at(time.to_f)
|
|
48
48
|
# namespace is older then record for pod
|
|
49
49
|
ids[:pod_id] = key
|
|
50
50
|
metadata = @cache.fetch(ids[:pod_id]) do
|
|
@@ -43,14 +43,7 @@ module KubernetesMetadata
|
|
|
43
43
|
labels = syms_to_strs(namespace_object[:metadata][:labels].to_h) unless @skip_labels
|
|
44
44
|
|
|
45
45
|
annotations = match_annotations(syms_to_strs(namespace_object[:metadata][:annotations].to_h))
|
|
46
|
-
|
|
47
|
-
de_dot!(labels) unless @skip_labels
|
|
48
|
-
de_dot!(annotations)
|
|
49
|
-
end
|
|
50
|
-
if @de_slash
|
|
51
|
-
de_slash!(labels) unless @skip_labels
|
|
52
|
-
de_slash!(annotations)
|
|
53
|
-
end
|
|
46
|
+
|
|
54
47
|
kubernetes_metadata = {
|
|
55
48
|
'namespace_id' => namespace_object[:metadata][:uid],
|
|
56
49
|
'creation_timestamp' => namespace_object[:metadata][:creationTimestamp]
|
|
@@ -65,14 +58,6 @@ module KubernetesMetadata
|
|
|
65
58
|
labels = syms_to_strs(pod_object[:metadata][:labels].to_h) unless @skip_labels
|
|
66
59
|
|
|
67
60
|
annotations = match_annotations(syms_to_strs(pod_object[:metadata][:annotations].to_h))
|
|
68
|
-
if @de_dot
|
|
69
|
-
de_dot!(labels) unless @skip_labels
|
|
70
|
-
de_dot!(annotations)
|
|
71
|
-
end
|
|
72
|
-
if @de_slash
|
|
73
|
-
de_slash!(labels) unless @skip_labels
|
|
74
|
-
de_slash!(annotations)
|
|
75
|
-
end
|
|
76
61
|
|
|
77
62
|
# collect container information
|
|
78
63
|
container_meta = {}
|