Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 15, 2025

What does this PR do?

Adds an explicit test for the full configuration generated for self-monitoring when using the otel runtime.

Why is it important?

We plan to switch to this runtime by default, so we should have a test checking if the full output of this config generation is valid and stable.

Checklist

  • I have read and understood the pull request guidelines of this project.
  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • [ ] I have made corresponding changes to the documentation
  • [ ] I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • [ ] I have added an entry in ./changelog/fragments using the changelog tool
  • [ ] I have added an integration test or an E2E test

Related issues


This is an automatic backport of pull request #10580 done by [Mergify](https://mergify.com).

* Add monitoring config golden file test for otel runtime

* Update internal/pkg/agent/application/monitoring/component/v1_monitor_test.go

Co-authored-by: Craig MacKenzie <[email protected]>

---------

Co-authored-by: Craig MacKenzie <[email protected]>
(cherry picked from commit a3f71c4)

# Conflicts:
#	internal/pkg/agent/application/monitoring/component/testdata/monitoring_config_full.yaml
#	internal/pkg/agent/application/monitoring/testdata/monitoring_config_full.yaml
#	internal/pkg/agent/application/monitoring/testdata/monitoring_config_full_otel.yaml
#	internal/pkg/agent/application/monitoring/testdata/monitoring_config_full_process.yaml
@mergify mergify bot requested a review from a team as a code owner October 15, 2025 17:55
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 15, 2025
@mergify mergify bot requested review from michalpristas and pkoutsovasilis and removed request for a team October 15, 2025 17:55
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Oct 15, 2025
@mergify mergify bot added the backport label Oct 15, 2025
Copy link
Contributor Author

mergify bot commented Oct 15, 2025

Cherry-pick of a3f71c4 has failed:

On branch mergify/bp/9.1/pr-10580
Your branch is up to date with 'origin/9.1'.

You are currently cherry-picking commit a3f71c40c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   internal/pkg/agent/application/monitoring/v1_monitor_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both deleted:    internal/pkg/agent/application/monitoring/component/testdata/monitoring_config_full.yaml
	added by us:     internal/pkg/agent/application/monitoring/testdata/monitoring_config_full.yaml
	added by them:   internal/pkg/agent/application/monitoring/testdata/monitoring_config_full_otel.yaml
	added by them:   internal/pkg/agent/application/monitoring/testdata/monitoring_config_full_process.yaml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions github-actions bot added Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team skip-changelog labels Oct 15, 2025
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

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

Labels

backport conflicts There is a conflict in the backported pull request skip-changelog Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants