-
Notifications
You must be signed in to change notification settings - Fork 980
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Expose more options to OpenSearch image #1493
base: master
Are you sure you want to change the base?
Conversation
9d4495b
to
cf70979
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you modify only templates/conf/fluent.conf.erb?
Files under docker-image/ are genegeted automatically.
Signed-off-by: Remco de Man <gitlab@remcodeman.nl>
cf70979
to
39f9f2f
Compare
Done! |
Signed-off-by: Remco de Man <gitlab@remcodeman.nl>
7547476
to
6f62c48
Compare
Signed-off-by: Remco de Man <gitlab@remcodeman.nl>
Signed-off-by: Remco de Man <gitlab@remcodeman.nl>
Signed-off-by: Remco de Man <gitlab@remcodeman.nl>
sniffer_class_name "#{ENV['FLUENT_SNIFFER_CLASS_NAME'] || use_nil}" | ||
request_timeout "#{ENV['FLUENT_OPENSEARCH_REQUEST_TIMEOUT'] || '5s'}" | ||
application_name "#{ENV['FLUENT_OPENSEARCH_APPLICATION_NAME'] || use_default}" | ||
bulk_message_request_threshold "#{ENV['FLUENT_OPENSEARCH_BULK_MESSAGE_REQUEST_THRESHOLD'] || use_nil}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The default value of bulk_message_request_threshold
is -1
:
https://github.com/fluent/fluent-plugin-opensearch/blob/6a4b1868808555bb022112becc2746c2e080261f/lib/fluent/plugin/out_opensearch.rb#L95
https://github.com/fluent/fluent-plugin-opensearch/blob/6a4b1868808555bb022112becc2746c2e080261f/lib/fluent/plugin/out_opensearch.rb#L174
It would be better to use use_default
if unsure the default value.
I will give this a second try after #1466 got closed because of inactivity. I have rebased and updated this PR accordingly.
This PR exposes some more options of the
fluent-plugin-opensearch
plug-in as environment variables to the Dockerfile, to be more in line with what the Elasticsearch images offer. This should make the transition from Elasticsearch to OpenSearch easier.It only changes the
fluentd.conf
file for OpenSearch images. Thefluentd.conf
is generated using theMakefile
, so it based on the template change included in this PR.Please let me know if any changes are necessary to get this merged.