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.

Sign up for GitHub

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

Jump to bottom

[Metricbeat][vSphere] New metrics support and minor changes to existing metricsets #40766

Merged
merged 9 commits into from
Sep 13, 2024
Merged

[Metricbeat][vSphere] New metrics support and minor changes to existing metricsets #40766

merged 9 commits into from
Sep 13, 2024

Conversation

kush-elastic
Copy link
Collaborator

@kush-elastic kush-elastic commented Sep 11, 2024 •
edited
Loading

  • 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

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 11, 2024
@kush-elastic kush-elastic self-assigned this Sep 11, 2024
@kush-elastic kush-elastic added enhancement module Metricbeat Metricbeat Module:beat The beat Metricbeat module Team:Obs-InfraObs Label for the Observability Infrastructure Monitoring team bugfix labels Sep 11, 2024
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Sep 11, 2024
@mergify Mergify
Copy link
Contributor

mergify bot commented Sep 11, 2024

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @kush-elastic? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit

@mergify Mergify
Copy link
Contributor

mergify bot commented Sep 11, 2024

backport-8.x has been added to help with the transition to the new branch 8.x.

@mergify mergify bot added the backport-8.x Automated backport to the 8.x branch with mergify label Sep 11, 2024
@kush-elastic kush-elastic marked this pull request as ready for review September 12, 2024 09:04
@kush-elastic kush-elastic requested a review from a team as a code owner September 12, 2024 09:04
ishleenk17
ishleenk17 approved these changes Sep 12, 2024
View reviewed changes
Copy link
Contributor

@ishleenk17 ishleenk17 left a comment

Choose a reason for hiding this comment

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

Some nits, rest looks good!

metricbeat/module/vsphere/datastore/_meta/fields.yml Outdated Show resolved Hide resolved
metricbeat/module/vsphere/datastore/_meta/fields.yml Outdated Show resolved Hide resolved
@ishleenk17 ishleenk17 added backport-8.15 Automated backport to the 8.15 branch with mergify and removed backport-8.x Automated backport to the 8.x branch with mergify labels Sep 12, 2024
@mergify Mergify
Copy link
Contributor

mergify bot commented Sep 12, 2024

backport-8.x has been added to help with the transition to the new branch 8.x.
If you don't need it please use backport-skip label and remove the backport-8.x label.

@mergify mergify bot added the backport-8.x Automated backport to the 8.x branch with mergify label Sep 12, 2024
@mergify Mergify
Copy link
Contributor

mergify bot commented Sep 12, 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 vsphere_datastore_host_vm_metrics upstream/vsphere_datastore_host_vm_metrics
git merge upstream/main
git push upstream vsphere_datastore_host_vm_metrics

@kush-elastic kush-elastic merged commit 3f44bd1 into elastic:main Sep 13, 2024
29 checks passed
mergify bot pushed a commit that referenced this pull request Sep 13, 2024
@kush-elastic @mergify
[Metricbeat][vSphere] New metrics support and minor changes to existi…
82c1c3b 
…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/docs/fields.asciidoc
#	metricbeat/module/vsphere/datastore/_meta/data.json
#	metricbeat/module/vsphere/datastore/_meta/fields.yml
#	metricbeat/module/vsphere/datastore/data.go
#	metricbeat/module/vsphere/datastore/data_test.go
#	metricbeat/module/vsphere/datastore/datastore.go
#	metricbeat/module/vsphere/datastore/datastore_test.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/_meta/fields.yml
#	metricbeat/module/vsphere/virtualmachine/data_test.go
#	metricbeat/module/vsphere/virtualmachine/virtualmachine.go
@mergify mergify bot mentioned this pull request Sep 13, 2024
Closed
6 tasks
mergify bot pushed a commit that referenced this pull request Sep 13, 2024
@kush-elastic @mergify
[Metricbeat][vSphere] New metrics support and minor changes to existi…
4b6842e 
…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 mentioned this pull request Sep 13, 2024
Merged
6 tasks
ishleenk17 pushed a commit that referenced this pull request Sep 15, 2024
@kush-elastic @ishleenk17
[Metricbeat][vSphere] New metrics support and minor changes to existi…
7469272 
…ng metricsets (#40766)

* initial commit

* update field mappings

* update virtual machine data.json

* format data.json

* resolve review comments

* add changelog entry
@ishleenk17 ishleenk17 mentioned this pull request Sep 15, 2024
Merged
6 tasks
ishleenk17 added a commit that referenced this pull request Sep 15, 2024
@ishleenk17 @kush-elastic
[8.15](backport #40766) [Metricbeat][vSphere] New metrics support and…
943d1ea 
… minor changes to existing metricsets (#40834)

* [Metricbeat][vSphere] New metrics support and minor changes to existing metricsets (#40766)

* initial commit

* update field mappings

* update virtual machine data.json

* format data.json

* resolve review comments

* add changelog entry

* Update CHANGELOG.next.asciidoc

---------

Co-authored-by: Kush Rana <89848966+kush-elastic@users.noreply.github.com>
kush-elastic added a commit that referenced this pull request Oct 1, 2024
@mergify @kush-elastic
[8.x](backport #40766) [Metricbeat][vSphere] New metrics support and …
c3a001c 
…minor changes to existing metricsets (#40807)

* [Metricbeat][vSphere] New metrics support and minor changes to existing 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

* fix existing conflicts

* remove extra changelog entries

---------

Co-authored-by: Kush Rana <89848966+kush-elastic@users.noreply.github.com>
Co-authored-by: Kush Rana <kush.rana@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ishleenk17 ishleenk17 ishleenk17 approved these changes

@niraj-elastic niraj-elastic Awaiting requested review from niraj-elastic

Assignees

@kush-elastic kush-elastic

Labels
backport-8.x Automated backport to the 8.x branch with mergify backport-8.15 Automated backport to the 8.15 branch with mergify bugfix enhancement Metricbeat Metricbeat Module:beat The beat Metricbeat module module Team:Obs-InfraObs Label for the Observability Infrastructure Monitoring team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@kush-elastic @ishleenk17