Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Sep 10, 2024

Proposed commit message

See title

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.

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

* Convert fields to mapstr

* lint changes

* Address comments, update changelog

* lint change

* Address CI failure

(cherry picked from commit e7637c0)

# Conflicts:
#	metricbeat/module/vsphere/fields.go
#	metricbeat/module/vsphere/virtualmachine/_meta/data.json
#	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 10, 2024 10:07
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 10, 2024
@mergify
Copy link
Contributor Author

mergify bot commented Sep 10, 2024

Cherry-pick of e7637c0 has failed:

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

You are currently cherry-picking commit e7637c08b2.
  (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/fields.yml
	modified:   metricbeat/module/vsphere/virtualmachine/virtualmachine_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   metricbeat/module/vsphere/fields.go
	both modified:   metricbeat/module/vsphere/virtualmachine/_meta/data.json
	both modified:   metricbeat/module/vsphere/virtualmachine/data.go
	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 10, 2024
@botelastic
Copy link

botelastic bot commented Sep 10, 2024

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

@mergify
Copy link
Contributor Author

mergify bot commented Sep 10, 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-40707 upstream/mergify/bp/8.x/pr-40707
git merge upstream/8.x
git push upstream mergify/bp/8.x/pr-40707

@mergify
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 @ishleenk17? 🙏

2 similar comments
@mergify
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 @ishleenk17? 🙏

@mergify
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 @ishleenk17? 🙏

@kush-elastic kush-elastic requested review from a team as code owners September 30, 2024 09:12
@kush-elastic kush-elastic requested review from MichaelKatsoulis, VihasMakwana, faec and gizas and removed request for a team September 30, 2024 09:12
@kush-elastic kush-elastic force-pushed the mergify/bp/8.x/pr-40707 branch from 9ac1d95 to 3dd9ecf Compare September 30, 2024 09:17
@kush-elastic kush-elastic removed request for a team and VihasMakwana September 30, 2024 09:18
@mergify
Copy link
Contributor Author

mergify bot commented Sep 30, 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-40707 upstream/mergify/bp/8.x/pr-40707
git merge upstream/8.x
git push upstream mergify/bp/8.x/pr-40707

Copy link
Member

@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.

Ignoring lint errors as they were not present in the actual PR.

@kush-elastic kush-elastic merged commit 37ef076 into 8.x Sep 30, 2024
@kush-elastic kush-elastic deleted the mergify/bp/8.x/pr-40707 branch September 30, 2024 12:27
@khushijain21 khushijain21 mentioned this pull request Jun 23, 2025
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.

3 participants