fluentd 1.16.9-x86-mingw32 → 1.17.0-x86-mingw32
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 +3 -35
- data/CHANGELOG.md +33 -85
- data/README.md +3 -1
- data/Rakefile +1 -1
- data/fluentd.gemspec +9 -10
- data/lib/fluent/command/binlog_reader.rb +1 -1
- data/lib/fluent/command/fluentd.rb +1 -1
- data/lib/fluent/compat/formatter.rb +0 -6
- data/lib/fluent/config/configure_proxy.rb +2 -2
- data/lib/fluent/config/parser.rb +3 -15
- data/lib/fluent/config/types.rb +1 -1
- data/lib/fluent/config/v1_parser.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/formatter_csv.rb +4 -18
- data/lib/fluent/plugin/in_http.rb +17 -52
- data/lib/fluent/plugin/in_tail.rb +35 -3
- 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/supervisor.rb +3 -3
- 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/lib/fluent/winsvc.rb +8 -38
- data/test/command/test_cat.rb +2 -2
- data/test/command/test_fluentd.rb +10 -57
- data/test/config/test_plugin_configuration.rb +6 -6
- data/test/helper.rb +7 -27
- 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/out_forward/test_ack_handler.rb +3 -3
- data/test/plugin/out_forward/test_socket_cache.rb +3 -3
- data/test/plugin/test_buffer.rb +2 -2
- data/test/plugin/test_filter_grep.rb +1 -1
- data/test/plugin/test_in_forward.rb +1 -2
- data/test/plugin/test_in_http.rb +23 -1
- data/test/plugin/test_in_monitor_agent.rb +6 -6
- data/test/plugin/test_in_syslog.rb +18 -25
- data/test/plugin/test_in_tail.rb +153 -5
- data/test/plugin/test_in_tcp.rb +1 -1
- data/test/plugin/test_in_udp.rb +10 -16
- data/test/plugin/test_out_exec_filter.rb +7 -12
- data/test/plugin/test_out_file.rb +2 -22
- data/test/plugin/test_out_forward.rb +3 -2
- data/test/plugin/test_out_http.rb +128 -0
- data/test/plugin/test_out_stream.rb +1 -1
- data/test/plugin/test_output.rb +1 -1
- data/test/plugin/test_output_as_buffered.rb +2 -2
- data/test/plugin/test_output_as_buffered_retries.rb +2 -2
- data/test/plugin/test_owned_by.rb +0 -1
- data/test/plugin/test_parser_csv.rb +1 -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/plugin_helper/test_http_server_helper.rb +1 -1
- data/test/plugin_helper/test_server.rb +41 -64
- data/test/plugin_helper/test_socket.rb +1 -1
- data/test/test_config.rb +0 -6
- data/test/test_event_router.rb +2 -2
- data/test/test_supervisor.rb +21 -30
- data/test/test_tls.rb +1 -1
- metadata +88 -32
- data/test/scripts/windows_service_test.ps1 +0 -73
metadata
CHANGED
@@ -1,13 +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: x86-mingw32
|
6
6
|
authors:
|
7
7
|
- Sadayuki Furuhashi
|
8
|
+
autorequire:
|
8
9
|
bindir: bin
|
9
10
|
cert_chain: []
|
10
|
-
date:
|
11
|
+
date: 2024-04-30 00:00:00.000000000 Z
|
11
12
|
dependencies:
|
12
13
|
- !ruby/object:Gem::Dependency
|
13
14
|
name: bundler
|
@@ -200,33 +201,47 @@ dependencies:
|
|
200
201
|
- !ruby/object:Gem::Version
|
201
202
|
version: '1.4'
|
202
203
|
- !ruby/object:Gem::Dependency
|
203
|
-
name:
|
204
|
+
name: base64
|
204
205
|
requirement: !ruby/object:Gem::Requirement
|
205
206
|
requirements:
|
206
|
-
- - "
|
207
|
+
- - "~>"
|
207
208
|
- !ruby/object:Gem::Version
|
208
|
-
version: '
|
209
|
+
version: '0.2'
|
209
210
|
type: :runtime
|
210
211
|
prerelease: false
|
211
212
|
version_requirements: !ruby/object:Gem::Requirement
|
212
213
|
requirements:
|
213
|
-
- - "
|
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
|
+
- - "~>"
|
214
229
|
- !ruby/object:Gem::Version
|
215
|
-
version: '
|
230
|
+
version: '3.2'
|
216
231
|
- !ruby/object:Gem::Dependency
|
217
|
-
name:
|
232
|
+
name: drb
|
218
233
|
requirement: !ruby/object:Gem::Requirement
|
219
234
|
requirements:
|
220
235
|
- - "~>"
|
221
236
|
- !ruby/object:Gem::Version
|
222
|
-
version: '
|
237
|
+
version: '2.2'
|
223
238
|
type: :runtime
|
224
239
|
prerelease: false
|
225
240
|
version_requirements: !ruby/object:Gem::Requirement
|
226
241
|
requirements:
|
227
242
|
- - "~>"
|
228
243
|
- !ruby/object:Gem::Version
|
229
|
-
version: '
|
244
|
+
version: '2.2'
|
230
245
|
- !ruby/object:Gem::Dependency
|
231
246
|
name: win32-service
|
232
247
|
requirement: !ruby/object:Gem::Requirement
|
@@ -283,20 +298,6 @@ dependencies:
|
|
283
298
|
- - "~>"
|
284
299
|
- !ruby/object:Gem::Version
|
285
300
|
version: 0.1.7
|
286
|
-
- !ruby/object:Gem::Dependency
|
287
|
-
name: fiddle
|
288
|
-
requirement: !ruby/object:Gem::Requirement
|
289
|
-
requirements:
|
290
|
-
- - "~>"
|
291
|
-
- !ruby/object:Gem::Version
|
292
|
-
version: '1.1'
|
293
|
-
type: :runtime
|
294
|
-
prerelease: false
|
295
|
-
version_requirements: !ruby/object:Gem::Requirement
|
296
|
-
requirements:
|
297
|
-
- - "~>"
|
298
|
-
- !ruby/object:Gem::Version
|
299
|
-
version: '1.1'
|
300
301
|
- !ruby/object:Gem::Dependency
|
301
302
|
name: rake
|
302
303
|
requirement: !ruby/object:Gem::Requirement
|
@@ -371,16 +372,16 @@ dependencies:
|
|
371
372
|
name: timecop
|
372
373
|
requirement: !ruby/object:Gem::Requirement
|
373
374
|
requirements:
|
374
|
-
- - "
|
375
|
+
- - "~>"
|
375
376
|
- !ruby/object:Gem::Version
|
376
|
-
version: 0.9
|
377
|
+
version: '0.9'
|
377
378
|
type: :development
|
378
379
|
prerelease: false
|
379
380
|
version_requirements: !ruby/object:Gem::Requirement
|
380
381
|
requirements:
|
381
|
-
- - "
|
382
|
+
- - "~>"
|
382
383
|
- !ruby/object:Gem::Version
|
383
|
-
version: 0.9
|
384
|
+
version: '0.9'
|
384
385
|
- !ruby/object:Gem::Dependency
|
385
386
|
name: test-unit
|
386
387
|
requirement: !ruby/object:Gem::Requirement
|
@@ -457,6 +458,48 @@ dependencies:
|
|
457
458
|
- - ">="
|
458
459
|
- !ruby/object:Gem::Version
|
459
460
|
version: 0.50.0
|
461
|
+
- !ruby/object:Gem::Dependency
|
462
|
+
name: aws-sigv4
|
463
|
+
requirement: !ruby/object:Gem::Requirement
|
464
|
+
requirements:
|
465
|
+
- - "~>"
|
466
|
+
- !ruby/object:Gem::Version
|
467
|
+
version: '1.8'
|
468
|
+
type: :development
|
469
|
+
prerelease: false
|
470
|
+
version_requirements: !ruby/object:Gem::Requirement
|
471
|
+
requirements:
|
472
|
+
- - "~>"
|
473
|
+
- !ruby/object:Gem::Version
|
474
|
+
version: '1.8'
|
475
|
+
- !ruby/object:Gem::Dependency
|
476
|
+
name: aws-sdk-core
|
477
|
+
requirement: !ruby/object:Gem::Requirement
|
478
|
+
requirements:
|
479
|
+
- - "~>"
|
480
|
+
- !ruby/object:Gem::Version
|
481
|
+
version: '3.191'
|
482
|
+
type: :development
|
483
|
+
prerelease: false
|
484
|
+
version_requirements: !ruby/object:Gem::Requirement
|
485
|
+
requirements:
|
486
|
+
- - "~>"
|
487
|
+
- !ruby/object:Gem::Version
|
488
|
+
version: '3.191'
|
489
|
+
- !ruby/object:Gem::Dependency
|
490
|
+
name: rexml
|
491
|
+
requirement: !ruby/object:Gem::Requirement
|
492
|
+
requirements:
|
493
|
+
- - "~>"
|
494
|
+
- !ruby/object:Gem::Version
|
495
|
+
version: '3.2'
|
496
|
+
type: :development
|
497
|
+
prerelease: false
|
498
|
+
version_requirements: !ruby/object:Gem::Requirement
|
499
|
+
requirements:
|
500
|
+
- - "~>"
|
501
|
+
- !ruby/object:Gem::Version
|
502
|
+
version: '3.2'
|
460
503
|
description: Fluentd is an open source data collector designed to scale and simplify
|
461
504
|
log management. It can collect, process and ship many kinds of data in near real-time.
|
462
505
|
email:
|
@@ -476,12 +519,15 @@ extensions: []
|
|
476
519
|
extra_rdoc_files: []
|
477
520
|
files:
|
478
521
|
- ".deepsource.toml"
|
522
|
+
- ".github/DISCUSSION_TEMPLATE/q-a-japanese.yml"
|
523
|
+
- ".github/DISCUSSION_TEMPLATE/q-a.yml"
|
479
524
|
- ".github/ISSUE_TEMPLATE.md"
|
480
525
|
- ".github/ISSUE_TEMPLATE/bug_report.yml"
|
481
526
|
- ".github/ISSUE_TEMPLATE/config.yml"
|
482
527
|
- ".github/ISSUE_TEMPLATE/feature_request.yml"
|
483
528
|
- ".github/PULL_REQUEST_TEMPLATE.md"
|
484
529
|
- ".github/workflows/stale-actions.yml"
|
530
|
+
- ".github/workflows/test-ruby-head.yml"
|
485
531
|
- ".github/workflows/test.yml"
|
486
532
|
- ".gitignore"
|
487
533
|
- ADOPTERS.md
|
@@ -853,6 +899,10 @@ files:
|
|
853
899
|
- test/plugin/data/log/foo/bar.log
|
854
900
|
- test/plugin/data/log/foo/bar2
|
855
901
|
- test/plugin/data/log/test.log
|
902
|
+
- test/plugin/data/log_numeric/01.log
|
903
|
+
- test/plugin/data/log_numeric/02.log
|
904
|
+
- test/plugin/data/log_numeric/12.log
|
905
|
+
- test/plugin/data/log_numeric/14.log
|
856
906
|
- test/plugin/data/sd_file/config
|
857
907
|
- test/plugin/data/sd_file/config.json
|
858
908
|
- test/plugin/data/sd_file/config.yaml
|
@@ -937,6 +987,7 @@ files:
|
|
937
987
|
- test/plugin/test_parser_csv.rb
|
938
988
|
- test/plugin/test_parser_json.rb
|
939
989
|
- test/plugin/test_parser_labeled_tsv.rb
|
990
|
+
- test/plugin/test_parser_msgpack.rb
|
940
991
|
- test/plugin/test_parser_multiline.rb
|
941
992
|
- test/plugin/test_parser_nginx.rb
|
942
993
|
- test/plugin/test_parser_none.rb
|
@@ -1000,7 +1051,6 @@ files:
|
|
1000
1051
|
- test/scripts/fluent/plugin/out_test.rb
|
1001
1052
|
- test/scripts/fluent/plugin/out_test2.rb
|
1002
1053
|
- test/scripts/fluent/plugin/parser_known.rb
|
1003
|
-
- test/scripts/windows_service_test.ps1
|
1004
1054
|
- test/test_capability.rb
|
1005
1055
|
- test/test_clock.rb
|
1006
1056
|
- test/test_config.rb
|
@@ -1039,6 +1089,7 @@ homepage: https://www.fluentd.org/
|
|
1039
1089
|
licenses:
|
1040
1090
|
- Apache-2.0
|
1041
1091
|
metadata: {}
|
1092
|
+
post_install_message:
|
1042
1093
|
rdoc_options: []
|
1043
1094
|
require_paths:
|
1044
1095
|
- lib
|
@@ -1046,14 +1097,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
1046
1097
|
requirements:
|
1047
1098
|
- - ">="
|
1048
1099
|
- !ruby/object:Gem::Version
|
1049
|
-
version: '2.
|
1100
|
+
version: '2.7'
|
1050
1101
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
1051
1102
|
requirements:
|
1052
1103
|
- - ">="
|
1053
1104
|
- !ruby/object:Gem::Version
|
1054
1105
|
version: '0'
|
1055
1106
|
requirements: []
|
1056
|
-
rubygems_version: 3.
|
1107
|
+
rubygems_version: 3.4.13
|
1108
|
+
signing_key:
|
1057
1109
|
specification_version: 4
|
1058
1110
|
summary: Fluentd event collector
|
1059
1111
|
test_files:
|
@@ -1095,6 +1147,10 @@ test_files:
|
|
1095
1147
|
- test/plugin/data/log/foo/bar.log
|
1096
1148
|
- test/plugin/data/log/foo/bar2
|
1097
1149
|
- test/plugin/data/log/test.log
|
1150
|
+
- test/plugin/data/log_numeric/01.log
|
1151
|
+
- test/plugin/data/log_numeric/02.log
|
1152
|
+
- test/plugin/data/log_numeric/12.log
|
1153
|
+
- test/plugin/data/log_numeric/14.log
|
1098
1154
|
- test/plugin/data/sd_file/config
|
1099
1155
|
- test/plugin/data/sd_file/config.json
|
1100
1156
|
- test/plugin/data/sd_file/config.yaml
|
@@ -1179,6 +1235,7 @@ test_files:
|
|
1179
1235
|
- test/plugin/test_parser_csv.rb
|
1180
1236
|
- test/plugin/test_parser_json.rb
|
1181
1237
|
- test/plugin/test_parser_labeled_tsv.rb
|
1238
|
+
- test/plugin/test_parser_msgpack.rb
|
1182
1239
|
- test/plugin/test_parser_multiline.rb
|
1183
1240
|
- test/plugin/test_parser_nginx.rb
|
1184
1241
|
- test/plugin/test_parser_none.rb
|
@@ -1242,7 +1299,6 @@ test_files:
|
|
1242
1299
|
- test/scripts/fluent/plugin/out_test.rb
|
1243
1300
|
- test/scripts/fluent/plugin/out_test2.rb
|
1244
1301
|
- test/scripts/fluent/plugin/parser_known.rb
|
1245
|
-
- test/scripts/windows_service_test.ps1
|
1246
1302
|
- test/test_capability.rb
|
1247
1303
|
- test/test_clock.rb
|
1248
1304
|
- test/test_config.rb
|
@@ -1,73 +0,0 @@
|
|
1
|
-
$ErrorActionPreference = "Stop"
|
2
|
-
Set-PSDebug -Trace 1
|
3
|
-
|
4
|
-
$default_conf_path = (Resolve-Path fluent.conf).Path
|
5
|
-
$current_path = (Get-Location).Path
|
6
|
-
$log_path = "$current_path/fluentd.log"
|
7
|
-
|
8
|
-
ruby bin/fluentd --reg-winsvc i --reg-winsvc-fluentdopt "-c '$default_conf_path' -o '$log_path'"
|
9
|
-
|
10
|
-
# Test: must not start automatically
|
11
|
-
if ((Get-Service fluentdwinsvc).Status -ne "Stopped") {
|
12
|
-
Write-Error "The service should not start automatically."
|
13
|
-
}
|
14
|
-
|
15
|
-
Start-Service fluentdwinsvc
|
16
|
-
Start-Sleep 30
|
17
|
-
|
18
|
-
# Test: the service should be running after started
|
19
|
-
if ((Get-Service fluentdwinsvc).Status -ne "Running") {
|
20
|
-
Write-Error "The service should be running after started."
|
21
|
-
}
|
22
|
-
|
23
|
-
# Test: no warn/error/fatal logs
|
24
|
-
Get-ChildItem "*.log" | %{
|
25
|
-
Get-Content $_
|
26
|
-
if (Select-String -Path $_ -Pattern "[warn]", "[error]", "[fatal]" -SimpleMatch -Quiet) {
|
27
|
-
Select-String -Path $_ -Pattern "[warn]", "[error]", "[fatal]" -SimpleMatch
|
28
|
-
Write-Error "There are abnormal level logs in ${_}:"
|
29
|
-
}
|
30
|
-
}
|
31
|
-
|
32
|
-
Stop-Service fluentdwinsvc
|
33
|
-
Start-Sleep 10 # Somehow it is possible that some processes stay alive for a while. (This could be not good behavior...)
|
34
|
-
|
35
|
-
# Test: status after stopped
|
36
|
-
if ((Get-Service fluentdwinsvc).Status -ne "Stopped") {
|
37
|
-
Write-Error "The service should be in 'Stopped' status after stopped."
|
38
|
-
}
|
39
|
-
# Test: all Ruby processes should stop
|
40
|
-
$ruby_processes = Get-Process -name ruby -ErrorAction SilentlyContinue
|
41
|
-
if ($ruby_processes.Count -ne 0) {
|
42
|
-
Write-Output $ruby_processes
|
43
|
-
Write-Error "All Ruby processes should stop."
|
44
|
-
}
|
45
|
-
|
46
|
-
# Test: service should stop when the supervisor fails to launch
|
47
|
-
# https://github.com/fluent/fluentd/pull/4909
|
48
|
-
$test_setting = @'
|
49
|
-
<source>
|
50
|
-
@type sample
|
51
|
-
@id DUPLICATED_ID
|
52
|
-
tag test
|
53
|
-
</source>
|
54
|
-
<match test>
|
55
|
-
@type stdout
|
56
|
-
@id DUPLICATED_ID
|
57
|
-
</match>
|
58
|
-
'@
|
59
|
-
Add-Content -Path "duplicated_id.conf" -Encoding UTF8 -Value $test_setting
|
60
|
-
ruby bin/fluentd --reg-winsvc-fluentdopt "-c '$current_path/duplicated_id.conf' -o '$log_path'"
|
61
|
-
Start-Service fluentdwinsvc
|
62
|
-
Start-Sleep 30
|
63
|
-
if ((Get-Service fluentdwinsvc).Status -ne "Stopped") {
|
64
|
-
Write-Error "The service should be in 'Stopped' status when the supervisor fails to launch."
|
65
|
-
}
|
66
|
-
$ruby_processes = Get-Process -name ruby -ErrorAction SilentlyContinue
|
67
|
-
if ($ruby_processes.Count -ne 0) {
|
68
|
-
Write-Output $ruby_processes
|
69
|
-
Write-Error "All Ruby processes should stop."
|
70
|
-
}
|
71
|
-
|
72
|
-
ruby bin/fluentd --reg-winsvc u
|
73
|
-
Remove-Item $log_path
|