Skip to content
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

[8.6](backport #34516) Fix container enricher with correct container ids for pods with multiple containers #34537

Merged
merged 3 commits into from
Feb 10, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 9, 2023

This is an automatic backport of pull request #34516 done by Mergify.
Cherry-pick of 4ac4973 has failed:

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

You are currently cherry-picking commit 4ac4973250.
  (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:   CHANGELOG.next.asciidoc
	modified:   metricbeat/module/kubernetes/state_container/state_container.go
	modified:   metricbeat/module/kubernetes/util/kubernetes.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   metricbeat/module/kubernetes/state_container/_meta/test/ksm.v1.3.0.expected
	both modified:   metricbeat/module/kubernetes/state_container/_meta/test/ksm.v1.8.0.expected
	both modified:   metricbeat/module/kubernetes/state_container/_meta/test/ksm.v2.0.0.expected
	deleted by us:   metricbeat/module/kubernetes/state_container/_meta/test/ksm.v2.7.0.expected
	deleted by us:   metricbeat/module/kubernetes/state_container/_meta/testdata/ksm.v2.4.2.plain-expected.json
	deleted by us:   metricbeat/module/kubernetes/state_container/_meta/testdata/ksm.v2.5.0.plain-expected.json
	deleted by us:   metricbeat/module/kubernetes/state_container/_meta/testdata/ksm.v2.6.0.plain-expected.json
	deleted by us:   metricbeat/module/kubernetes/state_container/_meta/testdata/ksm.v2.7.0.plain-expected.json

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…ple containers (#34516)

* Fix container enricher with correct container ids for pods with multiple containers
* Align kubernetes.container.id with ecs container.id

(cherry picked from commit 4ac4973)

# Conflicts:
#	metricbeat/module/kubernetes/state_container/_meta/test/ksm.v1.3.0.expected
#	metricbeat/module/kubernetes/state_container/_meta/test/ksm.v1.8.0.expected
#	metricbeat/module/kubernetes/state_container/_meta/test/ksm.v2.0.0.expected
#	metricbeat/module/kubernetes/state_container/_meta/test/ksm.v2.7.0.expected
#	metricbeat/module/kubernetes/state_container/_meta/testdata/ksm.v2.4.2.plain-expected.json
#	metricbeat/module/kubernetes/state_container/_meta/testdata/ksm.v2.5.0.plain-expected.json
#	metricbeat/module/kubernetes/state_container/_meta/testdata/ksm.v2.6.0.plain-expected.json
#	metricbeat/module/kubernetes/state_container/_meta/testdata/ksm.v2.7.0.plain-expected.json
@mergify mergify bot requested a review from a team as a code owner February 9, 2023 10:21
@mergify mergify bot requested review from gsantoro and MichaelKatsoulis and removed request for a team February 9, 2023 10:21
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Feb 9, 2023
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Feb 9, 2023
@botelastic
Copy link

botelastic bot commented Feb 9, 2023

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Collaborator

elasticmachine commented Feb 9, 2023

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2023-02-09T14:51:05.878+0000

  • Duration: 50 min 10 sec

Test stats 🧪

Test Results
Failed 0
Passed 3927
Skipped 873
Total 4800

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@MichaelKatsoulis MichaelKatsoulis merged commit 9b77c2c into 8.6 Feb 10, 2023
@MichaelKatsoulis MichaelKatsoulis deleted the mergify/bp/8.6/pr-34516 branch February 10, 2023 12:00
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 needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants