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.

Sign up for GitHub

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

Jump to bottom

feat: adds fluentd monitor_agent input plugin #967

Merged
merged 20 commits into from
Nov 6, 2023
Merged

feat: adds fluentd monitor_agent input plugin #967

merged 20 commits into from
Nov 6, 2023

Conversation

joshuabaird
Copy link
Collaborator

@joshuabaird joshuabaird commented Oct 27, 2023 •
edited
Loading

What this PR does / why we need it:

The in_monitor_agent Input plugin exports Fluentd's internal metrics via REST API. It is included in Fluentd's core.

Which issue(s) this PR fixes:

N/A

Does this PR introduced a user-facing change?

N/A

@joshuabaird joshuabaird force-pushed the chore/mjb/fluentd-monitor-agent branch from 6a17c3d to 47e80aa Compare October 30, 2023 16:15
benjaminhuo
benjaminhuo reviewed Nov 2, 2023
View reviewed changes
apis/fluentd/v1alpha1/plugins/input/monitor_agent.go Outdated
// If you set this parameter, this plugin emits metrics as records.
Tag *string `json:"tag,omitempty"`
// The interval time between event emits. This will be used when "tag" is configured.
EmitInterval *int64 `json:"emit_interval,omitempty"`
Copy link
Member

@benjaminhuo benjaminhuo Nov 2, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Thanks for this PR @joshuabaird !

All the field of CRDs in fluent operator use camelCase, should be emitInterval instead of emit_interval, while the config files items should be consistent with fluentbit or fluentd conversion which is emit_interval.
https://github.com/fluent/fluent-operator/blob/master/apis/fluentd/v1alpha1/plugins/output/opensearch.go#L20 opensearch output plugin is an example

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Fixed in a6fcd16

@benjaminhuo
Copy link
Member

You may need to run make docs-update to generate docs @joshuabaird :)

@joshuabaird
Copy link
Collaborator Author

@benjaminhuo @wenchajun It looks like the lint CI job is failing (in all PRs) due to an unrelated reason:

INFO: Downloading bootstrap version 'v2.0.0' of cosign to verify version to be installed...
      https://storage.googleapis.com/cosign-releases/v2.0.0/cosign-linux-amd64
ERROR: Unable to validate cosign version: 'v2.0.0'
Error: Process completed with exit code 1.

@benjaminhuo
Copy link
Member

@joshuabaird would you please rebase the master branch? I just upgrade helm/chart-testing-action to v2.6.0 to fix error "ERROR: Unable to validate cosign version: 'v2.0.0'"

@benjaminhuo
Copy link
Member

Dont forget to sign your commit by:

git commit -s --amend
git push -f

@joshuabaird joshuabaird force-pushed the chore/mjb/fluentd-monitor-agent branch from 6c17a26 to a2ac3fb Compare November 2, 2023 16:41
@joshuabaird
Copy link
Collaborator Author

joshuabaird commented Nov 2, 2023 •
edited
Loading

@joshuabaird would you please rebase the master branch? I just upgrade helm/chart-testing-action to v2.6.0 to fix error "ERROR: Unable to validate cosign version: 'v2.0.0'"

It looks like things are still broken:

Error: targetBranch 'master' does not exist

@joshuabaird joshuabaird force-pushed the chore/mjb/fluentd-monitor-agent branch 2 times, most recently from e84743b to fc9067f Compare November 2, 2023 16:56
@wenchajun
Copy link
Member

Maybe you should rebase it.

@wenchajun
Copy link
Member

@joshuabaird would you please rebase the master branch? I just upgrade helm/chart-testing-action to v2.6.0 to fix error "ERROR: Unable to validate cosign version: 'v2.0.0'"

It looks like things are still broken:

Error: targetBranch 'master' does not exist

fixed #979

@joshuabaird
Add fluentd monitor_agent input plugin.
3962029 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Add docs.
c90e2c5 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Use the right test file.
aaf010e 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Use the right test file.
311fa5c 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Debug.
365f321 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Remove debug bin.
5d3c056 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Debug.
7c480ce 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Debug.
62edbcd 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Fix params.
ed17b9f 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Empty commit
47fed0f 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Fix the input plugin.
4b39aba 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Add other fields.
f0281d4 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Removed debug bin.
945f16b 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Indent.
b137164 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Make things work.
65b9144 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Use camelCase for CRD fields.
78e79f8 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Update docs.
12d2973 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Empty commit
4350ae4 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
More camelCase.
1d73cc3 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Fix typos.
9fd2ce1 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird joshuabaird force-pushed the chore/mjb/fluentd-monitor-agent branch from fc9067f to 9fd2ce1 Compare November 3, 2023 14:02
@benjaminhuo benjaminhuo merged commit fb92dfa into fluent:master Nov 6, 2023
5 checks passed
@benjaminhuo
Copy link
Member

@joshuabaird Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@benjaminhuo benjaminhuo benjaminhuo approved these changes

@wenchajun wenchajun wenchajun approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@joshuabaird @benjaminhuo @wenchajun