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 #40485) [vSphere][virtualmachine] Add metrics to virtualmachine metricset #40783

Merged
merged 4 commits into from
Sep 13, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 12, 2024

  • Enhancement

This PR adds the below metrics to the VirtualMachine

Metrics API Field Mappings
VirtualMachine.Summary.QuickStats.UptimeSeconds Summary virtualmachine.uptime
VirtualMachine.Summary.OverallStatus Summary virtualmachine.status
VirtualMachine.Summary.Datastore Summary virtualmachine.datastore.names

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

…0485)

* Add metrics to virtualmachine

* Lint changes

* Address lint errors

* Update data file

* Address review comments

* Resolve lint issues

* Address lint error

* Update the field definitions

* Update network code and address review comment

* mage update

* mage update

* Update tests

* Update metricbeat/module/vsphere/virtualmachine/virtualmachine.go

Co-authored-by: niraj-elastic <[email protected]>

* Address review comments

* Change event

---------

Co-authored-by: niraj-elastic <[email protected]>
(cherry picked from commit e1bbe05)

# Conflicts:
#	metricbeat/module/vsphere/fields.go
@mergify mergify bot requested a review from a team as a code owner September 12, 2024 10:01
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 12, 2024
Copy link
Contributor Author

mergify bot commented Sep 12, 2024

Cherry-pick of e1bbe05 has failed:

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

You are currently cherry-picking commit e1bbe05be2.
  (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/virtualmachine/_meta/data.json
	modified:   metricbeat/module/vsphere/virtualmachine/_meta/fields.yml
	new file:   metricbeat/module/vsphere/virtualmachine/data.go
	new file:   metricbeat/module/vsphere/virtualmachine/data_test.go
	modified:   metricbeat/module/vsphere/virtualmachine/virtualmachine.go
	modified:   metricbeat/module/vsphere/virtualmachine/virtualmachine_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   metricbeat/module/vsphere/fields.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 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-40485 upstream/mergify/bp/8.15/pr-40485
git merge upstream/8.15
git push upstream mergify/bp/8.15/pr-40485

Copy link
Contributor

@lalit-satapathy lalit-satapathy left a comment

Choose a reason for hiding this comment

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

LGTM backport PR.

@ishleenk17 ishleenk17 merged commit 5ce23fb into 8.15 Sep 13, 2024
29 checks passed
@ishleenk17 ishleenk17 deleted the mergify/bp/8.15/pr-40485 branch September 13, 2024 17:10
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