Skip to content
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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from

Conversation

RemcodM
Copy link

@RemcodM RemcodM commented Apr 30, 2024

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. The fluentd.conf is generated using the Makefile, so it based on the template change included in this PR.

Please let me know if any changes are necessary to get this merged.

Copy link
Member

@ashie ashie left a 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>
@RemcodM
Copy link
Author

RemcodM commented Apr 30, 2024

Could you modify only templates/conf/fluent.conf.erb? Files under docker-image/ are genegeted automatically.

Done!

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>
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}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants