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 #40766) [Metricbeat][vSphere] New metrics support and minor changes to existing metricsets #40807

Merged
merged 5 commits into from
Oct 1, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 13, 2024

  • Enhancement

vSphere

Datastore

  • Updated metrics collected using Performance API for better coverage of data.
  • Added support for available metrics check to avoid unnecessary issues of PerfMetrics API

Host

  • Added support for available metrics check to avoid unnecessary issues of PerfMetrics API

Virtual Machine

  • Fix Virtual Machine container view creation by adding support for snapshot.
  • Fix object type event over snapshot array of objects.

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 #40766 done by [Mergify](https://mergify.com).

…ng metricsets (#40766)

* initial commit

* update field mappings

* update virtual machine data.json

* format data.json

* resolve review comments

* add changelog entry

(cherry picked from commit 3f44bd1)

# Conflicts:
#	metricbeat/module/vsphere/datastore/_meta/data.json
#	metricbeat/module/vsphere/datastore/datastore.go
#	metricbeat/module/vsphere/fields.go
#	metricbeat/module/vsphere/host/_meta/data.json
#	metricbeat/module/vsphere/host/host.go
#	metricbeat/module/vsphere/virtualmachine/_meta/data.json
#	metricbeat/module/vsphere/virtualmachine/data_test.go
#	metricbeat/module/vsphere/virtualmachine/virtualmachine.go
@mergify mergify bot requested a review from a team as a code owner September 13, 2024 04:32
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 13, 2024
Copy link
Contributor Author

mergify bot commented Sep 13, 2024

Cherry-pick of 3f44bd1 has failed:

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

You are currently cherry-picking commit 3f44bd1f9b.
  (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
	modified:   metricbeat/module/vsphere/datastore/_meta/fields.yml
	modified:   metricbeat/module/vsphere/datastore/data.go
	modified:   metricbeat/module/vsphere/datastore/data_test.go
	modified:   metricbeat/module/vsphere/datastore/datastore_test.go
	modified:   metricbeat/module/vsphere/virtualmachine/_meta/fields.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   metricbeat/module/vsphere/datastore/_meta/data.json
	both modified:   metricbeat/module/vsphere/datastore/datastore.go
	both modified:   metricbeat/module/vsphere/fields.go
	both modified:   metricbeat/module/vsphere/host/_meta/data.json
	both modified:   metricbeat/module/vsphere/host/host.go
	both modified:   metricbeat/module/vsphere/virtualmachine/_meta/data.json
	both modified:   metricbeat/module/vsphere/virtualmachine/data_test.go
	both modified:   metricbeat/module/vsphere/virtualmachine/virtualmachine.go

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 Sep 13, 2024
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.x/pr-40766 upstream/mergify/bp/8.x/pr-40766
git merge upstream/8.x
git push upstream mergify/bp/8.x/pr-40766

Copy link
Contributor Author

mergify bot commented Sep 16, 2024

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

2 similar comments
Copy link
Contributor Author

mergify bot commented Sep 23, 2024

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

Copy link
Contributor Author

mergify bot commented Sep 30, 2024

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

@kush-elastic kush-elastic added the Team:Obs-InfraObs Label for the Observability Infrastructure Monitoring team label Oct 1, 2024
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Oct 1, 2024
Copy link
Contributor

@niraj-elastic niraj-elastic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@kush-elastic kush-elastic merged commit c3a001c into 8.x Oct 1, 2024
30 of 32 checks passed
@kush-elastic kush-elastic deleted the mergify/bp/8.x/pr-40766 branch October 1, 2024 10:33
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 Team:Obs-InfraObs Label for the Observability Infrastructure Monitoring team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants