fluentd 1.12.1-x86-mingw32 → 1.13.1-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 (87) hide show
  1. checksums.yaml +4 -4
  2. data/.deepsource.toml +13 -0
  3. data/.github/ISSUE_TEMPLATE/config.yml +2 -2
  4. data/.github/workflows/linux-test.yaml +36 -0
  5. data/.github/workflows/{build.yaml → macos-test.yaml} +8 -7
  6. data/.github/workflows/windows-test.yaml +46 -0
  7. data/.gitlab-ci.yml +19 -19
  8. data/CHANGELOG.md +163 -0
  9. data/CONTRIBUTING.md +2 -2
  10. data/MAINTAINERS.md +5 -2
  11. data/README.md +6 -3
  12. data/example/counter.conf +1 -1
  13. data/fluentd.gemspec +4 -2
  14. data/lib/fluent/command/bundler_injection.rb +1 -1
  15. data/lib/fluent/command/cat.rb +19 -4
  16. data/lib/fluent/command/fluentd.rb +1 -2
  17. data/lib/fluent/command/plugin_config_formatter.rb +2 -1
  18. data/lib/fluent/command/plugin_generator.rb +31 -1
  19. data/lib/fluent/compat/parser.rb +2 -2
  20. data/lib/fluent/config/section.rb +6 -1
  21. data/lib/fluent/config/types.rb +2 -2
  22. data/lib/fluent/event.rb +3 -13
  23. data/lib/fluent/load.rb +0 -1
  24. data/lib/fluent/log.rb +1 -0
  25. data/lib/fluent/plugin/file_wrapper.rb +49 -4
  26. data/lib/fluent/plugin/formatter_ltsv.rb +2 -2
  27. data/lib/fluent/plugin/in_http.rb +11 -1
  28. data/lib/fluent/plugin/in_monitor_agent.rb +1 -1
  29. data/lib/fluent/plugin/in_tail.rb +140 -41
  30. data/lib/fluent/plugin/in_tail/position_file.rb +15 -1
  31. data/lib/fluent/plugin/out_copy.rb +18 -5
  32. data/lib/fluent/plugin/out_exec_filter.rb +3 -3
  33. data/lib/fluent/plugin/out_forward.rb +75 -61
  34. data/lib/fluent/plugin/output.rb +11 -9
  35. data/lib/fluent/plugin/parser_csv.rb +2 -2
  36. data/lib/fluent/plugin/parser_syslog.rb +2 -2
  37. data/lib/fluent/plugin/service_discovery.rb +0 -15
  38. data/lib/fluent/plugin/storage_local.rb +4 -4
  39. data/lib/fluent/plugin_helper/http_server/router.rb +1 -1
  40. data/lib/fluent/plugin_helper/server.rb +4 -2
  41. data/lib/fluent/plugin_helper/service_discovery.rb +39 -1
  42. data/lib/fluent/plugin_helper/service_discovery/manager.rb +11 -5
  43. data/lib/fluent/plugin_helper/socket_option.rb +2 -2
  44. data/lib/fluent/supervisor.rb +16 -1
  45. data/lib/fluent/system_config.rb +14 -0
  46. data/lib/fluent/time.rb +57 -1
  47. data/lib/fluent/version.rb +1 -1
  48. data/templates/new_gem/fluent-plugin.gemspec.erb +3 -3
  49. data/test/command/test_cat.rb +99 -0
  50. data/test/command/test_fluentd.rb +8 -0
  51. data/test/config/test_configurable.rb +1 -1
  52. data/test/config/test_section.rb +9 -0
  53. data/test/config/test_system_config.rb +46 -0
  54. data/test/plugin/in_tail/test_io_handler.rb +4 -4
  55. data/test/plugin/in_tail/test_position_file.rb +58 -4
  56. data/test/plugin/test_file_wrapper.rb +115 -0
  57. data/test/plugin/test_in_exec.rb +1 -1
  58. data/test/plugin/test_in_forward.rb +59 -83
  59. data/test/plugin/test_in_http.rb +58 -40
  60. data/test/plugin/test_in_syslog.rb +66 -56
  61. data/test/plugin/test_in_tail.rb +298 -26
  62. data/test/plugin/test_in_tcp.rb +45 -32
  63. data/test/plugin/test_in_udp.rb +47 -33
  64. data/test/plugin/test_out_copy.rb +87 -0
  65. data/test/plugin/test_out_forward.rb +198 -91
  66. data/test/plugin/test_out_http.rb +1 -1
  67. data/test/plugin/test_out_stream.rb +18 -8
  68. data/test/plugin/test_output.rb +15 -3
  69. data/test/plugin/test_output_as_buffered_backup.rb +2 -0
  70. data/test/plugin/test_parser_csv.rb +14 -0
  71. data/test/plugin/test_parser_syslog.rb +14 -0
  72. data/test/plugin_helper/http_server/test_route.rb +1 -1
  73. data/test/plugin_helper/service_discovery/test_manager.rb +1 -1
  74. data/test/plugin_helper/test_child_process.rb +6 -3
  75. data/test/plugin_helper/test_http_server_helper.rb +34 -27
  76. data/test/plugin_helper/test_server.rb +144 -139
  77. data/test/plugin_helper/test_service_discovery.rb +74 -14
  78. data/test/plugin_helper/test_socket.rb +16 -9
  79. data/test/test_config.rb +2 -1
  80. data/test/test_event.rb +16 -0
  81. data/test/test_formatter.rb +30 -0
  82. data/test/test_output.rb +2 -2
  83. data/test/test_supervisor.rb +35 -0
  84. data/test/test_time_parser.rb +109 -0
  85. metadata +55 -11
  86. data/.travis.yml +0 -77
  87. data/appveyor.yml +0 -31
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: efe5129f312dd3485a7afab8d80752927f81d25d9f082d02777872172f2a9530
4
- data.tar.gz: 5c172af998e60bc1556f2ea19540aa0892fecba7e6f7b0b3441be96dd2e414f5
3
+ metadata.gz: dfac89a6bc983358dc19675fddc0c6e28182ff1ee3ac07b5d4dde7d25473571f
4
+ data.tar.gz: 693676284c38b07e959db0f571919654feca14bdc3488861d599722ddddd95a0
5
5
  SHA512:
6
- metadata.gz: 396d04f2099a3943b3f0902cc09cc9d8903c00ecedac03a6e64864177faf99bf912fbf4a1a7f1e5dda31e107d28028a6f2bde5bdd2e360c32ee3c32c74b9f297
7
- data.tar.gz: 98502195dc14d04ce14b54b8f9afdfcbc847f710a5d1f0711ca04f7a081828e961eb9ee5d8e0a7d9d4039adeb152178399b9d0e49d86f8c2e919421e343782c1
6
+ metadata.gz: b16a11e6f23e56c87cea1c4f9ae0916f94988ad562b873e83e6ddfa1b54efb1fda304730d236036f1402e5302d3e1498e27d8616a7fa85b23726cbe187c645d8
7
+ data.tar.gz: d0dab564fd15451fbf664818a85cdde1724da2b5677f20ca4d9a4627ee57c5eb8f228bb1b07e954fa3c385978615278ba67e585aa409a8d5ddaaa4884075ca5e
data/.deepsource.toml ADDED
@@ -0,0 +1,13 @@
1
+ version = 1
2
+
3
+ test_patterns = ["test/**/test_*.rb"]
4
+
5
+ exclude_patterns = [
6
+ "bin/**",
7
+ "docs/**",
8
+ "example/**"
9
+ ]
10
+
11
+ [[analyzers]]
12
+ name = "ruby"
13
+ enabled = true
@@ -1,5 +1,5 @@
1
1
  blank_issues_enabled: false
2
2
  contact_links:
3
3
  - name: Ask a Question
4
- url: https://groups.google.com/forum/#!forum/fluentd
5
- about: I have questions about Fluentd and plugins. Please ask and answer questions here
4
+ url: https://discuss.fluentd.org/
5
+ about: I have questions about Fluentd and plugins. Please ask and answer questions at https://discuss.fluentd.org/.
@@ -0,0 +1,36 @@
1
+ name: Testing on Ubuntu
2
+
3
+ on:
4
+ push:
5
+ branches: [master]
6
+ pull_request:
7
+ branches: [master]
8
+
9
+ jobs:
10
+ test:
11
+ runs-on: ${{ matrix.os }}
12
+ continue-on-error: ${{ matrix.experimental }}
13
+ strategy:
14
+ fail-fast: false
15
+ matrix:
16
+ ruby-version: ['3.0', '2.7', '2.6']
17
+ os: [ubuntu-latest]
18
+ experimental: [false]
19
+ include:
20
+ - ruby-version: head
21
+ os: ubuntu-latest
22
+ experimental: true
23
+
24
+ name: Unit testing with Ruby ${{ matrix.ruby-version }} on ${{ matrix.os }}
25
+ steps:
26
+ - uses: actions/checkout@v2
27
+ - name: Set up Ruby
28
+ uses: ruby/setup-ruby@v1
29
+ with:
30
+ ruby-version: ${{ matrix.ruby-version }}
31
+ - name: Install addons
32
+ run: sudo apt-get install libgmp3-dev libcap-ng-dev
33
+ - name: Install dependencies
34
+ run: bundle install
35
+ - name: Run tests
36
+ run: bundle exec rake test
@@ -1,4 +1,4 @@
1
- name: build
1
+ name: Testing on macOS
2
2
 
3
3
  on:
4
4
  push:
@@ -8,22 +8,23 @@ on:
8
8
 
9
9
  jobs:
10
10
  test:
11
- runs-on: ubuntu-latest
12
-
11
+ runs-on: ${{ matrix.os }}
12
+ continue-on-error: ${{ matrix.experimental }}
13
13
  strategy:
14
14
  fail-fast: false
15
15
  matrix:
16
- ruby-version: [2.7, 2.6, 2.5]
16
+ ruby-version: ['head', '2.7']
17
+ os: [macos-latest]
18
+ experimental: [true]
17
19
 
20
+ name: Unit testing with Ruby ${{ matrix.ruby-version }} on ${{ matrix.os }}
18
21
  steps:
19
22
  - uses: actions/checkout@v2
20
23
  - name: Set up Ruby
21
24
  uses: ruby/setup-ruby@v1
22
25
  with:
23
26
  ruby-version: ${{ matrix.ruby-version }}
24
- - name: Install addons
25
- run: sudo apt-get install libgmp3-dev libcap-ng-dev
26
27
  - name: Install dependencies
27
28
  run: bundle install
28
29
  - name: Run tests
