fluentd 1.11.1 → 1.12.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of fluentd might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/.github/stale.yml +22 -0
- data/.travis.yml +22 -2
- data/CHANGELOG.md +74 -0
- data/appveyor.yml +3 -0
- data/bin/fluent-cap-ctl +7 -0
- data/example/copy_roundrobin.conf +3 -3
- data/example/counter.conf +1 -1
- data/example/filter_stdout.conf +2 -2
- data/example/{in_dummy_blocks.conf → in_sample_blocks.conf} +4 -4
- data/example/{in_dummy_with_compression.conf → in_sample_with_compression.conf} +3 -3
- data/example/logevents.conf +5 -5
- data/example/multi_filters.conf +1 -1
- data/example/out_exec_filter.conf +2 -2
- data/example/out_forward.conf +1 -1
- data/example/out_forward_buf_file.conf +1 -1
- data/example/out_forward_client.conf +5 -5
- data/example/out_forward_heartbeat_none.conf +1 -1
- data/example/out_forward_sd.conf +1 -1
- data/example/out_forward_shared_key.conf +2 -2
- data/example/out_forward_tls.conf +1 -1
- data/example/out_forward_users.conf +3 -3
- data/example/out_null.conf +4 -4
- data/example/secondary_file.conf +1 -1
- data/fluentd.gemspec +7 -6
- data/lib/fluent/capability.rb +87 -0
- data/lib/fluent/command/cap_ctl.rb +174 -0
- data/lib/fluent/env.rb +4 -0
- data/lib/fluent/log.rb +33 -3
- data/lib/fluent/match.rb +9 -0
- data/lib/fluent/plugin/buffer.rb +32 -42
- data/lib/fluent/plugin/buffer/chunk.rb +2 -1
- data/lib/fluent/plugin/formatter.rb +24 -0
- data/lib/fluent/plugin/formatter_csv.rb +1 -1
- data/lib/fluent/plugin/formatter_hash.rb +3 -1
- data/lib/fluent/plugin/formatter_json.rb +3 -1
- data/lib/fluent/plugin/formatter_ltsv.rb +5 -3
- data/lib/fluent/plugin/formatter_out_file.rb +6 -4
- data/lib/fluent/plugin/formatter_single_value.rb +4 -2
- data/lib/fluent/plugin/formatter_tsv.rb +4 -2
- data/lib/fluent/plugin/in_dummy.rb +2 -123
- data/lib/fluent/plugin/in_exec.rb +4 -2
- data/lib/fluent/plugin/in_http.rb +2 -2
- data/lib/fluent/plugin/in_sample.rb +141 -0
- data/lib/fluent/plugin/in_tail.rb +8 -1
- data/lib/fluent/plugin/out_http.rb +20 -2
- data/lib/fluent/plugin/output.rb +8 -5
- data/lib/fluent/plugin/parser_json.rb +5 -2
- data/lib/fluent/plugin_helper/cert_option.rb +5 -8
- data/lib/fluent/plugin_helper/inject.rb +2 -1
- data/lib/fluent/plugin_helper/socket.rb +1 -1
- data/lib/fluent/supervisor.rb +11 -6
- data/lib/fluent/system_config.rb +2 -1
- data/lib/fluent/version.rb +1 -1
- data/test/command/test_binlog_reader.rb +22 -6
- data/test/command/test_cap_ctl.rb +100 -0
- data/test/plugin/test_buffer.rb +4 -0
- data/test/plugin/test_filter_stdout.rb +6 -1
- data/test/plugin/test_formatter_hash.rb +6 -3
- data/test/plugin/test_formatter_json.rb +14 -4
- data/test/plugin/test_formatter_ltsv.rb +13 -5
- data/test/plugin/test_formatter_out_file.rb +35 -14
- data/test/plugin/test_formatter_single_value.rb +12 -6
- data/test/plugin/test_formatter_tsv.rb +12 -4
- data/test/plugin/test_in_exec.rb +18 -0
- data/test/plugin/{test_in_dummy.rb → test_in_sample.rb} +25 -25
- data/test/plugin/test_in_tail.rb +50 -1
- data/test/plugin/test_out_file.rb +23 -18
- data/test/plugin/test_output.rb +12 -0
- data/test/plugin_helper/data/cert/empty.pem +0 -0
- data/test/plugin_helper/test_cert_option.rb +7 -0
- data/test/plugin_helper/test_compat_parameters.rb +7 -2
- data/test/plugin_helper/test_http_server_helper.rb +5 -0
- data/test/plugin_helper/test_inject.rb +13 -0
- data/test/plugin_helper/test_server.rb +34 -0
- data/test/plugin_helper/test_socket.rb +8 -0
- data/test/test_capability.rb +74 -0
- data/test/test_formatter.rb +34 -10
- data/test/test_log.rb +44 -0
- data/test/test_match.rb +11 -0
- data/test/test_output.rb +6 -1
- data/test/test_static_config_analysis.rb +2 -2
- data/test/test_supervisor.rb +26 -0
- metadata +36 -10
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: ea33aa9fbbca10538b329676df8dc024f38836b8c0a3bd78ff8afe9b21e59a27
|
|
4
|
+
data.tar.gz: d3500418626d7f49305b4dee07ab6dfa10c84687ee754fd967aee1200a815dc2
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 7a43d215a3a026042028643ca627f81411379efe8eb5090c4c98f8886c22efe33595362b82273889b97ecc8a95af8c93d0d2dbf5d8494c3c8e680942dd8c0c67
|
|
7
|
+
data.tar.gz: a17be6c1b92193649412e223ce7bba96d94f1122b309e459dc72a6e7f0a5339874e2a9d9d352a88612c3d7e603c2276b8109af97b8b26cc3967d81cae7925071
|
data/.github/stale.yml
ADDED
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
# Number of days of inactivity before an issue becomes stale
|
|
2
|
+
daysUntilStale: 90
|
|
3
|
+
# Number of days of inactivity before a stale issue is closed
|
|
4
|
+
daysUntilClose: 30
|
|
5
|
+
# Issues with these labels will never be considered stale
|
|
6
|
+
exemptLabels:
|
|
7
|
+
- bug
|
|
8
|
+
- enhancement
|
|
9
|
+
- feature request
|
|
10
|
+
- pending
|
|
11
|
+
- work_in_progress
|
|
12
|
+
- v1
|
|
13
|
+
- v2
|
|
14
|
+
# Label to use when marking an issue as stale
|
|
15
|
+
staleLabel: stale
|
|
16
|
+
# Comment to post when marking an issue as stale. Set to `false` to disable
|
|
17
|
+
markComment: >
|
|
18
|
+
This issue has been automatically marked as stale because it has not had
|
|
19
|
+
recent activity. It will be closed if no further activity occurs. Thank you
|
|
20
|
+
for your contributions.
|
|
21
|
+
# Comment to post when closing a stale issue. Set to `false` to disable
|
|
22
|
+
closeComment: true
|
data/.travis.yml
CHANGED
|
@@ -9,44 +9,63 @@ matrix:
|
|
|
9
9
|
include:
|
|
10
10
|
- rvm: 2.4.9
|
|
11
11
|
os: linux
|
|
12
|
+
env: USE_CAPNG=false
|
|
12
13
|
- rvm: 2.4.9
|
|
13
14
|
os: linux-ppc64le
|
|
15
|
+
env: USE_CAPNG=false
|
|
14
16
|
- rvm: 2.5.7
|
|
15
17
|
os: linux
|
|
18
|
+
env: USE_CAPNG=false
|
|
16
19
|
- rvm: 2.5.7
|
|
17
20
|
os: linux
|
|
18
21
|
arch: s390x
|
|
19
22
|
dist: xenial
|
|
23
|
+
env: USE_CAPNG=false
|
|
20
24
|
- rvm: 2.6.5
|
|
21
25
|
os: linux
|
|
26
|
+
env: USE_CAPNG=false
|
|
27
|
+
- rvm: 2.6.6
|
|
28
|
+
os: linux
|
|
29
|
+
env: USE_CAPNG=true
|
|
22
30
|
- rvm: 2.7.0
|
|
23
31
|
os: linux
|
|
32
|
+
env: USE_CAPNG=false
|
|
24
33
|
- rvm: ruby-head
|
|
25
34
|
os: linux
|
|
35
|
+
env: USE_CAPNG=false
|
|
26
36
|
- rvm: ruby-head
|
|
27
37
|
os: linux-ppc64le
|
|
38
|
+
env: USE_CAPNG=false
|
|
28
39
|
- rvm: 2.4.6
|
|
29
40
|
os: osx
|
|
30
41
|
osx_image: xcode8.3 # OSX 10.12
|
|
42
|
+
env: USE_CAPNG=false
|
|
31
43
|
- rvm: ruby-head
|
|
32
44
|
os: osx
|
|
33
45
|
osx_image: xcode8.3 # OSX 10.12
|
|
46
|
+
env: USE_CAPNG=false
|
|
34
47
|
allow_failures:
|
|
35
48
|
- rvm: 2.4.6
|
|
36
49
|
os: osx
|
|
37
50
|
osx_image: xcode8.3
|
|
51
|
+
env: USE_CAPNG=false
|
|
38
52
|
- rvm: 2.5.7
|
|
39
53
|
os: linux
|
|
40
54
|
arch: s390x
|
|
41
55
|
dist: xenial
|
|
56
|
+
env: USE_CAPNG=false
|
|
42
57
|
- rvm: ruby-head
|
|
58
|
+
env: USE_CAPNG=false
|
|
43
59
|
|
|
44
60
|
branches:
|
|
45
61
|
only:
|
|
46
62
|
- master
|
|
47
63
|
|
|
48
|
-
before_install:
|
|
49
|
-
|
|
64
|
+
before_install: |
|
|
65
|
+
gem update --system=3.1.2
|
|
66
|
+
if [[ x"${USE_CAPNG}" == "xtrue" ]]; then
|
|
67
|
+
echo 'gem "capng_c"' >> Gemfile.local
|
|
68
|
+
fi
|
|
50
69
|
|
|
51
70
|
sudo: false
|
|
52
71
|
dist: trusty # for TLSv1.2 support
|
|
@@ -55,3 +74,4 @@ addons:
|
|
|
55
74
|
apt:
|
|
56
75
|
packages:
|
|
57
76
|
- libgmp3-dev
|
|
77
|
+
- libcap-ng-dev
|
data/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,79 @@
|
|
|
1
1
|
# v1.11
|
|
2
2
|
|
|
3
|
+
## Release v1.11.5 - 2020/11/06
|
|
4
|
+
|
|
5
|
+
### Enhancement
|
|
6
|
+
|
|
7
|
+
* formatter: Provide `newline` parameter to support `CRLF`
|
|
8
|
+
https://github.com/fluent/fluentd/pull/3152
|
|
9
|
+
* out_http: adding support for intermediate certificates
|
|
10
|
+
https://github.com/fluent/fluentd/pull/3146
|
|
11
|
+
* Update serverengine dependency to 2.2.2 or later
|
|
12
|
+
|
|
13
|
+
### Bug fix
|
|
14
|
+
|
|
15
|
+
* Fix a bug that windows service isn't stopped gracefuly
|
|
16
|
+
https://github.com/fluent/fluentd/pull/3156
|
|
17
|
+
|
|
18
|
+
## Release v1.11.4 - 2020/10/13
|
|
19
|
+
|
|
20
|
+
### Enhancement
|
|
21
|
+
|
|
22
|
+
* inject: Support `unixtime_millis` in `time_type` parameter
|
|
23
|
+
https://github.com/fluent/fluentd/pull/3145
|
|
24
|
+
|
|
25
|
+
### Bug fix
|
|
26
|
+
|
|
27
|
+
* out_http: Fix broken data with `json_array true`
|
|
28
|
+
https://github.com/fluent/fluentd/pull/3144
|
|
29
|
+
* output: Fix wrong logging issue for `${chunk_id}`
|
|
30
|
+
https://github.com/fluent/fluentd/pull/3134
|
|
31
|
+
|
|
32
|
+
## Release v1.11.3 - 2020/09/30
|
|
33
|
+
|
|
34
|
+
### Enhancement
|
|
35
|
+
|
|
36
|
+
* in_exec: Add `connect_mode` parameter to read stderr
|
|
37
|
+
https://github.com/fluent/fluentd/pull/3108
|
|
38
|
+
* parser_json: Improve the performance
|
|
39
|
+
https://github.com/fluent/fluentd/pull/3109
|
|
40
|
+
* log: Add `ignore_same_log_interval` parameter
|
|
41
|
+
https://github.com/fluent/fluentd/pull/3119
|
|
42
|
+
* Upgrade win32 gems
|
|
43
|
+
https://github.com/fluent/fluentd/pull/3100
|
|
44
|
+
* Refactoring code
|
|
45
|
+
https://github.com/fluent/fluentd/pull/3094
|
|
46
|
+
https://github.com/fluent/fluentd/pull/3118
|
|
47
|
+
|
|
48
|
+
### Bug fix
|
|
49
|
+
|
|
50
|
+
* buffer: Fix calculation of timekey stats
|
|
51
|
+
https://github.com/fluent/fluentd/pull/3018
|
|
52
|
+
* buffer: fix binmode usage for prevent gc
|
|
53
|
+
https://github.com/fluent/fluentd/pull/3138
|
|
54
|
+
|
|
55
|
+
## Release v1.11.2 - 2020/08/04
|
|
56
|
+
|
|
57
|
+
### Enhancement
|
|
58
|
+
|
|
59
|
+
* `in_dummy` renamed to `in_sample`
|
|
60
|
+
https://github.com/fluent/fluentd/pull/3065
|
|
61
|
+
* Allow regular expression in filter/match directive
|
|
62
|
+
https://github.com/fluent/fluentd/pull/3071
|
|
63
|
+
* Refactoring code
|
|
64
|
+
https://github.com/fluent/fluentd/pull/3051
|
|
65
|
+
|
|
66
|
+
### Bug fix
|
|
67
|
+
|
|
68
|
+
* buffer: Fix log message for `chunk_limit_records` case
|
|
69
|
+
https://github.com/fluent/fluentd/pull/3079
|
|
70
|
+
* buffer: Fix timekey optimization for non-windows platform
|
|
71
|
+
https://github.com/fluent/fluentd/pull/3092
|
|
72
|
+
* cert: Raise an error for broken certificate file
|
|
73
|
+
https://github.com/fluent/fluentd/pull/3086
|
|
74
|
+
* cert: Set TLS ciphers list correcty on older OpenSSL
|
|
75
|
+
https://github.com/fluent/fluentd/pull/3093
|
|
76
|
+
|
|
3
77
|
## Release v1.11.1 - 2020/06/22
|
|
4
78
|
|
|
5
79
|
### Enhancement
|
data/appveyor.yml
CHANGED
|
@@ -7,6 +7,9 @@ install:
|
|
|
7
7
|
- SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
|
|
8
8
|
- ruby --version
|
|
9
9
|
- gem --version
|
|
10
|
+
# stay 0.14.0 for Windows CI until https://github.com/socketry/protocol-http2/issues/6 will be fixed
|
|
11
|
+
- ps: Write-Output "gem 'protocol-http2', ['<= 0.14.0']" | Out-File -FilePath Gemfile.local -Encoding default
|
|
12
|
+
- type Gemfile.local
|
|
10
13
|
- ridk.cmd exec bundle install
|
|
11
14
|
build: off
|
|
12
15
|
test_script:
|
data/bin/fluent-cap-ctl
ADDED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
<source>
|
|
2
|
-
@type
|
|
2
|
+
@type sample
|
|
3
3
|
@label @test
|
|
4
4
|
tag test.copy
|
|
5
5
|
auto_increment_key id
|
|
6
6
|
</source>
|
|
7
7
|
|
|
8
8
|
<source>
|
|
9
|
-
@type
|
|
9
|
+
@type sample
|
|
10
10
|
@label @test
|
|
11
11
|
tag test.rr
|
|
12
12
|
auto_increment_key id
|
|
@@ -36,4 +36,4 @@
|
|
|
36
36
|
output_type ltsv
|
|
37
37
|
</store>
|
|
38
38
|
</match>
|
|
39
|
-
</label>
|
|
39
|
+
</label>
|
data/example/counter.conf
CHANGED
data/example/filter_stdout.conf
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
<source>
|
|
2
|
-
@type
|
|
3
|
-
tag
|
|
2
|
+
@type sample
|
|
3
|
+
tag sample
|
|
4
4
|
rate 100
|
|
5
|
-
|
|
5
|
+
sample {"message":"yaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaay"}
|
|
6
6
|
</source>
|
|
7
7
|
|
|
8
|
-
<match
|
|
8
|
+
<match sample>
|
|
9
9
|
@type null
|
|
10
10
|
never_flush true
|
|
11
11
|
<buffer>
|
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
<source>
|
|
2
|
-
@type
|
|
2
|
+
@type sample
|
|
3
3
|
@label @main
|
|
4
4
|
tag "test.data"
|
|
5
5
|
size 2
|
|
6
6
|
rate 10
|
|
7
|
-
|
|
7
|
+
sample {"message":"yaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaay"}
|
|
8
8
|
auto_increment_key number
|
|
9
9
|
</source>
|
|
10
10
|
|
|
11
11
|
<label @main>
|
|
12
12
|
<match test.data>
|
|
13
|
-
@type
|
|
13
|
+
@type stdout
|
|
14
14
|
<buffer>
|
|
15
15
|
@type file
|
|
16
16
|
path "#{Dir.pwd}/compressed_buffers"
|
data/example/logevents.conf
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
<source>
|
|
2
|
-
@type
|
|
3
|
-
@label @
|
|
2
|
+
@type sample
|
|
3
|
+
@label @samplelog
|
|
4
4
|
tag "data"
|
|
5
|
-
|
|
5
|
+
sample {"message":"yay"}
|
|
6
6
|
</source>
|
|
7
|
-
<label @
|
|
7
|
+
<label @samplelog>
|
|
8
8
|
<match **>
|
|
9
9
|
@type stdout
|
|
10
10
|
</match>
|
|
@@ -22,4 +22,4 @@
|
|
|
22
22
|
# hostname_key "host"
|
|
23
23
|
# </inject>
|
|
24
24
|
# </match>
|
|
25
|
-
</label>
|
|
25
|
+
</label>
|
data/example/multi_filters.conf
CHANGED
data/example/out_forward.conf
CHANGED
|
@@ -1,21 +1,21 @@
|
|
|
1
1
|
<source>
|
|
2
|
-
@type
|
|
2
|
+
@type sample
|
|
3
3
|
tag test
|
|
4
4
|
</source>
|
|
5
5
|
<source>
|
|
6
|
-
@type
|
|
6
|
+
@type sample
|
|
7
7
|
tag test2
|
|
8
8
|
</source>
|
|
9
9
|
<source>
|
|
10
|
-
@type
|
|
10
|
+
@type sample
|
|
11
11
|
tag test3
|
|
12
12
|
</source>
|
|
13
13
|
<source>
|
|
14
|
-
@type
|
|
14
|
+
@type sample
|
|
15
15
|
tag test4
|
|
16
16
|
</source>
|
|
17
17
|
<source>
|
|
18
|
-
@type
|
|
18
|
+
@type sample
|
|
19
19
|
tag test5
|
|
20
20
|
</source>
|
|
21
21
|
|
data/example/out_forward_sd.conf
CHANGED
data/example/out_null.conf
CHANGED
|
@@ -2,17 +2,17 @@
|
|
|
2
2
|
# bundle exec bin/fluentd -c example/out_buffered_null.conf
|
|
3
3
|
# (+ --emit-error-log-interval 10)
|
|
4
4
|
<source>
|
|
5
|
-
@type
|
|
6
|
-
tag
|
|
5
|
+
@type sample
|
|
6
|
+
tag sample
|
|
7
7
|
rate 500000000
|
|
8
|
-
|
|
8
|
+
sample [
|
|
9
9
|
{"message": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"},
|
|
10
10
|
{"message": "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"},
|
|
11
11
|
{"message": "ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"}
|
|
12
12
|
]
|
|
13
13
|
</source>
|
|
14
14
|
|
|
15
|
-
<match
|
|
15
|
+
<match sample.**>
|
|
16
16
|
@type null
|
|
17
17
|
<buffer>
|
|
18
18
|
flush_interval 60s
|