Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Sep 13, 2024

Description

Added alert.names field to fetch information related to alert in all the metricsets.

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

* add alert names

* update host metricset

* add alert metrics to all the metricsets

* add changelog entry

* update data_test

* add triggerd alarms

* added entity name

* mage check

---------

Co-authored-by: Niraj Rathod <[email protected]>
Co-authored-by: Kush Rana <[email protected]>
Co-authored-by: harnish-elastic <[email protected]>
(cherry picked from commit 885a2db)

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

mergify bot commented Sep 13, 2024

Cherry-pick of 885a2db has failed:

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

You are currently cherry-picking commit 885a2db1c4.
  (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/cluster/_meta/data.json
	modified:   metricbeat/module/vsphere/cluster/_meta/fields.yml
	modified:   metricbeat/module/vsphere/cluster/cluster.go
	modified:   metricbeat/module/vsphere/cluster/data.go
	modified:   metricbeat/module/vsphere/cluster/data_test.go
	modified:   metricbeat/module/vsphere/datastore/_meta/fields.yml
	modified:   metricbeat/module/vsphere/datastore/data.go
	modified:   metricbeat/module/vsphere/datastorecluster/_meta/fields.yml
	modified:   metricbeat/module/vsphere/datastorecluster/data.go
	modified:   metricbeat/module/vsphere/host/_meta/data.json
	modified:   metricbeat/module/vsphere/host/_meta/fields.yml
	modified:   metricbeat/module/vsphere/host/data.go
	modified:   metricbeat/module/vsphere/network/_meta/fields.yml
	modified:   metricbeat/module/vsphere/network/data.go
	modified:   metricbeat/module/vsphere/network/network.go
	modified:   metricbeat/module/vsphere/resourcepool/_meta/fields.yml
	modified:   metricbeat/module/vsphere/resourcepool/data.go
	modified:   metricbeat/module/vsphere/resourcepool/resourcepool.go
	modified:   metricbeat/module/vsphere/virtualmachine/_meta/fields.yml
	modified:   metricbeat/module/vsphere/virtualmachine/data.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   metricbeat/module/vsphere/datastore/datastore.go
	both modified:   metricbeat/module/vsphere/datastorecluster/datastorecluster.go
	both modified:   metricbeat/module/vsphere/fields.go
	both modified:   metricbeat/module/vsphere/host/host.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.

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

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

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

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

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 kush-elastic merged commit 3a7d098 into 8.x Oct 1, 2024
@kush-elastic kush-elastic deleted the mergify/bp/8.x/pr-40714 branch October 1, 2024 13:18
@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.

4 participants