fluentd 1.10.2-x86-mingw32 → 1.11.2-x86-mingw32

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.

Files changed (68) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +102 -1
  3. data/CONTRIBUTING.md +1 -1
  4. data/example/copy_roundrobin.conf +3 -3
  5. data/example/counter.conf +1 -1
  6. data/example/filter_stdout.conf +2 -2
  7. data/example/{in_dummy_blocks.conf → in_sample_blocks.conf} +4 -4
  8. data/example/{in_dummy_with_compression.conf → in_sample_with_compression.conf} +3 -3
  9. data/example/logevents.conf +5 -5
  10. data/example/multi_filters.conf +1 -1
  11. data/example/out_exec_filter.conf +2 -2
  12. data/example/out_forward.conf +1 -1
  13. data/example/out_forward_buf_file.conf +1 -1
  14. data/example/out_forward_client.conf +5 -5
  15. data/example/out_forward_heartbeat_none.conf +1 -1
  16. data/example/out_forward_sd.conf +1 -1
  17. data/example/out_forward_shared_key.conf +2 -2
  18. data/example/out_forward_tls.conf +1 -1
  19. data/example/out_forward_users.conf +3 -3
  20. data/example/out_null.conf +4 -4
  21. data/example/secondary_file.conf +1 -1
  22. data/lib/fluent/command/fluentd.rb +11 -0
  23. data/lib/fluent/config.rb +1 -0
  24. data/lib/fluent/match.rb +10 -1
  25. data/lib/fluent/plugin/buffer.rb +24 -4
  26. data/lib/fluent/plugin/in_dummy.rb +2 -123
  27. data/lib/fluent/plugin/in_forward.rb +2 -2
  28. data/lib/fluent/plugin/in_gc_stat.rb +16 -0
  29. data/lib/fluent/plugin/in_http.rb +148 -77
  30. data/lib/fluent/plugin/in_monitor_agent.rb +1 -1
  31. data/lib/fluent/plugin/in_sample.rb +141 -0
  32. data/lib/fluent/plugin/in_tail.rb +4 -4
  33. data/lib/fluent/plugin/in_unix.rb +77 -77
  34. data/lib/fluent/plugin/out_file.rb +1 -1
  35. data/lib/fluent/plugin/out_forward.rb +7 -2
  36. data/lib/fluent/plugin/out_forward/load_balancer.rb +1 -1
  37. data/lib/fluent/plugin/out_http.rb +15 -2
  38. data/lib/fluent/plugin/parser_multiline.rb +1 -1
  39. data/lib/fluent/plugin/parser_syslog.rb +215 -54
  40. data/lib/fluent/plugin_helper/cert_option.rb +5 -8
  41. data/lib/fluent/plugin_helper/child_process.rb +3 -2
  42. data/lib/fluent/plugin_helper/record_accessor.rb +14 -0
  43. data/lib/fluent/plugin_helper/service_discovery.rb +7 -0
  44. data/lib/fluent/plugin_helper/service_discovery/manager.rb +8 -0
  45. data/lib/fluent/plugin_helper/socket.rb +1 -1
  46. data/lib/fluent/plugin_helper/socket_option.rb +2 -2
  47. data/lib/fluent/supervisor.rb +6 -3
  48. data/lib/fluent/test/filter_test.rb +2 -2
  49. data/lib/fluent/test/output_test.rb +3 -3
  50. data/lib/fluent/version.rb +1 -1
  51. data/test/plugin/out_forward/test_load_balancer.rb +46 -0
  52. data/test/plugin/test_in_gc_stat.rb +24 -1
  53. data/test/plugin/test_in_http.rb +57 -0
  54. data/test/plugin/{test_in_dummy.rb → test_in_sample.rb} +25 -25
  55. data/test/plugin/test_in_tail.rb +17 -0
  56. data/test/plugin/test_in_unix.rb +128 -73
  57. data/test/plugin/test_out_http.rb +38 -0
  58. data/test/plugin/test_parser_syslog.rb +66 -29
  59. data/test/plugin_helper/data/cert/empty.pem +0 -0
  60. data/test/plugin_helper/test_cert_option.rb +7 -0
  61. data/test/plugin_helper/test_child_process.rb +15 -0
  62. data/test/plugin_helper/test_record_accessor.rb +41 -0
  63. data/test/plugin_helper/test_server.rb +34 -0
  64. data/test/plugin_helper/test_service_discovery.rb +37 -4
  65. data/test/plugin_helper/test_socket.rb +8 -0
  66. data/test/test_match.rb +11 -0
  67. data/test/test_static_config_analysis.rb +2 -2
  68. metadata +9 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2987fa7f12e342b3a20a9f374eac70214a7a5d4d1ba3cd471b1d0bec7eb8465d
4
- data.tar.gz: b65963401cb734ce1a3bae1178d6add5277b563b0037a5afb4200acd3562cc50
3
+ metadata.gz: f38a4c148dd891e636ff02b94e60855a817b9e7ac0d4456e4afd59b5ed8b38df
4
+ data.tar.gz: 5a8167ae0002ae2a54060e1a0a883915643b699d654fdcf77cc8aaffcee164fe
5
5
  SHA512:
6
- metadata.gz: 1d5e3cef4e44db09112c559b099c095420af2b0e2de36c4d934da53ef6027f163a397e2a3ff19b70d8b3c10796377cd917d6a96f2ce701335725672c57b63da1
7
- data.tar.gz: '0194915dc5d86d4a2d631e13fa127337fb8125a54f3689ca18851891fb0ae5f4e5e3598784c71d8ba7b5804a9e690ba977ce0dabcd9874b30633a73bd877771d'
6
+ metadata.gz: a373e72618491e776ee611fec468225d68b03c2c8f58149df6d7943fadf9e236926695a6b0e625b236a03b9c51d4b770d6c98187808af9f01d989aedc08123e2
7
+ data.tar.gz: 8c9d92c48ea08db2aa6df4b2ed8d2f3bc672f2a174333a4e5621ff011a47dbed0904a7a9694445c469e634043dab857da155ed4ba49b6aefe9b5cbb00dce89db
@@ -1,5 +1,106 @@
1
+ # v1.11
2
+
3
+ ## Release v1.11.2 - 2020/08/04
4
+
5
+ ### Enhancement
6
+
7
+ * `in_dummy` renamed to `in_sample`
8
+ https://github.com/fluent/fluentd/pull/3065
9
+ * Allow regular expression in filter/match directive
10
+ https://github.com/fluent/fluentd/pull/3071
11
+ * Refactoring code
12
+ https://github.com/fluent/fluentd/pull/3051
13
+
14
+ ### Bug fix
15
+
16
+ * buffer: Fix log message for `chunk_limit_records` case
17
+ https://github.com/fluent/fluentd/pull/3079
18
+ * buffer: Fix timekey optimization for non-windows platform
19
+ https://github.com/fluent/fluentd/pull/3092
20
+ * cert: Raise an error for broken certificate file
21
+ https://github.com/fluent/fluentd/pull/3086
22
+ * cert: Set TLS ciphers list correcty on older OpenSSL
23
+ https://github.com/fluent/fluentd/pull/3093
24
+
25
+ ## Release v1.11.1 - 2020/06/22
26
+
27
+ ### Enhancement
28
+
29
+ * in_http: Add `dump_error_log` parameter
30
+ https://github.com/fluent/fluentd/pull/3035
31
+ * in_http: Improve time field handling
32
+ https://github.com/fluent/fluentd/pull/3046
33
+ * Refactoring code
34
+ https://github.com/fluent/fluentd/pull/3047
35
+
36
+ ### Bug fix
37
+
38
+ * in_tail: Use actual path instead of based pattern for ignore list
39
+ https://github.com/fluent/fluentd/pull/3042
40
+ * child_process helper: Fix child process failure due to SIGPIPE if the command uses stdout
41
+ https://github.com/fluent/fluentd/pull/3044
42
+
43
+ ## Release v1.11.0 - 2020/06/04
44
+
45
+ ### New feature
46
+
47
+ * in_unix: Use v1 API
48
+ https://github.com/fluent/fluentd/pull/2992
49
+
50
+ ### Enhancement
51
+
52
+ * parser_syslog: Support any `time_format` for RFC3164 string parser
53
+ https://github.com/fluent/fluentd/pull/3014
54
+ * parser_syslog: Add new parser for RFC5424
55
+ https://github.com/fluent/fluentd/pull/3015
56
+ * Refactoring code
57
+ https://github.com/fluent/fluentd/pull/3019
58
+
59
+ ### Bug fix
60
+
61
+ * in_gc_stat: Add `use_symbol_keys` parameter to emit string key record
62
+ https://github.com/fluent/fluentd/pull/3008
63
+
1
64
  # v1.10
