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

fix: set source name and category in the FluentD output for events #2222

Merged
merged 3 commits into from
Apr 13, 2022

Conversation

swiatekm
Copy link

@swiatekm swiatekm commented Apr 7, 2022

Description

We've been setting source name and category directly on the source in the setup Terraform manifest. Instead, do it in the output plugin and make it configurable.

This makes it both easier to test and makes it work correctly if setup is disabled.

Also add a basic integration test for events.


Checklist
  • Changelog updated
Testing performed
  • Redeploy fluentd and fluentd-events pods
  • Confirm events, logs, and metrics are coming in

@swiatekm swiatekm requested a review from a team as a code owner April 7, 2022 12:19
@swiatekm swiatekm added this to the v2.8 milestone Apr 7, 2022
@swiatekm
Copy link
Author

swiatekm commented Apr 7, 2022

I'll update the changelog after we release 2.7. In the meantime, this is ready for review.

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This pull request contains invalid labels. Please remove all of the following labels: ['do-not-merge/hold']

Copy link
Contributor

@pmalek-sumo pmalek-sumo left a comment

Choose a reason for hiding this comment

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

Please add a changelog entry

@swiatekm swiatekm requested a review from pmalek-sumo April 7, 2022 15:37
@swiatekm swiatekm force-pushed the test/integration/events branch from 2cfedf7 to 2c55fda Compare April 12, 2022 15:25
Mikołaj Świątek added 2 commits April 13, 2022 12:29
We've been setting it directly on the source in the setup Terraform
manifest. Instead, do it in the output plugin and make it configurable.
This makes it both easier to test and makes it work correctly if setup
is disabled.
@swiatekm swiatekm force-pushed the test/integration/events branch from 2c55fda to f246ce3 Compare April 13, 2022 10:29
@swiatekm swiatekm enabled auto-merge (rebase) April 13, 2022 14:10
@swiatekm swiatekm merged commit 81acc17 into main Apr 13, 2022
@swiatekm swiatekm deleted the test/integration/events branch April 13, 2022 14:10
andrzej-stencel added a commit that referenced this pull request Jun 1, 2022
A bug was introduced in v2.8.0 (#2222)
that made the `fluentd.events.sourceCategory` non-functional.
andrzej-stencel added a commit that referenced this pull request Jun 1, 2022
A bug was introduced in v2.8.0 (#2222)
that made the `fluentd.events.sourceCategory` non-functional.
andrzej-stencel added a commit that referenced this pull request Jun 1, 2022
A bug was introduced in v2.8.0 (#2222)
that made the `fluentd.events.sourceCategory` non-functional.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants