Skip to content

Comments

[8.x](backport #6801) [e2e] Add tests for self monitoring agent logs in otel mode#7479

Merged
khushijain21 merged 2 commits into8.xfrom
mergify/bp/8.x/pr-6801
Mar 24, 2025
Merged

[8.x](backport #6801) [e2e] Add tests for self monitoring agent logs in otel mode#7479
khushijain21 merged 2 commits into8.xfrom
mergify/bp/8.x/pr-6801

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Mar 20, 2025

What does this PR do?

It adds tests for comparing docs ingested by agent.monitoring vs otel.yml

Notes:
Some changes made to otel.yml produced by hand here:

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

How to test this PR locally

Related issues


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

- Add tests for self monitoring agent logs in otel mode

(cherry picked from commit 931134f)

# Conflicts:
#	testing/integration/beat_receivers_test.go
@mergify mergify bot requested a review from a team as a code owner March 20, 2025 04:16
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Mar 20, 2025
@mergify mergify bot requested review from michalpristas and removed request for a team March 20, 2025 04:16
@mergify mergify bot requested a review from michel-laterman March 20, 2025 04:16
@mergify
Copy link
Contributor Author

mergify bot commented Mar 20, 2025

Cherry-pick of 931134f has failed:

On branch mergify/bp/8.x/pr-6801
Your branch is up to date with 'origin/8.x'.

You are currently cherry-picking commit 931134f3f.
  (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:   testing/integration/otel_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   testing/integration/beat_receivers_test.go

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 Mar 20, 2025
@elasticmachine
Copy link
Contributor

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

@elastic-sonarqube
Copy link

@mergify
Copy link
Contributor Author

mergify bot commented Mar 24, 2025

This pull request has not been merged yet. Could you please review and merge it @khushijain21? 🙏

@elasticmachine
Copy link
Contributor

💛 Build succeeded, but was flaky

Failed CI Steps

History

cc @khushijain21

@khushijain21 khushijain21 merged commit ac30ad6 into 8.x Mar 24, 2025
12 checks passed
@khushijain21 khushijain21 deleted the mergify/bp/8.x/pr-6801 branch March 24, 2025 05:45
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