Support tls in syslog #2399
Merged
Support tls in syslog #2399
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
protocol_type have been deprecated param Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
|
All test failed. Could you check it? |
repeatedly
reviewed
Apr 26, 2019
lib/fluent/plugin/in_syslog.rb
Outdated
| @@ -74,7 +74,7 @@ class SyslogInput < Input | |||
| desc 'The prefix of the tag. The tag itself is generated by the tag prefix, facility level, and priority.' | |||
| config_param :tag, :string | |||
| desc 'The transport protocol used to receive logs.(udp, tcp)' | |||
| config_param :protocol_type, :enum, list: [:tcp, :udp], default: :udp | |||
| config_param :protocol_type, :enum, list: [:tcp, :udp], default: nil | |||
There was a problem hiding this comment.
For deprecated parameter, use deprecated:
repeatedly
reviewed
Apr 26, 2019
| log.info "listening syslog socket on #{@bind}:#{@port} with #{@protocol_type}" | ||
| case @protocol_type | ||
| log.info "listening syslog socket on #{@bind}:#{@port} with #{@protocol_type || @transport_config.protocol}" | ||
| case @protocol_type || @transport_config.protocol |
There was a problem hiding this comment.
Default @transport_config.protocol is tcp. Change default to udp.
Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
6681953 to
f23566a
Compare
cosmo0920
reviewed
May 7, 2019
lib/fluent/plugin/in_syslog.rb
Outdated
| @@ -107,6 +107,11 @@ class SyslogInput < Input | |||
| config_param :with_priority, :bool, default: true | |||
| end | |||
|
|
|||
| # overwrite server plugin to change default to :udp | |||
| config_section :transport, required: false, multi: false, init: true, param_name: :transport_config do | |||
| config_argument :protocol, :enum, list: [:tcp, :tls], default: :udp | |||
There was a problem hiding this comment.
Should we use the following line?
config_argument :protocol, :enum, list: [:tcp, :udp, :tls], default: :udpThere was a problem hiding this comment.
Right. Thank you. bf319e9
Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
f23566a to
bf319e9
Compare
|
I confirmed this works with rsyslog. See configuration example.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Which issue(s) this PR fixes:
none
What this PR does / why we need it:
support tls for in_syslog
Docs Changes:
needed. I'll change docs.
Release Note:
same as title