Conversation
7e29478 to
aba6cc1
Compare
1dc723b to
0e8bc78
Compare
0e8bc78 to
c20cea5
Compare
Contributor
|
Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane) |
Contributor
💛 Build succeeded, but was flaky
Failed CI Steps
History
cc @swiatekm |
cmacknz
reviewed
Nov 24, 2025
cmacknz
reviewed
Nov 24, 2025
Member
cmacknz
left a comment
There was a problem hiding this comment.
Tested locally and works, a couple of very minor comments.
A lot of this is mechanical so we can probably backport after 9.2.2 is released, I don't think we need to rush this into 9.2.2 as long as we are confident there is no reason to with the work around that is already there.
cmacknz
approved these changes
Nov 25, 2025
mergify bot
pushed a commit
that referenced
this pull request
Nov 26, 2025
…untime (#11300) * Move ComponentsModifies to the component package * Move Otel runtime determination to component modifier * Check supported outputs in monitoring config generation * Add changelog entry * Log warning about switching to process runtime for monitoring * Fix monitoring config types * fix TestBeatsReceiverProcessRuntimeFallback * Add logstash output to test cases (cherry picked from commit 2c4c615) # Conflicts: # internal/pkg/agent/application/monitoring/component/v1_monitor.go # internal/pkg/agent/install/componentvalidation/validation.go # internal/pkg/otel/translate/otelconfig.go # pkg/component/component.go # testing/integration/ess/beat_receivers_test.go
5 tasks
swiatekm
added a commit
that referenced
this pull request
Dec 1, 2025
…ws the actual component runtime (#11444) * Ensure the self-monitoring configuration knows the actual component runtime (#11300) * Move ComponentsModifies to the component package * Move Otel runtime determination to component modifier * Check supported outputs in monitoring config generation * Add changelog entry * Log warning about switching to process runtime for monitoring * Fix monitoring config types * fix TestBeatsReceiverProcessRuntimeFallback * Add logstash output to test cases (cherry picked from commit 2c4c615) # Conflicts: # internal/pkg/agent/application/monitoring/component/v1_monitor.go # internal/pkg/agent/install/componentvalidation/validation.go # internal/pkg/otel/translate/otelconfig.go # pkg/component/component.go # testing/integration/ess/beat_receivers_test.go * Fix conflicts for integration test * Fix linter warnings --------- Co-authored-by: Mikołaj Świątek <mail@mikolajswiatek.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
When we generate self-monitoring configuration, we do certain things differently depending on whether a component will run in a beat process or a beat receiver in an otel collector. This PR ensures this information is accurate. Up until now, this decision was based on which runtime the component was configured to use, rather than what it ultimately used. If the component cannot run in the otel runtime - for example because the output is not supported - it would fall back to the process runtime, but this would happen after the self-monitoring configuration was generated, leading to inconsistencies.
This is achieved by making the following changes:
Why is it important?
Checklist
[ ] I have made corresponding changes to the documentation[ ] I have made corresponding change to the default configuration files./changelog/fragmentsusing the changelog tool[ ] I have added an integration test or an E2E testHow to test this PR locally
Build agent locally and run using the following configuration:
Verify that all the components are running as beats processes via the status, and that the prometheus monitoring component is not present.
Related issues