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.8](backport #35647) libbeat/monitoring/inputmon: log key, id and input type when registering/deregistering metrics #35673

Merged
merged 2 commits into from
Jun 5, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 5, 2023

This is an automatic backport of pull request #35647 done by Mergify.
Cherry-pick of 8abdf32 has failed:

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

You are currently cherry-picking commit 8abdf326f8.
  (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-developer.next.asciidoc

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   libbeat/monitoring/inputmon/input.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

…ing/deregistering metrics (#35647)

This notes under "metric_registry" all inputmon-handled metric
registration and deregistration, linking register and deregister
operations by use of a unique ID unrelated to the request.

(cherry picked from commit 8abdf32)

# Conflicts:
#	libbeat/monitoring/inputmon/input.go
@mergify mergify bot requested a review from a team as a code owner June 5, 2023 06:40
@mergify mergify bot requested review from rdner and faec and removed request for a team June 5, 2023 06:40
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 5, 2023
@mergify mergify bot assigned efd6 Jun 5, 2023
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 5, 2023
@botelastic
Copy link

botelastic bot commented Jun 5, 2023

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

@mergify
Copy link
Contributor Author

mergify bot commented Jun 5, 2023

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

@efd6 efd6 force-pushed the mergify/bp/8.8/pr-35647 branch from 0ed0335 to 86ea6e0 Compare June 5, 2023 07:05
@efd6 efd6 force-pushed the mergify/bp/8.8/pr-35647 branch from 86ea6e0 to 9100796 Compare June 5, 2023 07:06
@elasticmachine
Copy link
Collaborator

elasticmachine commented Jun 5, 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-06-05T07:07:02.897+0000

  • Duration: 73 min 6 sec

Test stats 🧪

Test Results
Failed 0
Passed 26361
Skipped 1975
Total 28336

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

@efd6 efd6 merged commit 9fbb486 into 8.8 Jun 5, 2023
@efd6 efd6 deleted the mergify/bp/8.8/pr-35647 branch June 5, 2023 09:19
@reakaleek reakaleek mentioned this pull request Jul 19, 2023
6 tasks
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.

2 participants