2
65
 
66
+ ## Release v1.10.4 - 2020/05/12
67
+
68
+ ### Enhancement
69
+
70
+ * out_http: Support single json array payload
71
+ https://github.com/fluent/fluentd/pull/2973
72
+ * Refactoring
73
+ https://github.com/fluent/fluentd/pull/2988
74
+
75
+ ### Bug fix
76
+
77
+ * supervisor: Call `File.umask(0)` for standalone worker
78
+ https://github.com/fluent/fluentd/pull/2987
79
+ * out_forward: Fix ZeroDivisionError issue with `weight 0`
80
+ https://github.com/fluent/fluentd/pull/2989
81
+
82
+ ## Release v1.10.3 - 2020/05/01
83
+
84
+ ### Enhancement
85
+
86
+ * record_accessor: Add `set` method
87
+ https://github.com/fluent/fluentd/pull/2977
88
+ * config: Ruby DSL format is deprecated
89
+ https://github.com/fluent/fluentd/pull/2958
90
+ * Refactor code
91
+ https://github.com/fluent/fluentd/pull/2961
92
+ https://github.com/fluent/fluentd/pull/2962
93
+ https://github.com/fluent/fluentd/pull/2965
94
+ https://github.com/fluent/fluentd/pull/2966
95
+ https://github.com/fluent/fluentd/pull/2978
96
+
97
+ ### Bug fix
98
+
99
+ * out_forward: Disable `linger_timeout` setting on Windows
100
+ https://github.com/fluent/fluentd/pull/2959
101
+ * out_forward: Fix warning of service discovery manager when fluentd stops
102
+ https://github.com/fluent/fluentd/pull/2974
103
+
3
104
  ## Release v1.10.2 - 2020/04/15
4
105
 
5
106
  ### Enhancement
@@ -59,7 +160,7 @@
59
160
 
60
161
  ### New feature
61
162
 
62
- * sd plugin: Add RSV record plugin
163
+ * sd plugin: Add SRV record plugin
63
164
  https://github.com/fluent/fluentd/pull/2876
64
165
 
65
166
  ### Enhancement
@@ -24,7 +24,7 @@ If you find a bug of Fluentd or a mistake in the documentation, you can help us
24
24
  submitting an issue to Fluentd. Even better you can submit a Pull Request with a fix.
25
25
 
