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.x](backport #42041) [system/cpu,core] - Disable performance counter by default to unblock agent CI #42055

Merged
merged 5 commits into from
Dec 17, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 16, 2024

Alternative to #42042.

This is a temporary fix as CI on elastic-agent's main is broken https://buildkite.com/elastic/elastic-agent-extended-testing/builds/5390#0193c17f-c655-422a-8dc9-ae5a7a40fdbd.

This most likely happened because user not having enough permissions to read from performance counter. I'll do some more digging and fix the underlying issue.


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

(cherry picked from commit f3a063f)

# Conflicts:
#	metricbeat/docs/modules/system.asciidoc
#	metricbeat/metricbeat.reference.yml
#	metricbeat/module/system/_meta/config.reference.yml
#	metricbeat/module/system/core/_meta/docs.asciidoc
#	metricbeat/module/system/core/config.go
#	metricbeat/module/system/cpu/_meta/docs.asciidoc
#	metricbeat/module/system/cpu/config.go
#	x-pack/metricbeat/metricbeat.reference.yml
@mergify mergify bot requested a review from a team as a code owner December 16, 2024 15:07
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Dec 16, 2024
@mergify mergify bot requested review from rdner and mauri870 and removed request for a team December 16, 2024 15:07
Copy link
Contributor Author

mergify bot commented Dec 16, 2024

Cherry-pick of f3a063f has failed:

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

You are currently cherry-picking commit f3a063f1d.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   metricbeat/docs/modules/system.asciidoc
	both modified:   metricbeat/metricbeat.reference.yml
	both modified:   metricbeat/module/system/_meta/config.reference.yml
	both modified:   metricbeat/module/system/core/_meta/docs.asciidoc
	both modified:   metricbeat/module/system/core/config.go
	both modified:   metricbeat/module/system/cpu/_meta/docs.asciidoc
	both modified:   metricbeat/module/system/cpu/config.go
	both modified:   x-pack/metricbeat/metricbeat.reference.yml

no changes added to commit (use "git add" and/or "git commit -a")

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

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Dec 16, 2024
@botelastic
Copy link

botelastic bot commented Dec 16, 2024

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

Copy link
Contributor Author

mergify bot commented Dec 16, 2024

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/8.x/pr-42041 upstream/mergify/bp/8.x/pr-42041
git merge upstream/8.x
git push upstream mergify/bp/8.x/pr-42041

@VihasMakwana VihasMakwana merged commit 200b74a into 8.x Dec 17, 2024
32 checks passed
@VihasMakwana VihasMakwana deleted the mergify/bp/8.x/pr-42041 branch December 17, 2024 17:22
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