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

Clean up configuration generation for fluentbit configs. #146

Merged

Conversation

igorpeshansky
Copy link
Member

@igorpeshansky igorpeshansky commented Aug 6, 2021

Extracted from #141.

@quentinmit quentinmit force-pushed the igorpeshansky-config-cleanup-generation-otel branch 2 times, most recently from b24888f to 1880902 Compare August 16, 2021 20:43
@quentinmit quentinmit force-pushed the igorpeshansky-config-cleanup-generation-fluentbit branch from 84471f1 to 32de84c Compare August 18, 2021 03:39
Base automatically changed from igorpeshansky-config-cleanup-generation-otel to master August 18, 2021 03:46
@igorpeshansky igorpeshansky force-pushed the igorpeshansky-config-cleanup-generation-fluentbit branch from 37357c7 to ee44b12 Compare August 20, 2021 04:10
Copy link
Member Author

@igorpeshansky igorpeshansky left a comment

Choose a reason for hiding this comment

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

This is now ready for review. @quentinmit, the last commit will have minor conflicts with your branch. It does introduce useful functionality, IMO, but we can discuss reverting it as well.

Copy link
Contributor

@qingling128 qingling128 left a comment

Choose a reason for hiding this comment

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

LGTM

… replicates what we have in the ops agent config.
… fluentbit.Input interface.

Unify fluentbit's filters under the fluentbit.Filter interface, and fluentbit's parsers under the fluentbit.Parser interface.
Wrap fluentbit's Stackdriver into the fluentbit.Output interface.
Use the fluentbit.Input, fluentbit.Filter, fluentbit.Output, and fluentbit.Parser interfaces instead of the individual structs.

Template expansion whitespace control is hell, so there are no longer two blank lines at the end of the config. No other changes to the generated configs.
@igorpeshansky igorpeshansky force-pushed the igorpeshansky-config-cleanup-generation-fluentbit branch from ee44b12 to ec5c73f Compare August 23, 2021 20:38
@igorpeshansky igorpeshansky merged commit 394f139 into master Aug 23, 2021
@igorpeshansky igorpeshansky deleted the igorpeshansky-config-cleanup-generation-fluentbit branch August 23, 2021 20:57
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.

3 participants