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 #40536) [vSphere] Add new Cluster metricset #40790

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 12, 2024

  • Enhancement

Description

Added following new metrics for the datastore metricset in the vSphere metricbeat module. added new performance API to get more detailed info from the vSphere.

Metrics Type Metrics Field Mappings
Cluster Summry  
ClusterComputeResource.Host cluster.host_names
ClusterComputeResource.Datastore cluster.datastore_names
ClusterComputeResource.Network cluster.network_names
ClusterComputeResource.Configuration.DasConfig.Enabled cluster.das_config.enabled
ClusterComputeResource.Configuration.DasConfig.AdmissionControlEnabled cluster.das_config.admission.control.enabled

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

* add cluster metricset

* update changelog

* fix lint errors

* minor changes

* add unit test

* update fields.yml

* mage update

* minor changes

* minor changes

* mage update

* Address review comment

* Address review comments

* address review comments

* update data.json

* update fields.yml

* update data.json

* lint changes

* mage update

* mage update for x-pack

* Mage update after conflicts

* update fields.go

* Address review comments

---------

Co-authored-by: Niraj Rathod <niraj.rathod@crestdatasys.com>
Co-authored-by: subham sarkar <subham.sarkar@elastic.co>
(cherry picked from commit 1058457)

# Conflicts:
#	metricbeat/docs/modules/vsphere.asciidoc
#	metricbeat/docs/modules_list.asciidoc
#	metricbeat/metricbeat.reference.yml
#	metricbeat/module/vsphere/_meta/config.reference.yml
#	metricbeat/module/vsphere/_meta/docs.asciidoc
#	metricbeat/module/vsphere/datastore/_meta/data.json
#	metricbeat/module/vsphere/datastore/data.go
#	metricbeat/module/vsphere/datastore/data_test.go
#	metricbeat/module/vsphere/datastore/datastore.go
#	metricbeat/module/vsphere/datastore/datastore_test.go
#	metricbeat/module/vsphere/fields.go
#	x-pack/metricbeat/metricbeat.reference.yml
@mergify mergify bot requested a review from a team as a code owner September 12, 2024 12:43
@mergify mergify bot added the backport label Sep 12, 2024
@mergify mergify bot requested a review from a team as a code owner September 12, 2024 12:43
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Sep 12, 2024
@mergify mergify bot requested review from faec and leehinman and removed request for a team September 12, 2024 12:43
Copy link
Contributor Author

mergify bot commented Sep 12, 2024

Cherry-pick of 1058457 has failed:

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

You are currently cherry-picking commit 1058457a28.
  (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
	new file:   metricbeat/docs/modules/vsphere/cluster.asciidoc
	modified:   metricbeat/include/list_common.go
	modified:   metricbeat/module/vsphere/_meta/README.md
	modified:   metricbeat/module/vsphere/_meta/config.yml
	new file:   metricbeat/module/vsphere/cluster/_meta/data.json
	new file:   metricbeat/module/vsphere/cluster/_meta/docs.asciidoc
	new file:   metricbeat/module/vsphere/cluster/_meta/fields.yml
	new file:   metricbeat/module/vsphere/cluster/cluster.go
	new file:   metricbeat/module/vsphere/cluster/cluster_test.go
	new file:   metricbeat/module/vsphere/cluster/data.go
	new file:   metricbeat/module/vsphere/cluster/data_test.go
	modified:   metricbeat/modules.d/vsphere.yml.disabled

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   metricbeat/docs/modules/vsphere.asciidoc
	both modified:   metricbeat/docs/modules_list.asciidoc
	both modified:   metricbeat/metricbeat.reference.yml
	both modified:   metricbeat/module/vsphere/_meta/config.reference.yml
	both modified:   metricbeat/module/vsphere/_meta/docs.asciidoc
	both modified:   metricbeat/module/vsphere/datastore/_meta/data.json
	deleted by us:   metricbeat/module/vsphere/datastore/data.go
	deleted by us:   metricbeat/module/vsphere/datastore/data_test.go
	both modified:   metricbeat/module/vsphere/datastore/datastore.go
	both modified:   metricbeat/module/vsphere/datastore/datastore_test.go
	both modified:   metricbeat/module/vsphere/fields.go
	both modified:   x-pack/metricbeat/metricbeat.reference.yml

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 12, 2024
@botelastic
Copy link

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

@ishleenk17
Copy link
Contributor

Closing in lieu of #40826

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

2 participants