fluentd 0.14.1 → 0.14.2

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.
Files changed (129) hide show
  1. checksums.yaml +4 -4
  2. data/ChangeLog +110 -1
  3. data/Rakefile +5 -1
  4. data/appveyor.yml +7 -1
  5. data/example/in_forward.conf +4 -0
  6. data/lib/fluent/compat/exec_util.rb +129 -0
  7. data/lib/fluent/compat/file_util.rb +54 -0
  8. data/lib/fluent/compat/filter.rb +21 -3
  9. data/lib/fluent/compat/formatter.rb +4 -2
  10. data/lib/fluent/compat/formatter_utils.rb +85 -0
  11. data/lib/fluent/compat/handle_tag_and_time_mixin.rb +60 -0
  12. data/lib/fluent/compat/input.rb +1 -3
  13. data/lib/fluent/compat/output.rb +95 -39
  14. data/lib/fluent/compat/parser.rb +17 -0
  15. data/lib/fluent/compat/parser_utils.rb +40 -0
  16. data/lib/fluent/compat/socket_util.rb +165 -0
  17. data/lib/fluent/compat/string_util.rb +34 -0
  18. data/lib/fluent/{test/driver/owner.rb → compat/structured_format_mixin.rb} +5 -11
  19. data/lib/fluent/config/element.rb +2 -2
  20. data/lib/fluent/configurable.rb +2 -1
  21. data/lib/fluent/event.rb +61 -7
  22. data/lib/fluent/event_router.rb +1 -1
  23. data/lib/fluent/plugin.rb +7 -7
  24. data/lib/fluent/plugin/buf_file.rb +5 -2
  25. data/lib/fluent/plugin/buffer.rb +194 -64
  26. data/lib/fluent/plugin/buffer/chunk.rb +28 -3
  27. data/lib/fluent/plugin/buffer/file_chunk.rb +5 -21
  28. data/lib/fluent/plugin/buffer/memory_chunk.rb +1 -11
  29. data/lib/fluent/plugin/exec_util.rb +2 -112
  30. data/lib/fluent/plugin/file_util.rb +3 -38
  31. data/lib/fluent/plugin/file_wrapper.rb +1 -1
  32. data/lib/fluent/plugin/filter_grep.rb +3 -7
  33. data/lib/fluent/plugin/filter_record_transformer.rb +5 -5
  34. data/lib/fluent/plugin/filter_stdout.rb +18 -11
  35. data/lib/fluent/plugin/formatter.rb +0 -48
  36. data/lib/fluent/plugin/formatter_csv.rb +7 -8
  37. data/lib/fluent/plugin/formatter_hash.rb +1 -4
  38. data/lib/fluent/plugin/formatter_json.rb +1 -4
  39. data/lib/fluent/plugin/formatter_ltsv.rb +5 -6
  40. data/lib/fluent/plugin/formatter_msgpack.rb +1 -4
  41. data/lib/fluent/plugin/formatter_out_file.rb +36 -3
  42. data/lib/fluent/plugin/formatter_stdout.rb +36 -1
  43. data/lib/fluent/plugin/in_dummy.rb +9 -2
  44. data/lib/fluent/plugin/in_exec.rb +20 -57
  45. data/lib/fluent/plugin/in_forward.rb +4 -3
  46. data/lib/fluent/plugin/in_object_space.rb +8 -44
  47. data/lib/fluent/plugin/in_syslog.rb +13 -24
  48. data/lib/fluent/plugin/in_tail.rb +3 -0
  49. data/lib/fluent/plugin/out_buffered_stdout.rb +14 -4
  50. data/lib/fluent/plugin/out_exec.rb +7 -5
  51. data/lib/fluent/plugin/out_exec_filter.rb +10 -10
  52. data/lib/fluent/plugin/out_file.rb +1 -3
  53. data/lib/fluent/plugin/out_forward.rb +38 -57
  54. data/lib/fluent/plugin/out_stdout.rb +14 -5
  55. data/lib/fluent/plugin/out_stream.rb +3 -0
  56. data/lib/fluent/plugin/output.rb +31 -14
  57. data/lib/fluent/plugin/parser.rb +0 -69
  58. data/lib/fluent/plugin/parser_apache.rb +10 -6
  59. data/lib/fluent/plugin/parser_apache_error.rb +8 -3
  60. data/lib/fluent/plugin/parser_csv.rb +3 -1
  61. data/lib/fluent/plugin/parser_json.rb +1 -1
  62. data/lib/fluent/plugin/parser_multiline.rb +5 -3
  63. data/lib/fluent/plugin/parser_nginx.rb +10 -6
  64. data/lib/fluent/plugin/parser_regexp.rb +73 -0
  65. data/lib/fluent/plugin/socket_util.rb +2 -148
  66. data/lib/fluent/plugin/storage_local.rb +1 -1
  67. data/lib/fluent/plugin/string_util.rb +3 -18
  68. data/lib/fluent/plugin_helper.rb +1 -0
  69. data/lib/fluent/plugin_helper/compat_parameters.rb +166 -41
  70. data/lib/fluent/plugin_helper/formatter.rb +30 -19
  71. data/lib/fluent/plugin_helper/inject.rb +25 -12
  72. data/lib/fluent/plugin_helper/parser.rb +22 -13
  73. data/lib/fluent/plugin_helper/storage.rb +22 -13
  74. data/lib/fluent/registry.rb +19 -6
  75. data/lib/fluent/supervisor.rb +27 -1
  76. data/lib/fluent/test/driver/base.rb +16 -92
  77. data/lib/fluent/test/driver/base_owned.rb +17 -53
  78. data/lib/fluent/test/driver/base_owner.rb +125 -0
  79. data/lib/fluent/test/driver/filter.rb +24 -2
  80. data/lib/fluent/test/driver/input.rb +2 -2
  81. data/lib/fluent/test/driver/multi_output.rb +2 -2
  82. data/lib/fluent/test/driver/output.rb +3 -5
  83. data/lib/fluent/test/helpers.rb +25 -0
  84. data/lib/fluent/test/input_test.rb +4 -4
  85. data/lib/fluent/test/output_test.rb +3 -3
  86. data/lib/fluent/version.rb +1 -1
  87. data/test/config/test_element.rb +135 -6
  88. data/test/plugin/test_buf_file.rb +71 -3
  89. data/test/plugin/test_buffer.rb +305 -86
  90. data/test/plugin/test_buffer_chunk.rb +60 -2
  91. data/test/plugin/test_buffer_file_chunk.rb +4 -3
  92. data/test/plugin/test_filter_grep.rb +25 -21
  93. data/test/plugin/test_filter_record_transformer.rb +75 -67
  94. data/test/plugin/test_filter_stdout.rb +171 -74
  95. data/test/plugin/test_formatter_csv.rb +94 -0
  96. data/test/plugin/test_formatter_json.rb +30 -0
  97. data/test/plugin/test_formatter_ltsv.rb +52 -0
  98. data/test/plugin/test_formatter_msgpack.rb +28 -0
  99. data/test/plugin/test_formatter_out_file.rb +95 -0
  100. data/test/plugin/test_formatter_single_value.rb +38 -0
  101. data/test/plugin/test_in_dummy.rb +95 -0
  102. data/test/plugin/test_in_exec.rb +27 -31
  103. data/test/plugin/test_in_forward.rb +24 -0
  104. data/test/plugin/test_in_gc_stat.rb +5 -5
  105. data/test/plugin/test_in_object_space.rb +4 -4
  106. data/test/plugin/test_in_syslog.rb +60 -35
  107. data/test/plugin/test_out_buffered_stdout.rb +17 -3
  108. data/test/plugin/test_out_forward.rb +93 -5
  109. data/test/plugin/test_out_stdout.rb +14 -3
  110. data/test/plugin/test_output_as_buffered_retries.rb +20 -0
  111. data/test/plugin/test_output_as_buffered_secondary.rb +16 -0
  112. data/test/plugin/test_output_as_standard.rb +22 -22
  113. data/test/plugin/test_parser_apache.rb +13 -9
  114. data/test/plugin/test_parser_apache_error.rb +11 -6
  115. data/test/plugin/test_parser_csv.rb +35 -25
  116. data/test/plugin/test_parser_nginx.rb +11 -5
  117. data/test/plugin/test_parser_regexp.rb +235 -68
  118. data/test/plugin/test_parser_tsv.rb +54 -58
  119. data/test/plugin_helper/test_compat_parameters.rb +111 -46
  120. data/test/plugin_helper/test_formatter.rb +40 -0
  121. data/test/plugin_helper/test_inject.rb +101 -2
  122. data/test/plugin_helper/test_parser.rb +40 -0
  123. data/test/plugin_helper/test_storage.rb +43 -0
  124. data/test/test_event.rb +93 -0
  125. data/test/test_event_router.rb +13 -4
  126. data/test/test_event_time.rb +0 -3
  127. data/test/test_formatter.rb +7 -164
  128. data/test/test_plugin_classes.rb +28 -1
  129. metadata +24 -3
