-
Notifications
You must be signed in to change notification settings - Fork 154
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
Add filebeat receiver to otel mode #5672
Conversation
Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane) |
This pull request is now in conflicts. Could you fix it? 🙏
|
8763c69
to
2b120db
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.
Seems we where doing double work on this one #5666
You got the integration test added before me, so I am going to close mine in favor of yours.
@@ -464,3 +579,5 @@ replace ( | |||
// See https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/12d41f40b0d408b0167633d8095160d3343d46ac/go.mod#L38 | |||
github.com/openshift/api v3.9.0+incompatible => github.com/openshift/api v0.0.0-20180801171038-322a19404e37 | |||
) | |||
|
|||
replace github.com/dop251/goja => github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20 |
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.
Does this one need to be added as well https://github.com/elastic/beats/blob/main/go.mod#L418
What about this fsnotify https://github.com/elastic/beats/blob/main/go.mod#L419C96-L420C2
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.
I don't think relying on a fork from an employee's personal GitHub account is the right approach. I'd prefer to have these under Elastic's organization, as it would be easier to manage and maintain in the long run. According to elastic/beats#41084, we don't want to keep temporary replacements around for too long. We should make our best effort to upstream any fixes or switch to/maintain another up-to-date fork.
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.
100% true. But blocking this PR for something that is already true for beats, doesn't provide forward progress. Lets push for progress and make adjustments a long the way.
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 sarama one was already there. Added fsnotify, we won't need it until we bring in Auditbeat, but be might as well start the pain now so we have more motivation to get those changes pushed upstream.
This pull request is now in conflicts. Could you fix it? 🙏
|
2b120db
to
6ad88c4
Compare
Sorry, didn't see that you had started. The integration test took more time than the code changes :-) |
@leehinman No big deal. You will need to add this change to your PR as well - https://github.com/elastic/elastic-agent/pull/5666/files#diff-d002edd1b34ea944ff5d1278c97e55f0b42a7240299fa6e349843687b4d1144cR21 |
5180b3e
to
c3e3738
Compare
c3e3738
to
1f1bd01
Compare
|
🎉 |
* Add filebeatreceiver to otel components (cherry picked from commit bd219d6) # Conflicts: # NOTICE.txt # go.mod # go.sum
This reverts commit bd219d6.
What does this PR do?
Adds filebeat receiver as an otel receiver.
Why is it important?
This is the first beat receiver, and this will allow us to test the feasibility of running beats as otel receivers.
Checklist
./changelog/fragments
using the changelog toolDisruptive User Impact
should be 0 user impact of existing configurations
How to test this PR locally
Use something like the following as
otel.yml
, and runelastic-agent otel --config otel.yml
This will run the beat receiver, which will produce one event.
The event should be written to the path you specify in the
file/no_rotation
section.Related issues
Questions to ask yourself