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.17](backport #41965) [system/cpu][system/core] - New config for using performance counters #42068

Merged
merged 5 commits into from
Dec 18, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 16, 2024

This PR uses follows up on elastic/elastic-agent-system-metrics#192.
It makes the use of performance counters to collect cpu metrics on windows.

Docs:

  • Added

Test results:

Closes #40926


This is an automatic backport of pull request #41965 done by Mergify.

…#41965)

* chore: initial commit

* chore: core

* chore: go.mod

* lint

* chore: docs and yaml

* chore: docs and yaml

* update changelog

* fix changelog

* notice and go.mod

* more specific changelog

* chore: default to true

* docs

(cherry picked from commit 58af153)

# Conflicts:
#	go.mod
#	go.sum
@mergify mergify bot requested a review from a team as a code owner December 16, 2024 19:23
@mergify mergify bot added the backport label Dec 16, 2024
@mergify mergify bot requested a review from a team as a code owner December 16, 2024 19:23
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Dec 16, 2024
@mergify mergify bot requested review from belimawr and rdner and removed request for a team December 16, 2024 19:23
Copy link
Contributor Author

mergify bot commented Dec 16, 2024

Cherry-pick of 58af153 has failed:

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

You are currently cherry-picking commit 58af15378.
  (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:   NOTICE.txt
	modified:   metricbeat/docs/modules/system.asciidoc
	modified:   metricbeat/metricbeat.reference.yml
	modified:   metricbeat/module/system/_meta/config.reference.yml
	modified:   metricbeat/module/system/core/_meta/docs.asciidoc
	modified:   metricbeat/module/system/core/config.go
	modified:   metricbeat/module/system/core/core.go
	modified:   metricbeat/module/system/cpu/_meta/docs.asciidoc
	modified:   metricbeat/module/system/cpu/config.go
	modified:   metricbeat/module/system/cpu/cpu.go
	modified:   x-pack/metricbeat/metricbeat.reference.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum

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.

VihasMakwana and others added 2 commits December 17, 2024 00:56
…#41965)

* chore: initial commit

* chore: core

* chore: go.mod

* lint

* chore: docs and yaml

* chore: docs and yaml

* update changelog

* fix changelog

* notice and go.mod

* more specific changelog

* chore: default to true

* docs
@VihasMakwana
Copy link
Contributor

/test

@VihasMakwana VihasMakwana merged commit 8d3e92e into 8.17 Dec 18, 2024
142 checks passed
@VihasMakwana VihasMakwana deleted the mergify/bp/8.17/pr-41965 branch December 18, 2024 11:28
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.

1 participant