fluentd 0.12.40 → 1.6.2
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 +5 -5
- data/.github/ISSUE_TEMPLATE/bug_report.md +39 -0
- data/.github/ISSUE_TEMPLATE/feature_request.md +23 -0
- data/.github/ISSUE_TEMPLATE.md +17 -0
- data/.github/PULL_REQUEST_TEMPLATE.md +13 -0
- data/.gitignore +5 -0
- data/.gitlab/cicd-template.yaml +10 -0
- data/.gitlab-ci.yml +147 -0
- data/.travis.yml +56 -20
- data/ADOPTERS.md +5 -0
- data/CHANGELOG.md +1369 -0
- data/CONTRIBUTING.md +16 -5
- data/GOVERNANCE.md +55 -0
- data/Gemfile +5 -0
- data/GithubWorkflow.md +78 -0
- data/LICENSE +202 -0
- data/MAINTAINERS.md +7 -0
- data/README.md +23 -11
- data/Rakefile +48 -2
- data/Vagrantfile +17 -0
- data/appveyor.yml +37 -0
- data/bin/fluent-binlog-reader +7 -0
- data/bin/fluent-ca-generate +6 -0
- data/bin/fluent-plugin-config-format +5 -0
- data/bin/fluent-plugin-generate +5 -0
- data/bin/fluentd +3 -0
- data/code-of-conduct.md +3 -0
- data/example/copy_roundrobin.conf +39 -0
- data/example/counter.conf +18 -0
- data/example/in_dummy_blocks.conf +17 -0
- data/example/in_dummy_with_compression.conf +23 -0
- data/example/in_forward.conf +7 -0
- data/example/in_forward_client.conf +37 -0
- data/example/in_forward_shared_key.conf +15 -0
- data/example/in_forward_tls.conf +14 -0
- data/example/in_forward_users.conf +24 -0
- data/example/in_forward_workers.conf +21 -0
- data/example/in_http.conf +3 -1
- data/example/in_out_forward.conf +17 -0
- data/example/logevents.conf +25 -0
- data/example/multi_filters.conf +61 -0
- data/example/out_exec_filter.conf +42 -0
- data/example/out_forward.conf +13 -13
- data/example/out_forward_buf_file.conf +23 -0
- data/example/out_forward_client.conf +109 -0
- data/example/out_forward_heartbeat_none.conf +16 -0
- data/example/out_forward_shared_key.conf +36 -0
- data/example/out_forward_tls.conf +18 -0
- data/example/out_forward_users.conf +65 -0
- data/example/out_null.conf +36 -0
- data/example/secondary_file.conf +42 -0
- data/example/suppress_config_dump.conf +7 -0
- data/example/worker_section.conf +36 -0
- data/fluent.conf +29 -0
- data/fluentd.gemspec +21 -11
- data/lib/fluent/agent.rb +67 -90
- data/lib/fluent/clock.rb +62 -0
- data/lib/fluent/command/binlog_reader.rb +244 -0
- data/lib/fluent/command/ca_generate.rb +181 -0
- data/lib/fluent/command/cat.rb +42 -18
- data/lib/fluent/command/debug.rb +12 -10
- data/lib/fluent/command/fluentd.rb +153 -5
- data/lib/fluent/command/plugin_config_formatter.rb +292 -0
- data/lib/fluent/command/plugin_generator.rb +324 -0
- data/lib/fluent/compat/call_super_mixin.rb +67 -0
- data/lib/fluent/compat/detach_process_mixin.rb +33 -0
- data/lib/fluent/compat/exec_util.rb +129 -0
- data/lib/fluent/compat/file_util.rb +54 -0
- data/lib/fluent/compat/filter.rb +68 -0
- data/lib/fluent/compat/formatter.rb +111 -0
- data/lib/fluent/compat/formatter_utils.rb +85 -0
- data/lib/fluent/compat/handle_tag_and_time_mixin.rb +62 -0
- data/lib/fluent/compat/handle_tag_name_mixin.rb +53 -0
- data/lib/fluent/compat/input.rb +49 -0
- data/lib/fluent/compat/output.rb +718 -0
- data/lib/fluent/compat/output_chain.rb +60 -0
- data/lib/fluent/compat/parser.rb +310 -0
- data/lib/fluent/compat/parser_utils.rb +40 -0
- data/lib/fluent/compat/propagate_default.rb +62 -0
- data/lib/fluent/compat/record_filter_mixin.rb +34 -0
- data/lib/fluent/compat/set_tag_key_mixin.rb +50 -0
- data/lib/fluent/compat/set_time_key_mixin.rb +69 -0
- data/lib/fluent/compat/socket_util.rb +165 -0
- data/lib/fluent/compat/string_util.rb +34 -0
- data/lib/fluent/compat/structured_format_mixin.rb +26 -0
- data/lib/fluent/compat/type_converter.rb +90 -0
- data/lib/fluent/config/configure_proxy.rb +210 -62
- data/lib/fluent/config/dsl.rb +12 -5
- data/lib/fluent/config/element.rb +107 -9
- data/lib/fluent/config/literal_parser.rb +9 -3
- data/lib/fluent/config/parser.rb +4 -4
- data/lib/fluent/config/section.rb +51 -14
- data/lib/fluent/config/types.rb +28 -13
- data/lib/fluent/config/v1_parser.rb +3 -5
- data/lib/fluent/config.rb +23 -20
- data/lib/fluent/configurable.rb +79 -21
- data/lib/fluent/counter/base_socket.rb +46 -0
- data/lib/fluent/counter/client.rb +297 -0
- data/lib/fluent/counter/error.rb +86 -0
- data/lib/fluent/counter/mutex_hash.rb +163 -0
- data/lib/fluent/counter/server.rb +273 -0
- data/lib/fluent/counter/store.rb +205 -0
- data/lib/fluent/counter/validator.rb +145 -0
- data/lib/fluent/counter.rb +23 -0
- data/lib/fluent/daemon.rb +15 -0
- data/lib/fluent/engine.rb +102 -65
- data/lib/fluent/env.rb +7 -3
- data/lib/fluent/error.rb +30 -0
- data/lib/fluent/event.rb +197 -21
- data/lib/fluent/event_router.rb +93 -10
- data/lib/fluent/filter.rb +2 -50
- data/lib/fluent/formatter.rb +4 -293
- data/lib/fluent/input.rb +2 -32
- data/lib/fluent/label.rb +10 -2
- data/lib/fluent/load.rb +3 -3
- data/lib/fluent/log.rb +348 -81
- data/lib/fluent/match.rb +37 -36
- data/lib/fluent/mixin.rb +12 -176
- data/lib/fluent/msgpack_factory.rb +62 -0
- data/lib/fluent/output.rb +10 -612
- data/lib/fluent/output_chain.rb +23 -0
- data/lib/fluent/parser.rb +4 -800
- data/lib/fluent/plugin/bare_output.rb +63 -0
- data/lib/fluent/plugin/base.rb +192 -0
- data/lib/fluent/plugin/buf_file.rb +128 -174
- data/lib/fluent/plugin/buf_memory.rb +9 -92
- data/lib/fluent/plugin/buffer/chunk.rb +221 -0
- data/lib/fluent/plugin/buffer/file_chunk.rb +383 -0
- data/lib/fluent/plugin/buffer/memory_chunk.rb +90 -0
- data/lib/fluent/plugin/buffer.rb +779 -0
- data/lib/fluent/plugin/compressable.rb +92 -0
- data/lib/fluent/plugin/exec_util.rb +3 -108
- data/lib/fluent/plugin/file_util.rb +4 -34
- data/lib/fluent/plugin/file_wrapper.rb +120 -0
- data/lib/fluent/plugin/filter.rb +93 -0
- data/lib/fluent/plugin/filter_grep.rb +117 -34
- data/lib/fluent/plugin/filter_parser.rb +85 -62
- data/lib/fluent/plugin/filter_record_transformer.rb +27 -39
- data/lib/fluent/plugin/filter_stdout.rb +15 -12
- data/lib/fluent/plugin/formatter.rb +50 -0
- data/lib/fluent/plugin/formatter_csv.rb +52 -0
- data/lib/fluent/plugin/formatter_hash.rb +33 -0
- data/lib/fluent/plugin/formatter_json.rb +55 -0
- data/lib/fluent/plugin/formatter_ltsv.rb +42 -0
- data/lib/fluent/plugin/formatter_msgpack.rb +33 -0
- data/lib/fluent/plugin/formatter_out_file.rb +51 -0
- data/lib/fluent/plugin/formatter_single_value.rb +34 -0
- data/lib/fluent/plugin/formatter_stdout.rb +76 -0
- data/lib/fluent/plugin/formatter_tsv.rb +38 -0
- data/lib/fluent/plugin/in_debug_agent.rb +17 -6
- data/lib/fluent/plugin/in_dummy.rb +47 -20
- data/lib/fluent/plugin/in_exec.rb +55 -123
- data/lib/fluent/plugin/in_forward.rb +299 -216
- data/lib/fluent/plugin/in_gc_stat.rb +14 -36
- data/lib/fluent/plugin/in_http.rb +204 -91
- data/lib/fluent/plugin/in_monitor_agent.rb +186 -258
- data/lib/fluent/plugin/in_object_space.rb +13 -41
- data/lib/fluent/plugin/in_syslog.rb +112 -134
- data/lib/fluent/plugin/in_tail.rb +408 -745
- data/lib/fluent/plugin/in_tcp.rb +66 -9
- data/lib/fluent/plugin/in_udp.rb +60 -11
- data/lib/fluent/plugin/{in_stream.rb → in_unix.rb} +8 -4
- data/lib/fluent/plugin/input.rb +37 -0
- data/lib/fluent/plugin/multi_output.rb +158 -0
- data/lib/fluent/plugin/out_copy.rb +23 -35
- data/lib/fluent/plugin/out_exec.rb +67 -70
- data/lib/fluent/plugin/out_exec_filter.rb +204 -271
- data/lib/fluent/plugin/out_file.rb +267 -73
- data/lib/fluent/plugin/out_forward.rb +854 -325
- data/lib/fluent/plugin/out_null.rb +42 -9
- data/lib/fluent/plugin/out_relabel.rb +9 -5
- data/lib/fluent/plugin/out_roundrobin.rb +18 -37
- data/lib/fluent/plugin/out_secondary_file.rb +133 -0
- data/lib/fluent/plugin/out_stdout.rb +43 -10
- data/lib/fluent/plugin/out_stream.rb +7 -2
- data/lib/fluent/plugin/output.rb +1498 -0
- data/lib/fluent/plugin/owned_by_mixin.rb +42 -0
- data/lib/fluent/plugin/parser.rb +191 -0
- data/lib/fluent/plugin/parser_apache.rb +28 -0
- data/lib/fluent/plugin/parser_apache2.rb +88 -0
- data/lib/fluent/plugin/parser_apache_error.rb +26 -0
- data/lib/fluent/plugin/parser_csv.rb +39 -0
- data/lib/fluent/plugin/parser_json.rb +94 -0
- data/lib/fluent/plugin/parser_ltsv.rb +49 -0
- data/lib/fluent/plugin/parser_msgpack.rb +50 -0
- data/lib/fluent/plugin/parser_multiline.rb +106 -0
- data/lib/fluent/plugin/parser_nginx.rb +28 -0
- data/lib/fluent/plugin/parser_none.rb +36 -0
- data/lib/fluent/plugin/parser_regexp.rb +68 -0
- data/lib/fluent/plugin/parser_syslog.rb +142 -0
- data/lib/fluent/plugin/parser_tsv.rb +42 -0
- data/lib/fluent/plugin/socket_util.rb +3 -143
- data/lib/fluent/plugin/storage.rb +84 -0
- data/lib/fluent/plugin/storage_local.rb +164 -0
- data/lib/fluent/plugin/string_util.rb +3 -15
- data/lib/fluent/plugin.rb +122 -121
- data/lib/fluent/plugin_helper/cert_option.rb +178 -0
- data/lib/fluent/plugin_helper/child_process.rb +364 -0
- data/lib/fluent/plugin_helper/compat_parameters.rb +333 -0
- data/lib/fluent/plugin_helper/counter.rb +51 -0
- data/lib/fluent/plugin_helper/event_emitter.rb +93 -0
- data/lib/fluent/plugin_helper/event_loop.rb +170 -0
- data/lib/fluent/plugin_helper/extract.rb +104 -0
- data/lib/fluent/plugin_helper/formatter.rb +147 -0
- data/lib/fluent/plugin_helper/http_server/app.rb +79 -0
- data/lib/fluent/plugin_helper/http_server/compat/server.rb +81 -0
- data/lib/fluent/plugin_helper/http_server/compat/webrick_handler.rb +58 -0
- data/lib/fluent/plugin_helper/http_server/methods.rb +35 -0
- data/lib/fluent/plugin_helper/http_server/request.rb +42 -0
- data/lib/fluent/plugin_helper/http_server/router.rb +54 -0
- data/lib/fluent/plugin_helper/http_server/server.rb +87 -0
- data/lib/fluent/plugin_helper/http_server.rb +76 -0
- data/lib/fluent/plugin_helper/inject.rb +151 -0
- data/lib/fluent/plugin_helper/parser.rb +147 -0
- data/lib/fluent/plugin_helper/record_accessor.rb +210 -0
- data/lib/fluent/plugin_helper/retry_state.rb +205 -0
- data/lib/fluent/plugin_helper/server.rb +807 -0
- data/lib/fluent/plugin_helper/socket.rb +250 -0
- data/lib/fluent/plugin_helper/socket_option.rb +80 -0
- data/lib/fluent/plugin_helper/storage.rb +349 -0
- data/lib/fluent/plugin_helper/thread.rb +179 -0
- data/lib/fluent/plugin_helper/timer.rb +92 -0
- data/lib/fluent/plugin_helper.rb +73 -0
- data/lib/fluent/plugin_id.rb +80 -0
- data/lib/fluent/process.rb +3 -489
- data/lib/fluent/registry.rb +52 -10
- data/lib/fluent/root_agent.rb +204 -42
- data/lib/fluent/supervisor.rb +597 -359
- data/lib/fluent/system_config.rb +131 -42
- data/lib/fluent/test/base.rb +6 -54
- data/lib/fluent/test/driver/base.rb +224 -0
- data/lib/fluent/test/driver/base_owned.rb +70 -0
- data/lib/fluent/test/driver/base_owner.rb +135 -0
- data/lib/fluent/test/driver/event_feeder.rb +98 -0
- data/lib/fluent/test/driver/filter.rb +57 -0
- data/lib/fluent/test/driver/formatter.rb +30 -0
- data/lib/fluent/test/driver/input.rb +31 -0
- data/lib/fluent/test/driver/multi_output.rb +53 -0
- data/lib/fluent/test/driver/output.rb +102 -0
- data/lib/fluent/test/driver/parser.rb +30 -0
- data/lib/fluent/test/driver/test_event_router.rb +45 -0
- data/lib/fluent/test/filter_test.rb +0 -1
- data/lib/fluent/test/formatter_test.rb +4 -1
- data/lib/fluent/test/helpers.rb +58 -10
- data/lib/fluent/test/input_test.rb +27 -19
- data/lib/fluent/test/log.rb +79 -0
- data/lib/fluent/test/output_test.rb +28 -39
- data/lib/fluent/test/parser_test.rb +3 -1
- data/lib/fluent/test/startup_shutdown.rb +46 -0
- data/lib/fluent/test.rb +33 -1
- data/lib/fluent/time.rb +450 -1
- data/lib/fluent/timezone.rb +27 -3
- data/lib/fluent/{status.rb → unique_id.rb} +15 -24
- data/lib/fluent/version.rb +1 -1
- data/lib/fluent/winsvc.rb +85 -0
- data/templates/new_gem/Gemfile +3 -0
- data/templates/new_gem/README.md.erb +43 -0
- data/templates/new_gem/Rakefile +13 -0
- data/templates/new_gem/fluent-plugin.gemspec.erb +27 -0
- data/templates/new_gem/lib/fluent/plugin/filter.rb.erb +14 -0
- data/templates/new_gem/lib/fluent/plugin/formatter.rb.erb +14 -0
- data/templates/new_gem/lib/fluent/plugin/input.rb.erb +11 -0
- data/templates/new_gem/lib/fluent/plugin/output.rb.erb +11 -0
- data/templates/new_gem/lib/fluent/plugin/parser.rb.erb +15 -0
- data/templates/new_gem/test/helper.rb.erb +8 -0
- data/templates/new_gem/test/plugin/test_filter.rb.erb +18 -0
- data/templates/new_gem/test/plugin/test_formatter.rb.erb +18 -0
- data/templates/new_gem/test/plugin/test_input.rb.erb +18 -0
- data/templates/new_gem/test/plugin/test_output.rb.erb +18 -0
- data/templates/new_gem/test/plugin/test_parser.rb.erb +18 -0
- data/templates/plugin_config_formatter/param.md-compact.erb +25 -0
- data/templates/plugin_config_formatter/param.md.erb +34 -0
- data/templates/plugin_config_formatter/section.md.erb +12 -0
- data/test/command/test_binlog_reader.rb +346 -0
- data/test/command/test_ca_generate.rb +70 -0
- data/test/command/test_fluentd.rb +901 -0
- data/test/command/test_plugin_config_formatter.rb +276 -0
- data/test/command/test_plugin_generator.rb +92 -0
- data/test/compat/test_calls_super.rb +166 -0
- data/test/compat/test_parser.rb +92 -0
- data/test/config/test_config_parser.rb +126 -2
- data/test/config/test_configurable.rb +946 -187
- data/test/config/test_configure_proxy.rb +424 -74
- data/test/config/test_dsl.rb +11 -11
- data/test/config/test_element.rb +500 -0
- data/test/config/test_literal_parser.rb +8 -0
- data/test/config/test_plugin_configuration.rb +56 -0
- data/test/config/test_section.rb +79 -7
- data/test/config/test_system_config.rb +122 -35
- data/test/config/test_types.rb +38 -0
- data/test/counter/test_client.rb +559 -0
- data/test/counter/test_error.rb +44 -0
- data/test/counter/test_mutex_hash.rb +179 -0
- data/test/counter/test_server.rb +589 -0
- data/test/counter/test_store.rb +258 -0
- data/test/counter/test_validator.rb +137 -0
- data/test/helper.rb +89 -6
- data/test/helpers/fuzzy_assert.rb +89 -0
- data/test/plugin/test_bare_output.rb +118 -0
- data/test/plugin/test_base.rb +115 -0
- data/test/plugin/test_buf_file.rb +823 -460
- data/test/plugin/test_buf_memory.rb +32 -194
- data/test/plugin/test_buffer.rb +1233 -0
- data/test/plugin/test_buffer_chunk.rb +198 -0
- data/test/plugin/test_buffer_file_chunk.rb +844 -0
- data/test/plugin/test_buffer_memory_chunk.rb +338 -0
- data/test/plugin/test_compressable.rb +84 -0
- data/test/plugin/test_filter.rb +357 -0
- data/test/plugin/test_filter_grep.rb +540 -29
- data/test/plugin/test_filter_parser.rb +439 -452
- data/test/plugin/test_filter_record_transformer.rb +123 -166
- data/test/plugin/test_filter_stdout.rb +160 -72
- data/test/plugin/test_formatter_csv.rb +111 -0
- data/test/plugin/test_formatter_hash.rb +35 -0
- data/test/plugin/test_formatter_json.rb +51 -0
- data/test/plugin/test_formatter_ltsv.rb +62 -0
- data/test/plugin/test_formatter_msgpack.rb +28 -0
- data/test/plugin/test_formatter_out_file.rb +95 -0
- data/test/plugin/test_formatter_single_value.rb +38 -0
- data/test/plugin/test_formatter_tsv.rb +68 -0
- data/test/plugin/test_in_debug_agent.rb +24 -1
- data/test/plugin/test_in_dummy.rb +111 -18
- data/test/plugin/test_in_exec.rb +200 -113
- data/test/plugin/test_in_forward.rb +990 -387
- data/test/plugin/test_in_gc_stat.rb +10 -8
- data/test/plugin/test_in_http.rb +600 -224
- data/test/plugin/test_in_monitor_agent.rb +690 -0
- data/test/plugin/test_in_object_space.rb +24 -8
- data/test/plugin/test_in_syslog.rb +154 -215
- data/test/plugin/test_in_tail.rb +1006 -707
- data/test/plugin/test_in_tcp.rb +125 -48
- data/test/plugin/test_in_udp.rb +204 -63
- data/test/plugin/{test_in_stream.rb → test_in_unix.rb} +14 -13
- data/test/plugin/test_input.rb +126 -0
- data/test/plugin/test_metadata.rb +89 -0
- data/test/plugin/test_multi_output.rb +180 -0
- data/test/plugin/test_out_copy.rb +117 -112
- data/test/plugin/test_out_exec.rb +258 -53
- data/test/plugin/test_out_exec_filter.rb +538 -115
- data/test/plugin/test_out_file.rb +865 -178
- data/test/plugin/test_out_forward.rb +998 -210
- data/test/plugin/test_out_null.rb +105 -0
- data/test/plugin/test_out_relabel.rb +28 -0
- data/test/plugin/test_out_roundrobin.rb +36 -29
- data/test/plugin/test_out_secondary_file.rb +458 -0
- data/test/plugin/test_out_stdout.rb +135 -37
- data/test/plugin/test_out_stream.rb +18 -0
- data/test/plugin/test_output.rb +984 -0
- data/test/plugin/test_output_as_buffered.rb +2021 -0
- data/test/plugin/test_output_as_buffered_backup.rb +312 -0
- data/test/plugin/test_output_as_buffered_compress.rb +165 -0
- data/test/plugin/test_output_as_buffered_overflow.rb +250 -0
- data/test/plugin/test_output_as_buffered_retries.rb +911 -0
- data/test/plugin/test_output_as_buffered_secondary.rb +874 -0
- data/test/plugin/test_output_as_standard.rb +374 -0
- data/test/plugin/test_owned_by.rb +35 -0
- data/test/plugin/test_parser.rb +359 -0
- data/test/plugin/test_parser_apache.rb +42 -0
- data/test/plugin/test_parser_apache2.rb +47 -0
- data/test/plugin/test_parser_apache_error.rb +45 -0
- data/test/plugin/test_parser_csv.rb +103 -0
- data/test/plugin/test_parser_json.rb +138 -0
- data/test/plugin/test_parser_labeled_tsv.rb +145 -0
- data/test/plugin/test_parser_multiline.rb +100 -0
- data/test/plugin/test_parser_nginx.rb +88 -0
- data/test/plugin/test_parser_none.rb +52 -0
- data/test/plugin/test_parser_regexp.rb +289 -0
- data/test/plugin/test_parser_syslog.rb +441 -0
- data/test/plugin/test_parser_tsv.rb +122 -0
- data/test/plugin/test_storage.rb +167 -0
- data/test/plugin/test_storage_local.rb +335 -0
- data/test/plugin_helper/data/cert/cert-key.pem +27 -0
- data/test/plugin_helper/data/cert/cert-with-no-newline.pem +19 -0
- data/test/plugin_helper/data/cert/cert.pem +19 -0
- data/test/plugin_helper/http_server/test_app.rb +65 -0
- data/test/plugin_helper/http_server/test_route.rb +32 -0
- data/test/plugin_helper/test_cert_option.rb +16 -0
- data/test/plugin_helper/test_child_process.rb +794 -0
- data/test/plugin_helper/test_compat_parameters.rb +353 -0
- data/test/plugin_helper/test_event_emitter.rb +51 -0
- data/test/plugin_helper/test_event_loop.rb +52 -0
- data/test/plugin_helper/test_extract.rb +194 -0
- data/test/plugin_helper/test_formatter.rb +255 -0
- data/test/plugin_helper/test_http_server_helper.rb +205 -0
- data/test/plugin_helper/test_inject.rb +519 -0
- data/test/plugin_helper/test_parser.rb +264 -0
- data/test/plugin_helper/test_record_accessor.rb +197 -0
- data/test/plugin_helper/test_retry_state.rb +442 -0
- data/test/plugin_helper/test_server.rb +1714 -0
- data/test/plugin_helper/test_storage.rb +542 -0
- data/test/plugin_helper/test_thread.rb +164 -0
- data/test/plugin_helper/test_timer.rb +132 -0
- data/test/scripts/exec_script.rb +0 -6
- data/test/scripts/fluent/plugin/formatter1/formatter_test1.rb +7 -0
- data/test/scripts/fluent/plugin/formatter2/formatter_test2.rb +7 -0
- data/test/scripts/fluent/plugin/out_test.rb +23 -15
- data/test/scripts/fluent/plugin/out_test2.rb +80 -0
- data/test/test_clock.rb +164 -0
- data/test/test_config.rb +16 -7
- data/test/test_configdsl.rb +2 -2
- data/test/test_event.rb +360 -13
- data/test/test_event_router.rb +108 -11
- data/test/test_event_time.rb +199 -0
- data/test/test_filter.rb +48 -6
- data/test/test_formatter.rb +11 -391
- data/test/test_input.rb +1 -1
- data/test/test_log.rb +591 -31
- data/test/test_mixin.rb +1 -1
- data/test/test_output.rb +121 -185
- data/test/test_plugin.rb +251 -0
- data/test/test_plugin_classes.rb +177 -10
- data/test/test_plugin_helper.rb +81 -0
- data/test/test_plugin_id.rb +101 -0
- data/test/test_process.rb +8 -42
- data/test/test_root_agent.rb +766 -21
- data/test/test_supervisor.rb +481 -0
- data/test/test_test_drivers.rb +135 -0
- data/test/test_time_formatter.rb +282 -0
- data/test/test_time_parser.rb +231 -0
- data/test/test_unique_id.rb +47 -0
- metadata +454 -60
- data/COPYING +0 -14
- data/ChangeLog +0 -666
- data/lib/fluent/buffer.rb +0 -365
- data/lib/fluent/plugin/in_status.rb +0 -76
- data/test/plugin/test_in_status.rb +0 -38
- data/test/test_buffer.rb +0 -624
- data/test/test_parser.rb +0 -1305
@@ -16,124 +16,318 @@
|
|
16
16
|
|
17
17
|
require 'fileutils'
|
18
18
|
require 'zlib'
|
19
|
+
require 'time'
|
20
|
+
require 'tempfile'
|
19
21
|
|
20
|
-
require 'fluent/output'
|
22
|
+
require 'fluent/plugin/output'
|
21
23
|
require 'fluent/config/error'
|
24
|
+
# TODO remove ...
|
25
|
+
require 'fluent/plugin/file_util'
|
22
26
|
|
23
|
-
module Fluent
|
24
|
-
class FileOutput <
|
25
|
-
Plugin.register_output('file', self)
|
27
|
+
module Fluent::Plugin
|
28
|
+
class FileOutput < Output
|
29
|
+
Fluent::Plugin.register_output('file', self)
|
26
30
|
|
27
|
-
|
28
|
-
|
29
|
-
|
31
|
+
helpers :formatter, :inject, :compat_parameters
|
32
|
+
|
33
|
+
SUPPORTED_COMPRESS = [:text, :gz, :gzip]
|
34
|
+
SUPPORTED_COMPRESS_MAP = {
|
35
|
+
text: nil,
|
36
|
+
gz: :gzip,
|
37
|
+
gzip: :gzip,
|
30
38
|
}
|
31
39
|
|
40
|
+
FILE_PERMISSION = 0644
|
41
|
+
DIR_PERMISSION = 0755
|
42
|
+
|
43
|
+
DEFAULT_TIMEKEY = 60 * 60 * 24
|
44
|
+
|
32
45
|
desc "The Path of the file."
|
33
46
|
config_param :path, :string
|
34
|
-
|
35
|
-
|
47
|
+
|
48
|
+
desc "Specify to add file suffix for bare file path or not."
|
49
|
+
config_param :add_path_suffix, :bool, default: true
|
50
|
+
desc "The file suffix added to bare file path."
|
51
|
+
config_param :path_suffix, :string, default: '.log'
|
36
52
|
desc "The flushed chunk is appended to existence file or not."
|
37
53
|
config_param :append, :bool, default: false
|
38
54
|
desc "Compress flushed file."
|
39
|
-
config_param :compress,
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
end
|
44
|
-
c
|
45
|
-
end
|
46
|
-
desc "Create symlink to temporary buffered file when buffer_type is file."
|
55
|
+
config_param :compress, :enum, list: SUPPORTED_COMPRESS, default: :text
|
56
|
+
desc "Execute compression again even when buffer chunk is already compressed."
|
57
|
+
config_param :recompress, :bool, default: false
|
58
|
+
desc "Create symlink to temporary buffered file when buffer_type is file (disabled on Windows)."
|
47
59
|
config_param :symlink_path, :string, default: nil
|
48
60
|
|
49
|
-
|
50
|
-
|
51
|
-
require 'time'
|
52
|
-
require 'fluent/plugin/file_util'
|
53
|
-
super
|
61
|
+
config_section :format do
|
62
|
+
config_set_default :@type, 'out_file'
|
54
63
|
end
|
55
64
|
|
56
|
-
|
57
|
-
|
58
|
-
|
65
|
+
config_section :buffer do
|
66
|
+
config_set_default :@type, 'file'
|
67
|
+
config_set_default :chunk_keys, ['time']
|
68
|
+
config_set_default :timekey, DEFAULT_TIMEKEY
|
69
|
+
end
|
70
|
+
|
71
|
+
attr_reader :dir_perm
|
72
|
+
attr_accessor :last_written_path # for tests
|
73
|
+
|
74
|
+
module SymlinkBufferMixin
|
75
|
+
def output_plugin_for_symlink=(output_plugin)
|
76
|
+
@_output_plugin_for_symlink = output_plugin
|
59
77
|
end
|
60
|
-
|
61
|
-
|
78
|
+
|
79
|
+
def symlink_path=(path)
|
80
|
+
@_symlink_path = path
|
62
81
|
end
|
63
82
|
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
83
|
+
def generate_chunk(metadata)
|
84
|
+
chunk = super
|
85
|
+
# "symlink" feature is to link from symlink_path to the latest file chunk. Records with latest
|
86
|
+
# timekey will be appended into that file chunk. On the other side, resumed file chunks might NOT
|
87
|
+
# have timekey, especially in the cases that resumed file chunks are generated by Fluentd v0.12.
|
88
|
+
# These chunks will be enqueued immediately, and will be flushed soon.
|
89
|
+
latest_metadata = metadata_list.select{|m| m.timekey }.sort_by(&:timekey).last
|
90
|
+
if chunk.metadata == latest_metadata
|
91
|
+
sym_path = @_output_plugin_for_symlink.extract_placeholders(@_symlink_path, chunk)
|
92
|
+
FileUtils.mkdir_p(File.dirname(sym_path), mode: @_output_plugin_for_symlink.dir_perm)
|
93
|
+
FileUtils.ln_sf(chunk.path, sym_path)
|
94
|
+
end
|
95
|
+
chunk
|
96
|
+
end
|
97
|
+
end
|
98
|
+
|
99
|
+
def configure(conf)
|
100
|
+
compat_parameters_convert(conf, :formatter, :buffer, :inject, default_chunk_key: "time")
|
101
|
+
|
102
|
+
configured_time_slice_format = conf['time_slice_format']
|
103
|
+
|
104
|
+
if conf.elements(name: 'buffer').empty?
|
105
|
+
conf.add_element('buffer', 'time')
|
106
|
+
end
|
107
|
+
buffer_conf = conf.elements(name: 'buffer').first
|
108
|
+
# Fluent::PluginId#configure is not called yet, so we can't use #plugin_root_dir here.
|
109
|
+
if !buffer_conf.has_key?('path') && !(conf['@id'] && system_config.root_dir)
|
110
|
+
# v0.14 file buffer handles path as directory if '*' is missing
|
111
|
+
# 'dummy_path' is not to raise configuration error for 'path' in file buffer plugin,
|
112
|
+
# but raise it in this plugin.
|
113
|
+
buffer_conf['path'] = conf['path'] || '/tmp/dummy_path'
|
72
114
|
end
|
73
115
|
|
74
|
-
|
75
|
-
|
76
|
-
|
116
|
+
if conf.has_key?('utc') || conf.has_key?('localtime')
|
117
|
+
param_name = conf.has_key?('utc') ? 'utc' : 'localtime'
|
118
|
+
log.warn "'#{param_name}' is deperecated for output plugin. This parameter is used for formatter plugin in compatibility layer. If you want to use same feature, use timekey_use_utc parameter in <buffer> directive instead"
|
77
119
|
end
|
78
120
|
|
79
121
|
super
|
80
122
|
|
81
|
-
@
|
82
|
-
|
123
|
+
@compress_method = SUPPORTED_COMPRESS_MAP[@compress]
|
124
|
+
|
125
|
+
if @path.include?('*') && !@buffer_config.timekey
|
126
|
+
raise Fluent::ConfigError, "path including '*' must be used with buffer chunk key 'time'"
|
127
|
+
end
|
128
|
+
|
129
|
+
path_suffix = @add_path_suffix ? @path_suffix : ''
|
130
|
+
path_timekey = if @chunk_key_time
|
131
|
+
@as_secondary ? @primary_instance.buffer_config.timekey : @buffer_config.timekey
|
132
|
+
else
|
133
|
+
nil
|
134
|
+
end
|
135
|
+
@path_template = generate_path_template(@path, path_timekey, @append, @compress_method, path_suffix: path_suffix, time_slice_format: configured_time_slice_format)
|
83
136
|
|
84
|
-
|
137
|
+
if @as_secondary
|
138
|
+
# When this plugin is configured as secondary & primary plugin has tag key, but this plugin may not have it.
|
139
|
+
# Increment placeholder can make another output file per chunk tag/keys even if original path doesn't include it.
|
140
|
+
placeholder_validators(:path, @path_template).select{|v| v.type == :time }.each do |v|
|
141
|
+
v.validate!
|
142
|
+
end
|
143
|
+
else
|
144
|
+
placeholder_validate!(:path, @path_template)
|
145
|
+
|
146
|
+
max_tag_index = get_placeholders_tag(@path_template).max || 1
|
147
|
+
max_tag_index = 1 if max_tag_index < 1
|
148
|
+
dummy_tag = (['a'] * max_tag_index).join('.')
|
149
|
+
dummy_record_keys = get_placeholders_keys(@path_template) || ['message']
|
150
|
+
dummy_record = Hash[dummy_record_keys.zip(['data'] * dummy_record_keys.size)]
|
151
|
+
|
152
|
+
test_chunk1 = chunk_for_test(dummy_tag, Fluent::Engine.now, dummy_record)
|
153
|
+
test_path = extract_placeholders(@path_template, test_chunk1)
|
154
|
+
unless ::Fluent::FileUtil.writable_p?(test_path)
|
155
|
+
raise Fluent::ConfigError, "out_file: `#{test_path}` is not writable"
|
156
|
+
end
|
157
|
+
end
|
158
|
+
|
159
|
+
@formatter = formatter_create
|
160
|
+
|
161
|
+
if @symlink_path && @buffer.respond_to?(:path)
|
162
|
+
if @as_secondary
|
163
|
+
raise Fluent::ConfigError, "symlink_path option is unavailable in <secondary>: consider to use secondary_file plugin"
|
164
|
+
end
|
165
|
+
if Fluent.windows?
|
166
|
+
log.warn "symlink_path is unavailable on Windows platform. disabled."
|
167
|
+
@symlink_path = nil
|
168
|
+
else
|
169
|
+
@buffer.extend SymlinkBufferMixin
|
170
|
+
@buffer.symlink_path = @symlink_path
|
171
|
+
@buffer.output_plugin_for_symlink = self
|
172
|
+
end
|
173
|
+
end
|
174
|
+
|
175
|
+
@dir_perm = system_config.dir_permission || DIR_PERMISSION
|
176
|
+
@file_perm = system_config.file_permission || FILE_PERMISSION
|
177
|
+
@need_lock = system_config.workers > 1
|
178
|
+
end
|
179
|
+
|
180
|
+
def multi_workers_ready?
|
181
|
+
true
|
85
182
|
end
|
86
183
|
|
87
184
|
def format(tag, time, record)
|
88
|
-
|
185
|
+
r = inject_values_to_record(tag, time, record)
|
186
|
+
@formatter.format(tag, time, r)
|
89
187
|
end
|
90
188
|
|
91
189
|
def write(chunk)
|
92
|
-
path =
|
93
|
-
FileUtils.mkdir_p File.dirname(path), mode:
|
190
|
+
path = extract_placeholders(@path_template, chunk)
|
191
|
+
FileUtils.mkdir_p File.dirname(path), mode: @dir_perm
|
192
|
+
|
193
|
+
writer = case
|
194
|
+
when @compress_method.nil?
|
195
|
+
method(:write_without_compression)
|
196
|
+
when @compress_method == :gzip
|
197
|
+
if @buffer.compress != :gzip || @recompress
|
198
|
+
method(:write_gzip_with_compression)
|
199
|
+
else
|
200
|
+
method(:write_gzip_from_gzipped_chunk)
|
201
|
+
end
|
202
|
+
else
|
203
|
+
raise "BUG: unknown compression method #{@compress_method}"
|
204
|
+
end
|
205
|
+
|
206
|
+
if @append
|
207
|
+
writer.call(path, chunk)
|
208
|
+
else
|
209
|
+
find_filepath_available(path, with_lock: @need_lock) do |actual_path|
|
210
|
+
writer.call(actual_path, chunk)
|
211
|
+
path = actual_path
|
212
|
+
end
|
213
|
+
end
|
214
|
+
|
215
|
+
@last_written_path = path
|
216
|
+
end
|
217
|
+
|
218
|
+
def write_without_compression(path, chunk)
|
219
|
+
File.open(path, "ab", @file_perm) do |f|
|
220
|
+
chunk.write_to(f)
|
221
|
+
end
|
222
|
+
end
|
223
|
+
|
224
|
+
def write_gzip_with_compression(path, chunk)
|
225
|
+
if @append
|
226
|
+
# This code will be removed after zlib/multithread bug is fixed.
|
227
|
+
# Use Tempfile to avoid broken gzip files: https://github.com/fluent/fluentd/issues/1903
|
228
|
+
Tempfile.create('out_file-gzip-append') { |temp|
|
229
|
+
begin
|
230
|
+
writer = Zlib::GzipWriter.new(temp)
|
231
|
+
chunk.write_to(writer, compressed: :text)
|
232
|
+
ensure
|
233
|
+
writer.finish # avoid zlib finalizer warning
|
234
|
+
end
|
235
|
+
temp.rewind
|
94
236
|
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
chunk.write_to(f)
|
237
|
+
File.open(path, "ab", @file_perm) do |f|
|
238
|
+
IO.copy_stream(temp, f)
|
239
|
+
end
|
99
240
|
}
|
100
|
-
|
101
|
-
File.open(path, "
|
241
|
+
else
|
242
|
+
File.open(path, "ab", @file_perm) do |f|
|
102
243
|
gz = Zlib::GzipWriter.new(f)
|
103
|
-
chunk.write_to(gz)
|
244
|
+
chunk.write_to(gz, compressed: :text)
|
104
245
|
gz.close
|
105
|
-
|
246
|
+
end
|
106
247
|
end
|
107
|
-
|
108
|
-
return path # for test
|
109
248
|
end
|
110
249
|
|
111
|
-
def
|
112
|
-
|
250
|
+
def write_gzip_from_gzipped_chunk(path, chunk)
|
251
|
+
File.open(path, "ab", @file_perm) do |f|
|
252
|
+
chunk.write_to(f, compressed: :gzip)
|
253
|
+
end
|
113
254
|
end
|
114
255
|
|
115
|
-
|
256
|
+
def timekey_to_timeformat(timekey)
|
257
|
+
case timekey
|
258
|
+
when nil then ''
|
259
|
+
when 0...60 then '%Y%m%d%H%M%S' # 60 exclusive
|
260
|
+
when 60...3600 then '%Y%m%d%H%M'
|
261
|
+
when 3600...86400 then '%Y%m%d%H'
|
262
|
+
else '%Y%m%d'
|
263
|
+
end
|
264
|
+
end
|
116
265
|
|
117
|
-
def
|
118
|
-
case
|
119
|
-
when
|
120
|
-
|
121
|
-
|
122
|
-
"
|
266
|
+
def compression_suffix(compress)
|
267
|
+
case compress
|
268
|
+
when :gzip then '.gz'
|
269
|
+
when nil then ''
|
270
|
+
else
|
271
|
+
raise ArgumentError, "unknown compression type #{compress}"
|
123
272
|
end
|
124
273
|
end
|
125
274
|
|
126
|
-
|
127
|
-
|
128
|
-
|
275
|
+
# /path/to/dir/file.* -> /path/to/dir/file.%Y%m%d
|
276
|
+
# /path/to/dir/file.*.data -> /path/to/dir/file.%Y%m%d.data
|
277
|
+
# /path/to/dir/file -> /path/to/dir/file.%Y%m%d.log
|
278
|
+
# %Y%m%d -> %Y%m%d_** (non append)
|
279
|
+
# + .gz (gzipped)
|
280
|
+
## TODO: remove time_slice_format when end of support of compat_parameters
|
281
|
+
def generate_path_template(original, timekey, append, compress, path_suffix: '', time_slice_format: nil)
|
282
|
+
comp_suffix = compression_suffix(compress)
|
283
|
+
index_placeholder = append ? '' : '_**'
|
284
|
+
if original.index('*')
|
285
|
+
raise "BUG: configuration error must be raised for path including '*' without timekey" unless timekey
|
286
|
+
time_placeholders_part = time_slice_format || timekey_to_timeformat(timekey)
|
287
|
+
original.gsub('*', time_placeholders_part + index_placeholder) + comp_suffix
|
129
288
|
else
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
289
|
+
if timekey
|
290
|
+
if time_slice_format
|
291
|
+
"#{original}.#{time_slice_format}#{index_placeholder}#{path_suffix}#{comp_suffix}"
|
292
|
+
else
|
293
|
+
time_placeholders = timekey_to_timeformat(timekey)
|
294
|
+
if time_placeholders.scan(/../).any?{|ph| original.include?(ph) }
|
295
|
+
raise Fluent::ConfigError, "insufficient timestamp placeholders in path" if time_placeholders.scan(/../).any?{|ph| !original.include?(ph) }
|
296
|
+
"#{original}#{index_placeholder}#{path_suffix}#{comp_suffix}"
|
297
|
+
else
|
298
|
+
"#{original}.#{time_placeholders}#{index_placeholder}#{path_suffix}#{comp_suffix}"
|
299
|
+
end
|
300
|
+
end
|
301
|
+
else
|
302
|
+
"#{original}#{index_placeholder}#{path_suffix}#{comp_suffix}"
|
303
|
+
end
|
304
|
+
end
|
305
|
+
end
|
306
|
+
|
307
|
+
def find_filepath_available(path_with_placeholder, with_lock: false) # for non-append
|
308
|
+
raise "BUG: index placeholder not found in path: #{path_with_placeholder}" unless path_with_placeholder.index('_**')
|
309
|
+
i = 0
|
310
|
+
dir_path = locked = nil
|
311
|
+
while true
|
312
|
+
path = path_with_placeholder.sub('_**', "_#{i}")
|
313
|
+
i += 1
|
314
|
+
next if File.exist?(path)
|
315
|
+
|
316
|
+
if with_lock
|
317
|
+
dir_path = path + '.lock'
|
318
|
+
locked = Dir.mkdir(dir_path) rescue false
|
319
|
+
next unless locked
|
320
|
+
# ensure that other worker doesn't create a file (and release lock)
|
321
|
+
# between previous File.exist? and Dir.mkdir
|
322
|
+
next if File.exist?(path)
|
323
|
+
end
|
324
|
+
|
325
|
+
break
|
326
|
+
end
|
327
|
+
yield path
|
328
|
+
ensure
|
329
|
+
if dir_path && locked && Dir.exist?(dir_path)
|
330
|
+
Dir.rmdir(dir_path) rescue nil
|
137
331
|
end
|
138
332
|
end
|
139
333
|
end
|