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.x](backport #40876) [vSphere] update field name for triggered_alarm #40883

Merged
merged 8 commits into from
Oct 7, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 18, 2024

Update field name for triggered_alarm.


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

* update field name

* update changelog

* update changelog

---------

Co-authored-by: Niraj Rathod <niraj.rathod@crestdatasys.com>
(cherry picked from commit 0d56a64)

# Conflicts:
#	metricbeat/docs/fields.asciidoc
#	metricbeat/module/vsphere/cluster/_meta/data.json
#	metricbeat/module/vsphere/cluster/_meta/fields.yml
#	metricbeat/module/vsphere/cluster/cluster.go
#	metricbeat/module/vsphere/cluster/data.go
#	metricbeat/module/vsphere/datastore/_meta/fields.yml
#	metricbeat/module/vsphere/datastore/data.go
#	metricbeat/module/vsphere/datastore/datastore.go
#	metricbeat/module/vsphere/datastorecluster/_meta/fields.yml
#	metricbeat/module/vsphere/datastorecluster/data.go
#	metricbeat/module/vsphere/datastorecluster/datastorecluster.go
#	metricbeat/module/vsphere/fields.go
#	metricbeat/module/vsphere/host/_meta/data.json
#	metricbeat/module/vsphere/host/_meta/fields.yml
#	metricbeat/module/vsphere/host/data.go
#	metricbeat/module/vsphere/host/host.go
#	metricbeat/module/vsphere/network/_meta/fields.yml
#	metricbeat/module/vsphere/network/data.go
#	metricbeat/module/vsphere/network/network.go
#	metricbeat/module/vsphere/resourcepool/_meta/fields.yml
#	metricbeat/module/vsphere/resourcepool/data.go
#	metricbeat/module/vsphere/resourcepool/resourcepool.go
#	metricbeat/module/vsphere/virtualmachine/_meta/fields.yml
#	metricbeat/module/vsphere/virtualmachine/data.go
#	metricbeat/module/vsphere/virtualmachine/virtualmachine.go
@mergify mergify bot requested a review from a team as a code owner September 18, 2024 11:02
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 18, 2024
Copy link
Contributor Author

mergify bot commented Sep 18, 2024

Cherry-pick of 0d56a64 has failed:

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

You are currently cherry-picking commit 0d56a640bd.
  (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 <file>..." to mark resolution)
	both modified:   metricbeat/docs/fields.asciidoc
	both modified:   metricbeat/module/vsphere/cluster/_meta/data.json
	both modified:   metricbeat/module/vsphere/cluster/_meta/fields.yml
	both modified:   metricbeat/module/vsphere/cluster/cluster.go
	both modified:   metricbeat/module/vsphere/cluster/data.go
	both modified:   metricbeat/module/vsphere/datastore/_meta/fields.yml
	both modified:   metricbeat/module/vsphere/datastore/data.go
	both modified:   metricbeat/module/vsphere/datastore/datastore.go
	both modified:   metricbeat/module/vsphere/datastorecluster/_meta/fields.yml
	both modified:   metricbeat/module/vsphere/datastorecluster/data.go
	both modified:   metricbeat/module/vsphere/datastorecluster/datastorecluster.go
	both modified:   metricbeat/module/vsphere/fields.go
	both modified:   metricbeat/module/vsphere/host/_meta/data.json
	both modified:   metricbeat/module/vsphere/host/_meta/fields.yml
	both modified:   metricbeat/module/vsphere/host/data.go
	both modified:   metricbeat/module/vsphere/host/host.go
	both modified:   metricbeat/module/vsphere/network/_meta/fields.yml
	both modified:   metricbeat/module/vsphere/network/data.go
	both modified:   metricbeat/module/vsphere/network/network.go
	both modified:   metricbeat/module/vsphere/resourcepool/_meta/fields.yml
	both modified:   metricbeat/module/vsphere/resourcepool/data.go
	both modified:   metricbeat/module/vsphere/resourcepool/resourcepool.go
	both modified:   metricbeat/module/vsphere/virtualmachine/_meta/fields.yml
	both modified:   metricbeat/module/vsphere/virtualmachine/data.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 18, 2024
@botelastic
Copy link

botelastic bot commented Sep 18, 2024

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

@shmsr
Copy link
Member

shmsr commented Sep 18, 2024

Ignore this one for now. There are a series of commits that need to be cherry-picked from main to this branch for vsphere.

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 @niraj-elastic? 🙏

1 similar comment
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 @niraj-elastic? 🙏

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-40876 upstream/mergify/bp/8.x/pr-40876
git merge upstream/8.x
git push upstream mergify/bp/8.x/pr-40876

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

@kush-elastic
Copy link
Collaborator

/test

Copy link
Contributor Author

mergify bot commented Oct 7, 2024

This pull request has not been merged yet. Could you please review and merge it @niraj-elastic? 🙏

@kush-elastic kush-elastic merged commit 4fcacaa into 8.x Oct 7, 2024
30 of 32 checks passed
@kush-elastic kush-elastic deleted the mergify/bp/8.x/pr-40876 branch October 7, 2024 09:29
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.

4 participants