Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 21, 2025

What does this PR do?

Use unique index for TestKubernetesJournaldInputOtel

Why is it important?

Closes #11220

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

## Disruptive User Impact

How to test this PR locally

# Package DEV=true SNAPSHOT=true EXTERNAL=true DOCKER_VARIANTS="elastic-otel-collector" PACKAGES="docker" PLATFORMS=linux/amd64 mage -v package

# Run the tests
SNAPSHOT=true INSTANCE_PROVISIONER=kind mage -v integration:testKubernetesSingle TestKubernetesJournaldInputOtel

Related issues

Questions to ask yourself

  • How are we going to support this in production?
  • How are we going to measure its adoption?
  • How are we going to debug this?
  • What are the metrics I should take care of?
  • ...

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

(cherry picked from commit efafc2a)

# Conflicts:
#	testing/integration/k8s/journald_test.go
@mergify mergify bot requested a review from a team as a code owner November 21, 2025 13:57
@mergify mergify bot requested review from blakerouse and michel-laterman and removed request for a team November 21, 2025 13:57
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 21, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Nov 21, 2025

Cherry-pick of efafc2a has failed:

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

You are currently cherry-picking commit efafc2a65.
  (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/k8s/testdata/journald-otel.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   testing/integration/k8s/journald_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

@elasticmachine
Copy link
Contributor

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

@elasticmachine
Copy link
Contributor

elasticmachine commented Nov 21, 2025

@belimawr
Copy link
Contributor

Closing because TestKubernetesJournaldInputOtel does not exist in 8.19

@belimawr belimawr closed this Nov 21, 2025
@mergify mergify bot deleted the mergify/bp/8.19/pr-11316 branch November 21, 2025 16:02
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.

3 participants