29
- run: bundle exec rake test TESTOPTS=-v
30
+ run: bundle exec rake test
@@ -0,0 +1,46 @@
1
+ name: Testing on Windows
2
+
3
+ on:
4
+ push:
5
+ branches: [master]
6
+ pull_request:
7
+ branches: [master]
8
+
9
+ jobs:
10
+ test:
11
+ runs-on: ${{ matrix.os }}
12
+ continue-on-error: ${{ matrix.experimental }}
13
+ strategy:
14
+ fail-fast: false
15
+ matrix:
16
+ ruby-version: ['2.7', '2.6']
17
+ os:
18
+ - windows-latest
19
+ experimental: [false]
20
+ include:
21
+ - ruby-version: '3.0.1'
22
+ os: windows-latest
23
+ experimental: true
24
+ # On Ruby 3.0, we need to use fiddle 1.0.8 or later to retrieve correct
25
+ # error code. In addition, we have to specify the path of fiddle by RUBYLIB
26
+ # because RubyInstaller loads Ruby's bundled fiddle before initializing gem.
27
+ # See also:
28
+ # * https://github.com/ruby/fiddle/issues/72
29
+ # * https://bugs.ruby-lang.org/issues/17813
30
+ # * https://github.com/oneclick/rubyinstaller2/blob/8225034c22152d8195bc0aabc42a956c79d6c712/lib/ruby_installer/build/dll_directory.rb
31
+ ruby-lib-opt: RUBYLIB=%RUNNER_TOOL_CACHE%/Ruby/3.0.1/x64/lib/ruby/gems/3.0.0/gems/fiddle-1.0.8/lib
32
+
33
+ name: Unit testing with Ruby ${{ matrix.ruby-version }} on ${{ matrix.os }}
34
+ steps:
35
+ - uses: actions/checkout@v2
36
+ - name: Set up Ruby
37
+ uses: ruby/setup-ruby@v1
38
+ with:
39
+ ruby-version: ${{ matrix.ruby-version }}
40
+ - name: Add Fiddle 1.0.8
41
+ if: ${{ matrix.ruby-version == '3.0.1' }}
42
+ run: gem install fiddle --version 1.0.8
43
+ - name: Install dependencies
44
+ run: ridk exec bundle install
45
+ - name: Run tests
46
+ run: bundle exec rake test TESTOPTS=-v ${{ matrix.ruby-lib-opt }}
data/.gitlab-ci.yml CHANGED
@@ -1,6 +1,6 @@
1
1
  .install-template:
2
2
  before_script:
3
- - gem update --system=2.7.8
3
+ - gem update --system
4
4
  - ruby -v
5
5
 
6
6
  .test-template:
@@ -13,34 +13,34 @@ stages:
13
13
  - build
14
14
  - tests
15
15
 
16
- 2-4-5:
17
- image: "ruby:2.4.5"
16
+ 2-6-6:
17
+ image: "ruby:2.6.6"
18
18
  stage: build
19
19
  extends: .install-template
20
20
  script:
21
21
  - bundle install --jobs=3 --retry=3
22
22
  cache:
23
- key: "$CI_COMMIT_REF_SLUG 2-4-5"
23
+ key: "$CI_COMMIT_REF_SLUG 2-6-6"
24
24
  paths:
25
25
 
26
- 2-5-5:
27
- image: "ruby:2.5.5"
26
+ 2-7-2:
27
+ image: "ruby:2.7.2"
28
28
  stage: build
29
29
  extends: .install-template
30
30
  script:
31
31
  - bundle install --jobs=3 --retry=3
32
32
  cache:
33
- key: "$CI_COMMIT_REF_SLUG 2-5-5"
33
+ key: "$CI_COMMIT_REF_SLUG 2-7-2"
34
34
  paths:
35
35
 
36
- 2-6-3:
37
- image: "ruby:2.6.3"
36
+ 3-0-0:
37
+ image: "ruby:3.0.0"
38
38
  stage: build
39
39
  extends: .install-template
40
40
  script:
41
41
  - bundle install --jobs=3 --retry=3
42
42
  cache:
43
- key: "$CI_COMMIT_REF_SLUG 2-6-3"
43
+ key: "$CI_COMMIT_REF_SLUG 3-0-0"
44
44
  paths:
45
45
 
46
46
  rubyhead:
@@ -54,39 +54,39 @@ rubyhead:
54
54
  paths:
55
55
  - ./*
56
56
 
57
- 2-4-5-test:
58
- image: "ruby:2.4.5"
57
+ 2-6-6-test:
58
+ image: "ruby:2.6.6"
59
59
  stage: tests
60
60
  allow_failure: true
61
61
  extends: .test-template
62
62
  script:
63
63
  - bundle exec rake test
64
64
  cache:
65
- key: "$CI_COMMIT_REF_SLUG 2-4-5"
65
+ key: "$CI_COMMIT_REF_SLUG 2-6-6"
66
66
  paths:
67
67
  - ./*
68
68
 
69
- 2-5-5-test:
70
- image: "ruby:2.5.5"
69
+ 2-7-2-test:
70
+ image: "ruby:2.7.2"
71
71
  stage: tests
72
72
  allow_failure: true
73
73
  extends: .test-template
74
74
  script:
75
75
  - bundle exec rake test
76
76
  cache:
77
- key: "$CI_COMMIT_REF_SLUG 2-5-5"
77
+ key: "$CI_COMMIT_REF_SLUG 2-7-2"
78
78
  paths:
79
79
  - ./*
80
80
 
81
- 2-6-3-test:
82
- image: "ruby:2.6.3"
81
+ 3-0-0-test:
82
+ image: "ruby:3.0.0"
83
83
  stage: tests
84
84
  allow_failure: true
85
85
  extends: .test-template
86
86
  script:
87
87
  - bundle exec rake test
88
88
  cache:
89
- key: "$CI_COMMIT_REF_SLUG 2-6-3"
89
+ key: "$CI_COMMIT_REF_SLUG 3-0-0"
90
90
  paths:
91
91
  - ./*
92
92
 
data/CHANGELOG.md CHANGED
@@ -1,5 +1,168 @@
1
+ # v1.13.1
2
+
3
+ ## Release v1.13.1 - 2021/06/25
4
+
5
+ ### Bug fix
6
+
7
+ * out_forward: Fixed a race condition on handshake
8
+ It's caused by using a same unpacker from multiple threads.
9
+ https://github.com/fluent/fluentd/pull/3405
10
+ https://github.com/fluent/fluentd/pull/3406
11
+ * in_tail: Fixed to remove too much verbose debugging logs
12
+ It was unexpectedly introduced by #3185 log throttling feature.
13
+ https://github.com/fluent/fluentd/pull/3418
14
+ * Fixed not to echo back the provides path as is on a 404 error
15
+ There was a potential cross-site scripting vector even though
16
+ it is quite difficult to exploit.
17
+ https://github.com/fluent/fluentd/pull/3427
18
+
19
+ ### Misc
20
+
21
+ * Pretty print for Fluent::Config::Section has been supported
22
+ for debugging
23
+ https://github.com/fluent/fluentd/pull/3398
24
+ * CI: Dropped to run CI for Ruby 2.5
25
+ https://github.com/fluent/fluentd/pull/3412
26
+
27
+ # v1.13
28
+
29
+ ## Release v1.13.0 - 2021/05/29
30
+
31
+ ### Enhancement
32
+
33
+ * in_tail: Handle log throttling per file feature
34
+ https://github.com/fluent/fluentd/pull/3185
35
+ https://github.com/fluent/fluentd/pull/3364
36
+ https://github.com/fluent/fluentd/pull/3379
37
+ * Extend to support service discovery manager in simpler way
38
+ https://github.com/fluent/fluentd/pull/3299
39
+ https://github.com/fluent/fluentd/pull/3362
40
+ * in_http: HTTP GET requests has been supported
41
+ https://github.com/fluent/fluentd/pull/3373
42
+ * The log rotate settings in system configuration has been supported
43
+ https://github.com/fluent/fluentd/pull/3352
44
+
45
+ ### Bug fix
46
+
47
+ * Fix to disable `trace_instruction` when
48
+ `RubyVM::InstructionSequence` is available. It improves
49
+ compatibility with `truffleruby` some extent.
50
+ https://github.com/fluent/fluentd/pull/3376
51
+ * in_tail: Safely skip files which are used by another process on
52
+ Windows. It improves exception handling about
53
+ `ERROR_SHARING_VIOLATION` on Windows.
54
+ https://github.com/fluent/fluentd/pull/3378
55
+ * fluent-cat: the issue resending secondary file in specific format
56
+ has been fixed
57
+ https://github.com/fluent/fluentd/pull/3368
58
+ * in_tail: Shutdown immediately & safely even if reading huge files
59
+ Note that `skip_refresh_on_startup` must be enabled.
60
+ https://github.com/fluent/fluentd/pull/3380
61
+
62
+ ### Misc
63
+
64
+ * example: Change a path to backup_path in counter_server correctly
65
+ https://github.com/fluent/fluentd/pull/3359
66
+ * README: Update link to community forum to discuss.fluentd.org
67
+ https://github.com/fluent/fluentd/pull/3360
68
+
1
69
  # v1.12
2
70
 
71
+ ## Release v1.12.4 - 2021/05/26
72
+
73
+ ### Bug fix
74
+
75
+ * in_tail: Fix a bug that refresh_watcher fails to handle file rotations
76
+
77
+ ## Release v1.12.3 - 2021/04/23
78
+
79
+ ### Enhancement
80
+
81
+ * plugin_helper: Allow TLS to use keep-alive socket option
82
+ https://github.com/fluent/fluentd/pull/3308
83
+
84
+ ### Bug fix
85
+
86
+ * parser_csv, parser_syslog: Fix a naming conflict on parser_type
87
+ https://github.com/fluent/fluentd/pull/3302
88
+ * in_tail: Fix incorrect error code & message on Windows
89
+ https://github.com/fluent/fluentd/pull/3325
90
+ https://github.com/fluent/fluentd/pull/3329
91
+ https://github.com/fluent/fluentd/pull/3331
92
+ https://github.com/fluent/fluentd/pull/3337
93
+ * in_tail: Fix a crash bug on catching a short-lived log
94
+ https://github.com/fluent/fluentd/pull/3328
95
+ * storage_local: Fix position file corruption issue on concurrent gracefulReloads
96
+ https://github.com/fluent/fluentd/pull/3335
97
+ * Fix incorrect warnings about ${chunk_id} with out_s3
98
+ https://github.com/fluent/fluentd/pull/3339
99
+ * TLS Server: Add peer information to error log message
100
+ https://github.com/fluent/fluentd/pull/3330
101
+
102
+ ### Misc
103
+
104
+ * fluent-plugin-generate: add note about plugin name
105
+ https://github.com/fluent/fluentd/pull/3303
106
+ * fluent-plugin-generate: Use same depended gem version with fluentd
107
+ https://github.com/fluent/fluentd/pull/3305
108
+ * Fix some broken unit tests and improve CI's stability
109
+ https://github.com/fluent/fluentd/pull/3304
110
+ https://github.com/fluent/fluentd/pull/3307
111
+ https://github.com/fluent/fluentd/pull/3312
112
+ https://github.com/fluent/fluentd/pull/3313
113
+ https://github.com/fluent/fluentd/pull/3314
114
+ https://github.com/fluent/fluentd/pull/3316
115
+ https://github.com/fluent/fluentd/pull/3336
116
+ * Permit to install with win32-service 2.2.0 on Windows
117
+ https://github.com/fluent/fluentd/pull/3343
118
+
119
+ ## Release v1.12.2 - 2021/03/29
120
+
121
+ ### Enhancement
122
+
123
+ * out_copy: Add ignore_if_prev_successes
124
+ https://github.com/fluent/fluentd/pull/3190
125
+ https://github.com/fluent/fluentd/pull/3287
126
+ * Support multiple kind of timestamp format
127
+ https://github.com/fluent/fluentd/pull/3252
128
+ * formatter_ltsv: suppress delimiters in output
129
+ https://github.com/fluent/fluentd/pull/1666
130
+ https://github.com/fluent/fluentd/pull/3288
131
+ https://github.com/fluent/fluentd/pull/3289
132
+
133
+ ### Bug fix
134
+
135
+ * in_tail: Expect ENOENT during stat
136
+ https://github.com/fluent/fluentd/pull/3275
137
+ * out_forward: Prevent transferring duplicate logs on restart
138
+ https://github.com/fluent/fluentd/pull/3267
139
+ https://github.com/fluent/fluentd/pull/3285
140
+ * in_tail: Handle to send rotated logs when mv is used for rotating
141
+ https://github.com/fluent/fluentd/pull/3294
142
+ * fluent-plugin-config-format: Fill an uninitialized instance variable
143
+ https://github.com/fluent/fluentd/pull/3297
144
+ * Fix MessagePackEventStream issue with Enumerable methods
145
+ https://github.com/fluent/fluentd/pull/2116
146
+
147
+ ### Misc
148
+
149
+ * Add webrick to support Ruby 3.0
150
+ https://github.com/fluent/fluentd/pull/3257
151
+ * Suggest Discource instead of Google Groups
152
+ https://github.com/fluent/fluentd/pull/3261
153
+ * Update MAINTAINERS.md
154
+ https://github.com/fluent/fluentd/pull/3282
155
+ * Introduce DeepSource to check code quality
156
+ https://github.com/fluent/fluentd/pull/3286
157
+ https://github.com/fluent/fluentd/pull/3259
158
+ https://github.com/fluent/fluentd/pull/3291
159
+ * Migrate to GitHub Actions and stabilize tests
160
+ https://github.com/fluent/fluentd/pull/3266
161
+ https://github.com/fluent/fluentd/pull/3268
162
+ https://github.com/fluent/fluentd/pull/3281
163
+ https://github.com/fluent/fluentd/pull/3283
164
+ https://github.com/fluent/fluentd/pull/3290
165
+
3
166
  ## Release v1.12.1 - 2021/02/18
4
167
 
5
168
  ### Enhancement
data/CONTRIBUTING.md CHANGED
@@ -6,7 +6,7 @@ We'd love your contribution. Here are the guidelines!
6
6
 
7
7
  RESOURCES of [Official site](https://www.fluentd.org/) and [Fluentd documentation](https://docs.fluentd.org/) may help you.
8
8
 
9
- If you have further questions about Fluentd and plugins, please direct these to [Mailing List](https://groups.google.com/forum/#!forum/fluentd).
9
+ If you have further questions about Fluentd and plugins, please direct these to [Community Forum](https://discuss.fluentd.org/).
10
10
  Don't use Github issue for asking questions. Here are examples:
11
11
 
12
12
  - I installed xxx plugin but it doesn't work. Why?
@@ -16,7 +16,7 @@ Don't use Github issue for asking questions. Here are examples:
16
16
  We may close such questions to keep clear repository for developers and users.
17
17
  Github issue is mainly for submitting a bug report or feature request. See below.
18
18
 
19
- If you can't judge your case is a bug or not, use mailing list or slack first.
19
+ If you can't judge your case is a bug or not, use community forum or slack first.
20
20
 
21
21
  ## Found a bug?
22
22
 
data/MAINTAINERS.md CHANGED
@@ -1,8 +1,11 @@
1
1
  # Fluentd Maintainers
2
2
 
3
3
  - [Naotoshi Seo](https://github.com/sonots), [ZOZO Technologies](https://tech.zozo.com/en/)
4
- - [Okkez](https://github.com/okkez), [Clearcode](https://www.clear-code.com/)
5
- - [Hiroshi Hatake](https://github.com/cosmo0920), [Clearcode](https://www.clear-code.com/)
4
+ - [Okkez](https://github.com/okkez)
5
+ - [Hiroshi Hatake](https://github.com/cosmo0920), [Calyptia](https://www.calyptia.com/)
6
6
  - [Masahiro Nakagawa](https://github.com/repeatedly), [Treasure Data](https://www.treasuredata.com/)
7
7
  - [Satoshi Tagomori](https://github.com/tagomoris), [Treasure Data](https://www.treasuredata.com/)
8
8
  - [Eduardo Silva](https://github.com/edsiper), [Arm Treasure Data](https://www.treasuredata.com/)
9
+ - [Fujimoto Seiji](https://github.com/fujimots), [ClearCode](https://www.clear-code.com/)
10
+ - [Takuro Ashie](https://github.com/ashie), [ClearCode](https://www.clear-code.com/)
11
+ - [Kentaro Hayashi](https://github.com/kenhys), [ClearCode](https://www.clear-code.com/)