@@ -56,7 +56,34 @@ module FluentTest
56
56
  end
57
57
  end
58
58
 
59
- class FluentTestFilter < ::Fluent::Filter
59
+ class FluentCompatTestFilter < ::Fluent::Filter
60
+ ::Fluent::Plugin.register_filter('test_compat_filter', self)
61
+
62
+ def initialize(field = '__test__')
63
+ super()
64
+ @num = 0
65
+ @field = field
66
+ end
67
+
68
+ attr_reader :num
69
+ attr_reader :started
70
+
71
+ def start
72
+ @started = true
73
+ end
74
+
75
+ def shutdown
76
+ @started = false
77
+ end
78
+
79
+ def filter(tag, time, record)
80
+ record[@field] = @num
81
+ @num += 1
82
+ record
83
+ end
84
+ end
85
+
86
+ class FluentTestFilter < ::Fluent::Plugin::Filter
60
87
  ::Fluent::Plugin.register_filter('test_filter', self)
61
88
 
62
89
  def initialize(field = '__test__')
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: 0.14.1
4
+ version: 0.14.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sadayuki Furuhashi
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-06-30 00:00:00.000000000 Z
11
+ date: 2016-08-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: msgpack
@@ -340,17 +340,25 @@ files:
340
340
  - lib/fluent/command/debug.rb
341
341
  - lib/fluent/command/fluentd.rb
342
342
  - lib/fluent/compat/call_super_mixin.rb
343
+ - lib/fluent/compat/exec_util.rb
344
+ - lib/fluent/compat/file_util.rb
343
345
  - lib/fluent/compat/filter.rb
344
346
  - lib/fluent/compat/formatter.rb
347
+ - lib/fluent/compat/formatter_utils.rb
348
+ - lib/fluent/compat/handle_tag_and_time_mixin.rb
345
349
  - lib/fluent/compat/handle_tag_name_mixin.rb
346
350
  - lib/fluent/compat/input.rb
347
351
  - lib/fluent/compat/output.rb
348
352
  - lib/fluent/compat/output_chain.rb
349
353
  - lib/fluent/compat/parser.rb
354
+ - lib/fluent/compat/parser_utils.rb
350
355
  - lib/fluent/compat/propagate_default.rb
351
356
  - lib/fluent/compat/record_filter_mixin.rb
352
357
  - lib/fluent/compat/set_tag_key_mixin.rb
353
358
  - lib/fluent/compat/set_time_key_mixin.rb
359
+ - lib/fluent/compat/socket_util.rb
360
+ - lib/fluent/compat/string_util.rb
361
+ - lib/fluent/compat/structured_format_mixin.rb
354
362
  - lib/fluent/compat/type_converter.rb
355
363
  - lib/fluent/config.rb
356
364
  - lib/fluent/config/basic_parser.rb
@@ -445,6 +453,7 @@ files:
445
453
  - lib/fluent/plugin/parser_multiline.rb
446
454
  - lib/fluent/plugin/parser_nginx.rb
447
455
  - lib/fluent/plugin/parser_none.rb
456
+ - lib/fluent/plugin/parser_regexp.rb
448
457
  - lib/fluent/plugin/parser_syslog.rb
449
458
  - lib/fluent/plugin/parser_tsv.rb
450
459
  - lib/fluent/plugin/socket_util.rb
@@ -474,13 +483,13 @@ files:
474
483
  - lib/fluent/test/base.rb
475
484
  - lib/fluent/test/driver/base.rb
476
485
  - lib/fluent/test/driver/base_owned.rb
486
+ - lib/fluent/test/driver/base_owner.rb
477
487
  - lib/fluent/test/driver/event_feeder.rb
478
488
  - lib/fluent/test/driver/filter.rb
479
489
  - lib/fluent/test/driver/formatter.rb
480
490
  - lib/fluent/test/driver/input.rb
481
491
  - lib/fluent/test/driver/multi_output.rb
482
492
  - lib/fluent/test/driver/output.rb
483
- - lib/fluent/test/driver/owner.rb
484
493
  - lib/fluent/test/driver/parser.rb
485
494
  - lib/fluent/test/driver/test_event_router.rb
486
495
  - lib/fluent/test/filter_test.rb
@@ -527,6 +536,12 @@ files:
527
536
  - test/plugin/test_filter_grep.rb
528
537
  - test/plugin/test_filter_record_transformer.rb
529
538
  - test/plugin/test_filter_stdout.rb
539
+ - test/plugin/test_formatter_csv.rb
540
+ - test/plugin/test_formatter_json.rb
541
+ - test/plugin/test_formatter_ltsv.rb
542
+ - test/plugin/test_formatter_msgpack.rb
543
+ - test/plugin/test_formatter_out_file.rb
544
+ - test/plugin/test_formatter_single_value.rb
530
545
  - test/plugin/test_in_debug_agent.rb
531
546
  - test/plugin/test_in_dummy.rb
532
547
  - test/plugin/test_in_exec.rb
@@ -669,6 +684,12 @@ test_files:
669
684
  - test/plugin/test_filter_grep.rb
670
685
  - test/plugin/test_filter_record_transformer.rb
671
686
  - test/plugin/test_filter_stdout.rb
687
+ - test/plugin/test_formatter_csv.rb
688
+ - test/plugin/test_formatter_json.rb
689
+ - test/plugin/test_formatter_ltsv.rb
690
+ - test/plugin/test_formatter_msgpack.rb
691
+ - test/plugin/test_formatter_out_file.rb
692
+ - test/plugin/test_formatter_single_value.rb
672
693
  - test/plugin/test_in_debug_agent.rb
673
694
  - test/plugin/test_in_dummy.rb
674
695
  - test/plugin/test_in_exec.rb