26
26
  * **Fluentd**: Use [fluentd](https://github.com/fluent/fluentd) repository. Fill issue template.
27
- * **Documentation**: Use [fluentd-docs](https://github.com/fluent/fluentd-docs-gitbook) repository.
27
+ * **Documentation**: Use [fluentd documentation](https://github.com/fluent/fluentd-docs-gitbook) repository.
28
28
 
29
29
  If you find a bug of 3rd party plugins, please submit an issue to each plugin repository.
30
30
  And use [omnibus-td-agent](https://github.com/treasure-data/omnibus-td-agent) repository for td-agent related issues.
@@ -1,12 +1,12 @@
1
1
  <source>
2
- @type dummy
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 dummy
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>
@@ -8,7 +8,7 @@
8
8
  </system>
9
9
 
10
10
  <source>
11
- @type dummy
11
+ @type sample
12
12
  tag "test.data"
13
13
  auto_increment_key number
14
14
  </source>
@@ -1,6 +1,6 @@
1
1
  <source>
2
- @type dummy
3
- tag dummy
2
+ @type sample
3
+ tag sample
4
4
  </source>
5
5
 
6
6
  <filter **>
@@ -1,11 +1,11 @@
1
1
  <source>
2
- @type dummy
3
- tag dummy
2
+ @type sample
3
+ tag sample
4
4
  rate 100
5
- dummy {"message":"yaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaay"}
5
+ sample {"message":"yaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaay"}
6
6
  </source>
7
7
 
8
- <match dummy>
8
+ <match sample>
9
9
  @type null
10
10
  never_flush true
11
11
  <buffer>
@@ -1,16 +1,16 @@
1
1
  <source>
2
- @type dummy
2
+ @type sample
3
3
  @label @main
4
4
  tag "test.data"
5
5
  size 2
6
6
  rate 10
7
- dummy {"message":"yaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaay"}
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 buffered_stdout
13
+ @type stdout
14
14
  <buffer>
15
15
  @type file
16
16
  path "#{Dir.pwd}/compressed_buffers"
@@ -1,10 +1,10 @@
1
1
  <source>
2
- @type dummy
3
- @label @dummylog
2
+ @type sample
3
+ @label @samplelog
4
4
  tag "data"
5
- dummy {"message":"yay"}
5
+ sample {"message":"yay"}
6
6
  </source>
7
- <label @dummylog>
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>
@@ -1,7 +1,7 @@
1
1
  # This example is to measure optimized filter pipeline performance.
2
2
 
3
3
  <source>
4
- @type dummy
4
+ @type sample
5
5
  tag test
6
6
  size 1000
7
7
  </source>
@@ -1,10 +1,10 @@
1
1
  <source>
2
- @type dummy
2
+ @type sample
3
3
  @label @exec
4
4
  tag exec_input
5
5
  rate 10
6
6
  auto_increment_key num
7
- dummy {"data":"mydata"}
7
+ sample {"data":"mydata"}
8
8
  </source>
9
9
 
10
10
  <label @exec>
@@ -1,5 +1,5 @@
1
1
  <source>
2
- @type dummy
2
+ @type sample
3
3
  tag test
4
4
  </source>
5
5
 
@@ -1,5 +1,5 @@
1
1
  <source>
2
- @type dummy
2
+ @type sample
3
3
  tag test
4
4
  </source>
5
5
 
@@ -1,21 +1,21 @@
1
1
  <source>
2
- @type dummy
2
+ @type sample
3
3
  tag test
4
4
  </source>
5
5
  <source>
6
- @type dummy
6
+ @type sample
7
7
  tag test2
8
8
  </source>
9
9
  <source>
10
- @type dummy
10
+ @type sample
11
11
  tag test3
12
12
  </source>
13
13
  <source>
14
- @type dummy
14
+ @type sample
15
15
  tag test4
16
16
  </source>
17
17
  <source>
18
- @type dummy
18
+ @type sample
19
19
  tag test5
20
20
  </source>
21
21
 
@@ -1,5 +1,5 @@
1
1
  <source>
2
- @type dummy
2
+ @type sample
3
3
  tag test
4
4
  </source>
5
5
 
@@ -1,5 +1,5 @@
1
1
  <source>
2
- @type dummy
2
+ @type sample
3
3
  tag test
4
4
  </source>
5
5
 
@@ -1,9 +1,9 @@
1
1
  <source>
2
- @type dummy
2
+ @type sample
3
3
  tag test
4
4
  </source>
5
5
  <source>
6
- @type dummy
6
+ @type sample
7
7
  tag test2
8
8
  </source>
9
9
 
@@ -1,5 +1,5 @@
1
1
  <source>
2
- @type dummy
2
+ @type sample
3
3
  tag test
4
4
  </source>
5
5
 
@@ -1,13 +1,13 @@
1
1
  <source>
2
- @type dummy
2
+ @type sample
3
3
  tag test
4
4
  </source>
5
5
  <source>
6
- @type dummy
6
+ @type sample
7
7
  tag test2
8
8
  </source>
9
9
  <source>
10
- @type dummy
10
+ @type sample
11
11
  tag test3
12
12
  </source>
13
13
 
@@ -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 dummy
6
- tag dummy
5
+ @type sample
6
+ tag sample
7
7
  rate 500000000
8
- dummy [
8
+ sample [
9
9
  {"message": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"},
10
10
  {"message": "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"},
11
11
  {"message": "ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"}
12
12
  ]
13
13
  </source>
14
14
 
15
- <match dummy.**>
15
+ <match sample.**>
16
16
  @type null
17
17
  <buffer>
18
18
  flush_interval 60s
@@ -3,7 +3,7 @@
3
3
  </system>
4
4
 
5
5
  <source>
6
- @type dummy
6
+ @type sample
7
7
  tag test
8
8
  </source>
9
9
 
@@ -185,6 +185,10 @@ if Fluent.windows?
185
185
  opts[:regwinsvcautostart] = s
186
186
  }
187
187
 
188
+ op.on('--[no-]reg-winsvc-delay-start', "Automatically start the Windows Service at boot with delay. (only effective with '--reg-winsvc i' and '--reg-winsvc-auto-start') (Windows only)") {|s|
189
+ opts[:regwinsvcdelaystart] = s
190
+ }
191
+
188
192
  op.on('--reg-winsvc-fluentdopt OPTION', "specify fluentd option parameters for Windows Service. (Windows only)") {|s|
189
193
  opts[:fluentdopt] = s
190
194
  }
@@ -285,6 +289,13 @@ if winsvcinstmode = opts[:regwinsvc]
285
289
  dependencies: [""],
286
290
  display_name: opts[:winsvc_display_name]
287
291
  )
292
+
293
+ if opts[:regwinsvcdelaystart]
294
+ Service.configure(
295
+ service_name: opts[:winsvc_name],
296
+ delayed_start: true
297
+ )
298
+ end
288
299
  when 'u'
289
300
  if Service.status(opts[:winsvc_name]).current_state != 'stopped'
290
301
  begin
@@ -62,6 +62,7 @@ module Fluent
62
62
  Parser.parse(str, fname, basepath)
63
63
  when :ruby
64
64
  require 'fluent/config/dsl'
65
+ $log.warn("Ruby DSL configuration format is deprecated. Please use original configuration format. https://docs.fluentd.org/configuration/config-file")
65
66
  Config::DSL::Parser.parse(str, File.join(basepath, fname))
66
67
  else
67
68
  raise "[BUG] unknown configuration parser specification:'#{parser}'"
@@ -33,6 +33,15 @@ module Fluent
33
33
 
34
34
  class GlobMatchPattern < MatchPattern
35
35
  def initialize(pat)
36
+ if pat.start_with?('/')
37
+ if pat.end_with?('/')
38
+ @regex = Regexp.new("\\A"+pat[1..-2]+"\\Z")
39
+ return
40
+ else
41
+ raise Fluent::ConfigError, "invalid match - regex"
42
+ end
43
+ end
44
+
36
45
  stack = []
37
46
  regex = ['']
38
47
  escape = false
@@ -125,7 +134,7 @@ module Fluent
125
134
  end
126
135
 
127
136
  def match(str)
128
- @regex.match(str) != nil
137
+ @regex.match?(str)
129
138
  end
130
139
  end
131
140