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

Update fields to use mapstr in vSphere virtualmachine metricset #40707

Merged
merged 9 commits into from
Sep 10, 2024
Merged

Update fields to use mapstr in vSphere virtualmachine metricset #40707

merged 9 commits into from
Sep 10, 2024

Conversation

ishleenk17
Copy link
Contributor

@ishleenk17 ishleenk17 commented Sep 8, 2024 •
edited
Loading

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.

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 8, 2024
@mergify Mergify
Copy link
Contributor

mergify bot commented Sep 8, 2024

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @ishleenk17? 🙏.
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-v8./d.0 is the label to automatically backport to the 8./d branch. /d is the digit

@ishleenk17 ishleenk17 changed the title Convert fields to mapstr in vSphere virtualmachine metricset Update fields to use mapstr in vSphere virtualmachine metricset Sep 8, 2024
@ishleenk17 ishleenk17 marked this pull request as ready for review September 8, 2024 19:53
@ishleenk17 ishleenk17 requested a review from a team as a code owner September 8, 2024 19:53
niraj-elastic
niraj-elastic suggested changes Sep 9, 2024
View reviewed changes
metricbeat/module/vsphere/virtualmachine/_meta/data.json Outdated Show resolved Hide resolved
CHANGELOG.next.asciidoc Outdated Show resolved Hide resolved
shmsr
shmsr approved these changes Sep 9, 2024
View reviewed changes
Copy link
Member

@shmsr shmsr left a comment

Choose a reason for hiding this comment

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

Approving but left a few comments.

CHANGELOG.next.asciidoc Outdated Show resolved Hide resolved
metricbeat/module/vsphere/virtualmachine/_meta/data.json Outdated Show resolved Hide resolved
metricbeat/module/vsphere/virtualmachine/virtualmachine.go Show resolved Hide resolved
@mergify Mergify
Copy link
Contributor

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 vm_mapstr upstream/vm_mapstr
git merge upstream/main
git push upstream vm_mapstr

niraj-elastic
niraj-elastic approved these changes Sep 10, 2024
View reviewed changes
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

@ishleenk17 ishleenk17 enabled auto-merge (squash) September 10, 2024 09:38
@mergify Mergify
Copy link
Contributor

mergify bot commented Sep 10, 2024

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @ishleenk17? 🙏.
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-v8./d.0 is the label to automatically backport to the 8./d branch. /d is the digit

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

@ishleenk17 ishleenk17 removed backport-v8.x needs_team Indicates that the issue/PR needs a Team:* label labels Sep 10, 2024
@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 Mergify
Copy link
Contributor

mergify bot commented Sep 10, 2024

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @ishleenk17? 🙏.
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-v8./d.0 is the label to automatically backport to the 8./d branch. /d is the digit

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

@ishleenk17 ishleenk17 merged commit e7637c0 into elastic:main Sep 10, 2024
29 checks passed
mergify bot pushed a commit that referenced this pull request Sep 10, 2024
@ishleenk17 @mergify
Update fields to use mapstr in vSphere virtualmachine metricset (#40707)
3dd9ecf 
* 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 mentioned this pull request Sep 10, 2024
Merged
6 tasks
@ishleenk17 ishleenk17 added the backport-8.15 Automated backport to the 8.15 branch with mergify label Sep 14, 2024
mergify bot pushed a commit that referenced this pull request Sep 14, 2024
@ishleenk17 @mergify
Update fields to use mapstr in vSphere virtualmachine metricset (#40707)
26aa189 
* Convert fields to mapstr

* lint changes

* Address comments, update changelog

* lint change

* Address CI failure

(cherry picked from commit e7637c0)
@mergify mergify bot mentioned this pull request Sep 14, 2024
Merged
6 tasks
ishleenk17 added a commit that referenced this pull request Sep 15, 2024
@mergify @ishleenk17
[8.15](backport #40707) Update fields to use mapstr in vSphere virtua…
1ce389c 
…lmachine metricset (#40832)

* Update fields to use mapstr in vSphere virtualmachine metricset (#40707)

* Convert fields to mapstr

* lint changes

* Address comments, update changelog

* lint change

* Address CI failure

(cherry picked from commit e7637c0)

* Update CHANGELOG.next.asciidoc

---------

Co-authored-by: Ishleen Kaur <[email protected]>
kush-elastic added a commit that referenced this pull request Sep 30, 2024
@mergify @ishleenk17 @kush-elastic
[8.x](backport #40707) Update fields to use mapstr in vSphere virtual…
37ef076 
…machine metricset (#40724)

* Update fields to use mapstr in vSphere virtualmachine metricset (#40707)

* 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

* resolved conflicts

* fix data.json

* update fields.go

---------

Co-authored-by: Ishleen Kaur <[email protected]>
Co-authored-by: Kush Rana <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@niraj-elastic niraj-elastic niraj-elastic approved these changes

@shmsr shmsr shmsr approved these changes

Assignees

@ishleenk17 ishleenk17

Labels
backport-8.15 Automated backport to the 8.15 branch with mergify enhancement needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ishleenk17 @shmsr @niraj-elastic