fluentd 1.16.6 → 1.17.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.github/DISCUSSION_TEMPLATE/q-a-japanese.yml +50 -0
- data/.github/DISCUSSION_TEMPLATE/q-a.yml +47 -0
- data/.github/workflows/test-ruby-head.yml +31 -0
- data/.github/workflows/test.yml +2 -8
- data/CHANGELOG.md +36 -12
- data/README.md +1 -1
- data/Rakefile +1 -1
- data/fluentd.gemspec +10 -5
- data/lib/fluent/command/binlog_reader.rb +1 -1
- data/lib/fluent/command/fluentd.rb +1 -1
- data/lib/fluent/config/configure_proxy.rb +2 -2
- data/lib/fluent/config/types.rb +1 -1
- data/lib/fluent/config/yaml_parser/parser.rb +0 -4
- data/lib/fluent/configurable.rb +2 -2
- data/lib/fluent/counter/mutex_hash.rb +1 -1
- data/lib/fluent/fluent_log_event_router.rb +0 -2
- data/lib/fluent/plugin/buf_file.rb +1 -1
- data/lib/fluent/plugin/buffer/file_chunk.rb +1 -1
- data/lib/fluent/plugin/buffer/file_single_chunk.rb +2 -3
- data/lib/fluent/plugin/filter_parser.rb +26 -8
- data/lib/fluent/plugin/in_http.rb +18 -53
- data/lib/fluent/plugin/in_tail.rb +34 -2
- data/lib/fluent/plugin/out_file.rb +0 -8
- data/lib/fluent/plugin/out_http.rb +125 -13
- data/lib/fluent/plugin/owned_by_mixin.rb +0 -1
- data/lib/fluent/plugin/parser_json.rb +34 -9
- data/lib/fluent/plugin/parser_msgpack.rb +24 -3
- data/lib/fluent/plugin_helper/metrics.rb +2 -2
- data/lib/fluent/registry.rb +6 -6
- data/lib/fluent/test/output_test.rb +1 -1
- data/lib/fluent/unique_id.rb +1 -1
- data/lib/fluent/version.rb +1 -1
- data/test/command/test_fluentd.rb +9 -56
- data/test/log/test_console_adapter.rb +10 -3
- data/test/plugin/data/log_numeric/01.log +0 -0
- data/test/plugin/data/log_numeric/02.log +0 -0
- data/test/plugin/data/log_numeric/12.log +0 -0
- data/test/plugin/data/log_numeric/14.log +0 -0
- data/test/plugin/in_tail/test_io_handler.rb +14 -13
- data/test/plugin/in_tail/test_position_file.rb +7 -6
- data/test/plugin/test_in_http.rb +23 -1
- data/test/plugin/test_in_tail.rb +141 -0
- data/test/plugin/test_out_file.rb +1 -21
- data/test/plugin/test_out_http.rb +128 -0
- data/test/plugin/test_owned_by.rb +0 -1
- data/test/plugin/test_parser_json.rb +106 -31
- data/test/plugin/test_parser_msgpack.rb +127 -0
- data/test/plugin/test_storage.rb +0 -1
- data/test/plugin_helper/test_child_process.rb +4 -4
- data/test/test_config.rb +0 -6
- metadata +99 -16
|
@@ -569,7 +569,7 @@ class ChildProcessTest < Test::Unit::TestCase
|
|
|
569
569
|
unless Fluent.windows?
|
|
570
570
|
test 'can specify subprocess name' do
|
|
571
571
|
io = IO.popen([["cat", "caaaaaaaaaaat"], '-'])
|
|
572
|
-
process_naming_enabled = (
|
|
572
|
+
process_naming_enabled = (IO.popen(["ps", "opid,cmd"]){|_io| _io.readlines }.count{|line| line.include?("caaaaaaaaaaat") } > 0)
|
|
573
573
|
Process.kill(:TERM, io.pid) rescue nil
|
|
574
574
|
io.close rescue nil
|
|
575
575
|
|
|
@@ -586,7 +586,7 @@ class ChildProcessTest < Test::Unit::TestCase
|
|
|
586
586
|
m.lock
|
|
587
587
|
ran = true
|
|
588
588
|
pids << @d.child_process_id
|
|
589
|
-
proc_lines +=
|
|
589
|
+
proc_lines += IO.popen(["ps", "opid,cmd"]){|_io| _io.readlines }
|
|
590
590
|
m.unlock
|
|
591
591
|
readio.read
|
|
592
592
|
end
|
|
@@ -645,8 +645,8 @@ class ChildProcessTest < Test::Unit::TestCase
|
|
|
645
645
|
unless Fluent.windows?
|
|
646
646
|
test 'can change working directory' do
|
|
647
647
|
# check my real /tmp directory (for mac)
|
|
648
|
-
cmd =
|
|
649
|
-
mytmpdir =
|
|
648
|
+
cmd = ['ruby', '-e', 'Dir.chdir("/tmp"); puts Dir.pwd']
|
|
649
|
+
mytmpdir = IO.popen(cmd){|io| io.read.chomp }
|
|
650
650
|
|
|
651
651
|
m = Mutex.new
|
|
652
652
|
str = nil
|
data/test/test_config.rb
CHANGED
|
@@ -167,7 +167,6 @@ class ConfigTest < Test::Unit::TestCase
|
|
|
167
167
|
tag: tag.dummy
|
|
168
168
|
- source:
|
|
169
169
|
$type: tcp
|
|
170
|
-
$log_level: info
|
|
171
170
|
tag: tag.tcp
|
|
172
171
|
parse:
|
|
173
172
|
$arg:
|
|
@@ -177,7 +176,6 @@ class ConfigTest < Test::Unit::TestCase
|
|
|
177
176
|
- match:
|
|
178
177
|
$tag: tag.*
|
|
179
178
|
$type: stdout
|
|
180
|
-
$log_level: debug
|
|
181
179
|
buffer:
|
|
182
180
|
$type: memory
|
|
183
181
|
flush_interval: 1s
|
|
@@ -210,12 +208,10 @@ class ConfigTest < Test::Unit::TestCase
|
|
|
210
208
|
'tag.dummy',
|
|
211
209
|
'tcp',
|
|
212
210
|
'tag.tcp',
|
|
213
|
-
'info',
|
|
214
211
|
'none',
|
|
215
212
|
'why.parse.section.doesnot.have.arg,huh',
|
|
216
213
|
'stdout',
|
|
217
214
|
'tag.*',
|
|
218
|
-
'debug',
|
|
219
215
|
'null',
|
|
220
216
|
'**',
|
|
221
217
|
'@FLUENT_LOG',
|
|
@@ -228,12 +224,10 @@ class ConfigTest < Test::Unit::TestCase
|
|
|
228
224
|
dummy_source_conf['tag'],
|
|
229
225
|
tcp_source_conf['@type'],
|
|
230
226
|
tcp_source_conf['tag'],
|
|
231
|
-
tcp_source_conf['@log_level'],
|
|
232
227
|
parse_tcp_conf['@type'],
|
|
233
228
|
parse_tcp_conf.arg,
|
|
234
229
|
match_conf['@type'],
|
|
235
230
|
match_conf.arg,
|
|
236
|
-
match_conf['@log_level'],
|
|
237
231
|
fluent_log_conf['@type'],
|
|
238
232
|
fluent_log_conf.arg,
|
|
239
233
|
label_conf.arg,
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: fluentd
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.
|
|
4
|
+
version: 1.17.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Sadayuki Furuhashi
|
|
8
|
-
autorequire:
|
|
8
|
+
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2024-
|
|
11
|
+
date: 2024-04-30 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|
|
@@ -201,19 +201,47 @@ dependencies:
|
|
|
201
201
|
- !ruby/object:Gem::Version
|
|
202
202
|
version: '1.4'
|
|
203
203
|
- !ruby/object:Gem::Dependency
|
|
204
|
-
name:
|
|
204
|
+
name: base64
|
|
205
205
|
requirement: !ruby/object:Gem::Requirement
|
|
206
206
|
requirements:
|
|
207
|
-
- - "
|
|
207
|
+
- - "~>"
|
|
208
208
|
- !ruby/object:Gem::Version
|
|
209
|
-
version: '
|
|
209
|
+
version: '0.2'
|
|
210
210
|
type: :runtime
|
|
211
211
|
prerelease: false
|
|
212
212
|
version_requirements: !ruby/object:Gem::Requirement
|
|
213
213
|
requirements:
|
|
214
|
-
- - "
|
|
214
|
+
- - "~>"
|
|
215
|
+
- !ruby/object:Gem::Version
|
|
216
|
+
version: '0.2'
|
|
217
|
+
- !ruby/object:Gem::Dependency
|
|
218
|
+
name: csv
|
|
219
|
+
requirement: !ruby/object:Gem::Requirement
|
|
220
|
+
requirements:
|
|
221
|
+
- - "~>"
|
|
222
|
+
- !ruby/object:Gem::Version
|
|
223
|
+
version: '3.2'
|
|
224
|
+
type: :runtime
|
|
225
|
+
prerelease: false
|
|
226
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
227
|
+
requirements:
|
|
228
|
+
- - "~>"
|
|
229
|
+
- !ruby/object:Gem::Version
|
|
230
|
+
version: '3.2'
|
|
231
|
+
- !ruby/object:Gem::Dependency
|
|
232
|
+
name: drb
|
|
233
|
+
requirement: !ruby/object:Gem::Requirement
|
|
234
|
+
requirements:
|
|
235
|
+
- - "~>"
|
|
236
|
+
- !ruby/object:Gem::Version
|
|
237
|
+
version: '2.2'
|
|
238
|
+
type: :runtime
|
|
239
|
+
prerelease: false
|
|
240
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
241
|
+
requirements:
|
|
242
|
+
- - "~>"
|
|
215
243
|
- !ruby/object:Gem::Version
|
|
216
|
-
version: '
|
|
244
|
+
version: '2.2'
|
|
217
245
|
- !ruby/object:Gem::Dependency
|
|
218
246
|
name: rake
|
|
219
247
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -288,16 +316,16 @@ dependencies:
|
|
|
288
316
|
name: timecop
|
|
289
317
|
requirement: !ruby/object:Gem::Requirement
|
|
290
318
|
requirements:
|
|
291
|
-
- - "
|
|
319
|
+
- - "~>"
|
|
292
320
|
- !ruby/object:Gem::Version
|
|
293
|
-
version: 0.9
|
|
321
|
+
version: '0.9'
|
|
294
322
|
type: :development
|
|
295
323
|
prerelease: false
|
|
296
324
|
version_requirements: !ruby/object:Gem::Requirement
|
|
297
325
|
requirements:
|
|
298
|
-
- - "
|
|
326
|
+
- - "~>"
|
|
299
327
|
- !ruby/object:Gem::Version
|
|
300
|
-
version: 0.9
|
|
328
|
+
version: '0.9'
|
|
301
329
|
- !ruby/object:Gem::Dependency
|
|
302
330
|
name: test-unit
|
|
303
331
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -374,6 +402,48 @@ dependencies:
|
|
|
374
402
|
- - ">="
|
|
375
403
|
- !ruby/object:Gem::Version
|
|
376
404
|
version: 0.50.0
|
|
405
|
+
- !ruby/object:Gem::Dependency
|
|
406
|
+
name: aws-sigv4
|
|
407
|
+
requirement: !ruby/object:Gem::Requirement
|
|
408
|
+
requirements:
|
|
409
|
+
- - "~>"
|
|
410
|
+
- !ruby/object:Gem::Version
|
|
411
|
+
version: '1.8'
|
|
412
|
+
type: :development
|
|
413
|
+
prerelease: false
|
|
414
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
415
|
+
requirements:
|
|
416
|
+
- - "~>"
|
|
417
|
+
- !ruby/object:Gem::Version
|
|
418
|
+
version: '1.8'
|
|
419
|
+
- !ruby/object:Gem::Dependency
|
|
420
|
+
name: aws-sdk-core
|
|
421
|
+
requirement: !ruby/object:Gem::Requirement
|
|
422
|
+
requirements:
|
|
423
|
+
- - "~>"
|
|
424
|
+
- !ruby/object:Gem::Version
|
|
425
|
+
version: '3.191'
|
|
426
|
+
type: :development
|
|
427
|
+
prerelease: false
|
|
428
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
429
|
+
requirements:
|
|
430
|
+
- - "~>"
|
|
431
|
+
- !ruby/object:Gem::Version
|
|
432
|
+
version: '3.191'
|
|
433
|
+
- !ruby/object:Gem::Dependency
|
|
434
|
+
name: rexml
|
|
435
|
+
requirement: !ruby/object:Gem::Requirement
|
|
436
|
+
requirements:
|
|
437
|
+
- - "~>"
|
|
438
|
+
- !ruby/object:Gem::Version
|
|
439
|
+
version: '3.2'
|
|
440
|
+
type: :development
|
|
441
|
+
prerelease: false
|
|
442
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
443
|
+
requirements:
|
|
444
|
+
- - "~>"
|
|
445
|
+
- !ruby/object:Gem::Version
|
|
446
|
+
version: '3.2'
|
|
377
447
|
description: Fluentd is an open source data collector designed to scale and simplify
|
|
378
448
|
log management. It can collect, process and ship many kinds of data in near real-time.
|
|
379
449
|
email:
|
|
@@ -393,12 +463,15 @@ extensions: []
|
|
|
393
463
|
extra_rdoc_files: []
|
|
394
464
|
files:
|
|
395
465
|
- ".deepsource.toml"
|
|
466
|
+
- ".github/DISCUSSION_TEMPLATE/q-a-japanese.yml"
|
|
467
|
+
- ".github/DISCUSSION_TEMPLATE/q-a.yml"
|
|
396
468
|
- ".github/ISSUE_TEMPLATE.md"
|
|
397
469
|
- ".github/ISSUE_TEMPLATE/bug_report.yml"
|
|
398
470
|
- ".github/ISSUE_TEMPLATE/config.yml"
|
|
399
471
|
- ".github/ISSUE_TEMPLATE/feature_request.yml"
|
|
400
472
|
- ".github/PULL_REQUEST_TEMPLATE.md"
|
|
401
473
|
- ".github/workflows/stale-actions.yml"
|
|
474
|
+
- ".github/workflows/test-ruby-head.yml"
|
|
402
475
|
- ".github/workflows/test.yml"
|
|
403
476
|
- ".gitignore"
|
|
404
477
|
- ADOPTERS.md
|
|
@@ -770,6 +843,10 @@ files:
|
|
|
770
843
|
- test/plugin/data/log/foo/bar.log
|
|
771
844
|
- test/plugin/data/log/foo/bar2
|
|
772
845
|
- test/plugin/data/log/test.log
|
|
846
|
+
- test/plugin/data/log_numeric/01.log
|
|
847
|
+
- test/plugin/data/log_numeric/02.log
|
|
848
|
+
- test/plugin/data/log_numeric/12.log
|
|
849
|
+
- test/plugin/data/log_numeric/14.log
|
|
773
850
|
- test/plugin/data/sd_file/config
|
|
774
851
|
- test/plugin/data/sd_file/config.json
|
|
775
852
|
- test/plugin/data/sd_file/config.yaml
|
|
@@ -854,6 +931,7 @@ files:
|
|
|
854
931
|
- test/plugin/test_parser_csv.rb
|
|
855
932
|
- test/plugin/test_parser_json.rb
|
|
856
933
|
- test/plugin/test_parser_labeled_tsv.rb
|
|
934
|
+
- test/plugin/test_parser_msgpack.rb
|
|
857
935
|
- test/plugin/test_parser_multiline.rb
|
|
858
936
|
- test/plugin/test_parser_nginx.rb
|
|
859
937
|
- test/plugin/test_parser_none.rb
|
|
@@ -955,7 +1033,7 @@ homepage: https://www.fluentd.org/
|
|
|
955
1033
|
licenses:
|
|
956
1034
|
- Apache-2.0
|
|
957
1035
|
metadata: {}
|
|
958
|
-
post_install_message:
|
|
1036
|
+
post_install_message:
|
|
959
1037
|
rdoc_options: []
|
|
960
1038
|
require_paths:
|
|
961
1039
|
- lib
|
|
@@ -963,15 +1041,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
963
1041
|
requirements:
|
|
964
1042
|
- - ">="
|
|
965
1043
|
- !ruby/object:Gem::Version
|
|
966
|
-
version: '2.
|
|
1044
|
+
version: '2.7'
|
|
967
1045
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
968
1046
|
requirements:
|
|
969
1047
|
- - ">="
|
|
970
1048
|
- !ruby/object:Gem::Version
|
|
971
1049
|
version: '0'
|
|
972
1050
|
requirements: []
|
|
973
|
-
rubygems_version: 3.4.
|
|
974
|
-
signing_key:
|
|
1051
|
+
rubygems_version: 3.4.13
|
|
1052
|
+
signing_key:
|
|
975
1053
|
specification_version: 4
|
|
976
1054
|
summary: Fluentd event collector
|
|
977
1055
|
test_files:
|
|
@@ -1013,6 +1091,10 @@ test_files:
|
|
|
1013
1091
|
- test/plugin/data/log/foo/bar.log
|
|
1014
1092
|
- test/plugin/data/log/foo/bar2
|
|
1015
1093
|
- test/plugin/data/log/test.log
|
|
1094
|
+
- test/plugin/data/log_numeric/01.log
|
|
1095
|
+
- test/plugin/data/log_numeric/02.log
|
|
1096
|
+
- test/plugin/data/log_numeric/12.log
|
|
1097
|
+
- test/plugin/data/log_numeric/14.log
|
|
1016
1098
|
- test/plugin/data/sd_file/config
|
|
1017
1099
|
- test/plugin/data/sd_file/config.json
|
|
1018
1100
|
- test/plugin/data/sd_file/config.yaml
|
|
@@ -1097,6 +1179,7 @@ test_files:
|
|
|
1097
1179
|
- test/plugin/test_parser_csv.rb
|
|
1098
1180
|
- test/plugin/test_parser_json.rb
|
|
1099
1181
|
- test/plugin/test_parser_labeled_tsv.rb
|
|
1182
|
+
- test/plugin/test_parser_msgpack.rb
|
|
1100
1183
|
- test/plugin/test_parser_multiline.rb
|
|
1101
1184
|
- test/plugin/test_parser_nginx.rb
|
|
1102
1185
|
- test/plugin/test_parser_none.rb
|