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.15](backport #40456) [vSphere][resourcepool] Add support for new metrics in resourcepool metricset #40789

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 12, 2024

  • Enhancement

Description

Added following new metrics for the ResourcePool datastream in the vSphere metricbeat module. added new performance API to get more detailled info from the vSphere.

Metrics Type Metrics API Field Mappings
Resource pools CPU/memory/status OverallCpuUsage Quickstats cpu.usage.mhz
  OverallCpuDemand Quickstats cpu.demand.mhz
  GuestMemoryUsage Quickstats memory.usage.guest.bytes
  HostMemoryUsage Quickstats memory.usage.host.bytes
  DistributedCpuEntitlement Quickstats cpu.entitlement.mhz
  DistributedMemoryEntitlement Quickstats memory.entitlement.bytes
  StaticCpuEntitlement Quickstats cpu.entitlement.static.mhz
  StaticMemoryEntitlement Quickstats memory.entitlement.static.mhz
  PrivateMemory Quickstats memory.private.bytes
  SharedMemory Quickstats memory.shared.bytes
  SwappedMemory Quickstats memory.swapped.bytes
  BalloonedMemory Quickstats memory.ballooned.bytes
  OverheadMemory Quickstats memory.overhead.bytes
  ConsumedOverheadMemory Quickstats memory.overhead.consumed.bytes
  CompressedMemory Quickstats memory.compressed.bytes
  reourcepool.status Summary status
  resourcepool.Vm Summary vm.names
      vm.count

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Related issues


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

…etricset (#40456)

* [vSphere][ResourcePool]:
- Add new Metricset
- add/update docs
- add unit tests
- local testing

* add changelog entry

* golangci-lint fix

* add vm names per resourcePool

* mage update

* update changelog entry

* make update

* resolve review comment

* make update

* update changelog entry

* resolved review comments

* resolve review comments

* field updates

* Update metricbeat/module/vsphere/resourcepool/_meta/fields.yml

Co-authored-by: Ishleen Kaur <[email protected]>

* Update metricbeat/module/vsphere/resourcepool/_meta/fields.yml

Co-authored-by: Ishleen Kaur <[email protected]>

* Update metricbeat/module/vsphere/resourcepool/_meta/fields.yml

Co-authored-by: Ishleen Kaur <[email protected]>

* update changelog entry

* minor changes

---------

Co-authored-by: Ishleen Kaur <[email protected]>
(cherry picked from commit 1f77e6e)

# Conflicts:
#	metricbeat/docs/modules/vsphere.asciidoc
#	metricbeat/docs/modules_list.asciidoc
#	metricbeat/include/list_common.go
#	metricbeat/metricbeat.reference.yml
#	metricbeat/module/vsphere/_meta/README.md
#	metricbeat/module/vsphere/_meta/config.reference.yml
#	metricbeat/module/vsphere/_meta/config.yml
#	metricbeat/module/vsphere/_meta/docs.asciidoc
#	metricbeat/module/vsphere/fields.go
#	metricbeat/modules.d/vsphere.yml.disabled
#	x-pack/metricbeat/metricbeat.reference.yml
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 12, 2024
@mergify mergify bot requested review from a team as code owners September 12, 2024 12:41
@mergify mergify bot removed the request for review from a team September 12, 2024 12:41
Copy link
Contributor Author

mergify bot commented Sep 12, 2024

Cherry-pick of 1f77e6e has failed:

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

You are currently cherry-picking commit 1f77e6e69c.
  (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/docs/fields.asciidoc
	new file:   metricbeat/docs/modules/vsphere/resourcepool.asciidoc
	new file:   metricbeat/module/vsphere/resourcepool/_meta/data.json
	new file:   metricbeat/module/vsphere/resourcepool/_meta/docs.asciidoc
	new file:   metricbeat/module/vsphere/resourcepool/_meta/fields.yml
	new file:   metricbeat/module/vsphere/resourcepool/data.go
	new file:   metricbeat/module/vsphere/resourcepool/data_test.go
	new file:   metricbeat/module/vsphere/resourcepool/resourcepool.go
	new file:   metricbeat/module/vsphere/resourcepool/resourcepool_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   metricbeat/docs/modules/vsphere.asciidoc
	both modified:   metricbeat/docs/modules_list.asciidoc
	both modified:   metricbeat/include/list_common.go
	both modified:   metricbeat/metricbeat.reference.yml
	both modified:   metricbeat/module/vsphere/_meta/README.md
	both modified:   metricbeat/module/vsphere/_meta/config.reference.yml
	both modified:   metricbeat/module/vsphere/_meta/config.yml
	both modified:   metricbeat/module/vsphere/_meta/docs.asciidoc
	both modified:   metricbeat/module/vsphere/fields.go
	both modified:   metricbeat/modules.d/vsphere.yml.disabled
	both modified:   x-pack/metricbeat/metricbeat.reference.yml

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

@mergify mergify bot requested review from belimawr and rdner September 12, 2024 12:41
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 12, 2024
@botelastic
Copy link

botelastic bot commented Sep 12, 2024

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

Copy link
Contributor Author

mergify bot commented Sep 13, 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.15/pr-40456 upstream/mergify/bp/8.15/pr-40456
git merge upstream/8.15
git push upstream mergify/bp/8.15/pr-40456

@ishleenk17
Copy link
Contributor

Closing this in lieu of
#40825

@ishleenk17 ishleenk17 closed this Sep 13, 2024
@mergify mergify bot deleted the mergify/bp/8.15/pr-40456 branch September 13, 2024 20:35
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