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 #40683) Add support of snapshot in vSphere virtualmachine metricset #40813

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 13, 2024

Add support of adding snapshot details to the Virtualmachine object in Vsphere.
It caters to the snapshot and any childsnapshots as well.

Relates: https://github.com/elastic/obs-integration-team/issues/34


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

* Add support of snapshot in virtualmachine

* mage update and add fields.yml

* Update data_test.go

* address comments, mage update

* Lint error

* Add createtime

* Update CHANGELOG.next.asciidoc

* Add state and id for snapshot

* update changelog

* lint change

* lint change

(cherry picked from commit 7f29f60)

# Conflicts:
#	metricbeat/docs/fields.asciidoc
#	metricbeat/module/vsphere/fields.go
#	metricbeat/module/vsphere/virtualmachine/_meta/data.json
#	metricbeat/module/vsphere/virtualmachine/_meta/fields.yml
#	metricbeat/module/vsphere/virtualmachine/data.go
#	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 14:25
@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 7f29f60 has failed:

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

You are currently cherry-picking commit 7f29f6021b.
  (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

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   metricbeat/docs/fields.asciidoc
	both modified:   metricbeat/module/vsphere/fields.go
	both modified:   metricbeat/module/vsphere/virtualmachine/_meta/data.json
	both modified:   metricbeat/module/vsphere/virtualmachine/_meta/fields.yml
	deleted by us:   metricbeat/module/vsphere/virtualmachine/data.go
	deleted by us:   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
@botelastic
Copy link

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

@ishleenk17
Copy link
Contributor

Closing in lieu of #40830

@ishleenk17 ishleenk17 closed this Sep 14, 2024
@mergify mergify bot deleted the mergify/bp/8.15/pr-40683 branch September 14, 2024 12:12
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