[7.17](backport #29605) Fix annotation enrichment by mergify[bot] · Pull Request #29834 · elastic/beats

mergify · 2022-01-13T09:39:59Z

This is an automatic backport of pull request #29605 done by Mergify.
Cherry-pick of 2917392 has failed:

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

You are currently cherry-picking commit 2917392a01.
  (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:   libbeat/common/kubernetes/metadata/metadata.go
	modified:   libbeat/common/kubernetes/metadata/node_test.go
	modified:   libbeat/common/kubernetes/metadata/pod.go
	modified:   libbeat/common/kubernetes/metadata/service_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   libbeat/common/kubernetes/metadata/pod_test.go

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

* add annotation enrichment Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co> * add pr number Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co> * fix tests Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co> * update changelog message Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co> * clean up changelog after rebase Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co> (cherry picked from commit 2917392) # Conflicts: # libbeat/common/kubernetes/metadata/pod_test.go

botelastic · 2022-01-13T09:40:05Z

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

elasticmachine · 2022-01-13T10:10:05Z

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS

Expand to view the summary

Build stats

Start Time: 2022-01-19T17:39:24.521+0000
Duration: 22 min 58 sec
Commit: 74be7d9

Test stats 🧪

Test	Results
Failed	0
Passed	15
Skipped	16
Total	31

💚 Flaky test report

Tests succeeded.

🤖 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!)

mergify · 2022-01-17T05:22:47Z

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

mergify · 2022-01-18T17:05:57Z

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/7.17/pr-29605 upstream/mergify/bp/7.17/pr-29605
git merge upstream/7.17
git push upstream mergify/bp/7.17/pr-29605

tetianakravchenko · 2022-01-19T17:38:46Z

/test

tetianakravchenko · 2022-01-19T19:37:14Z

/package

* upstream/7.17: (30 commits) [7.17](backport #29966) Add the Elastic product origin header when talking to Elasticsearch or Kibana. (#30000) [Heartbeat] Change size of data on ICMP packet (#29948) (#29978) Add clarification about enableing dashboard loading (#29985) (#29989) Improve aws-s3 gzip file detection to avoid false negatives (#29969) (#29974) ci: docker login step for pulling then pushing (#29960) (#29963) x-pack/auditbeat/module/system/socket: get full length path and arg from /proc when not available from kprobe (#29410) (#29958) [Automation] Update elastic stack version to 7.17.0-ab4975a2 for testing (#29956) [Automation] Update elastic stack version to 7.17.0-1bd58b32 for testing (#29938) [7.17](backport #29913) [Metricbeat] gcp.gke: fix overview dashboard (#29914) [7.17](backport #29605) Fix annotation enrichment (#29834) [Automation] Update elastic stack version to 7.17.0-e1efbe3a for testing (#29922) [Automation] Update elastic stack version to 7.17.0-68da5d12 for testing (#29904) [7.17][Heartbeat] Defer monitor / ICMP errors to monitor runtime / ES (backport #29413) (#29896) Merge pull request from GHSA-rj4h-hqvq-cc6q [7.17](backport #29681) Change docker image from CentOS 7 to Ubuntu 20.04 (#29817) Fix YAML indentation in `parsers` examples (#29663) (#29894) [Automation] Update elastic stack version to 7.17.0-079761a0 for testing (#29864) Fix Filebeat dissect processor field tokenization in documentation (#29680) (#29883) Enable require_alias for Bulk requests for all actions when target is a write alias (#29879) Update Index template loading guide to use the correct endpoint (#29869) (#29877) ...

* upstream/7.17: (30 commits) [7.17](backport elastic#29966) Add the Elastic product origin header when talking to Elasticsearch or Kibana. (elastic#30000) [Heartbeat] Change size of data on ICMP packet (elastic#29948) (elastic#29978) Add clarification about enableing dashboard loading (elastic#29985) (elastic#29989) Improve aws-s3 gzip file detection to avoid false negatives (elastic#29969) (elastic#29974) ci: docker login step for pulling then pushing (elastic#29960) (elastic#29963) x-pack/auditbeat/module/system/socket: get full length path and arg from /proc when not available from kprobe (elastic#29410) (elastic#29958) [Automation] Update elastic stack version to 7.17.0-ab4975a2 for testing (elastic#29956) [Automation] Update elastic stack version to 7.17.0-1bd58b32 for testing (elastic#29938) [7.17](backport elastic#29913) [Metricbeat] gcp.gke: fix overview dashboard (elastic#29914) [7.17](backport elastic#29605) Fix annotation enrichment (elastic#29834) [Automation] Update elastic stack version to 7.17.0-e1efbe3a for testing (elastic#29922) [Automation] Update elastic stack version to 7.17.0-68da5d12 for testing (elastic#29904) [7.17][Heartbeat] Defer monitor / ICMP errors to monitor runtime / ES (backport elastic#29413) (elastic#29896) Merge pull request from GHSA-rj4h-hqvq-cc6q [7.17](backport elastic#29681) Change docker image from CentOS 7 to Ubuntu 20.04 (elastic#29817) Fix YAML indentation in `parsers` examples (elastic#29663) (elastic#29894) [Automation] Update elastic stack version to 7.17.0-079761a0 for testing (elastic#29864) Fix Filebeat dissect processor field tokenization in documentation (elastic#29680) (elastic#29883) Enable require_alias for Bulk requests for all actions when target is a write alias (elastic#29879) Update Index template loading guide to use the correct endpoint (elastic#29869) (elastic#29877) ...

mergify bot added backport conflicts There is a conflict in the backported pull request labels Jan 13, 2022

mergify bot assigned tetianakravchenko Jan 13, 2022

botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jan 13, 2022

tetianakravchenko added 2 commits January 17, 2022 13:43

Update CHANGELOG.next.asciidoc

c882ca6

Fix conflict in tests

7b2b534

Merge branch '7.17' into mergify/bp/7.17/pr-29605

74be7d9

tetianakravchenko merged commit 689602b into 7.17 Jan 20, 2022

mergify bot deleted the mergify/bp/7.17/pr-29605 branch January 20, 2022 08:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[7.17](backport #29605) Fix annotation enrichment#29834

[7.17](backport #29605) Fix annotation enrichment#29834
tetianakravchenko merged 4 commits into7.17from
mergify/bp/7.17/pr-29605

mergify bot commented Jan 13, 2022 •

edited by zube bot

Loading

Uh oh!

botelastic bot commented Jan 13, 2022

Uh oh!

elasticmachine commented Jan 13, 2022 •

edited by jenkins-beats-ci bot

Loading

Build stats

Test stats 🧪

Uh oh!

mergify bot commented Jan 17, 2022

Uh oh!

mergify bot commented Jan 18, 2022

Uh oh!

tetianakravchenko commented Jan 19, 2022

Uh oh!

tetianakravchenko commented Jan 19, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

mergify bot commented Jan 13, 2022 • edited by zube bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

botelastic bot commented Jan 13, 2022

Uh oh!

elasticmachine commented Jan 13, 2022 • edited by jenkins-beats-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

💚 Build Succeeded

Build stats

Test stats 🧪

💚 Flaky test report

🤖 GitHub comments

Uh oh!

mergify bot commented Jan 17, 2022

Uh oh!

mergify bot commented Jan 18, 2022

Uh oh!

tetianakravchenko commented Jan 19, 2022

Uh oh!

tetianakravchenko commented Jan 19, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

mergify bot commented Jan 13, 2022 •

edited by zube bot

Loading

elasticmachine commented Jan 13, 2022 •

edited by jenkins-beats-ci bot

Loading