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

[vSphere] Add new Cluster metricset #40536

Merged
merged 31 commits into from
Aug 31, 2024

Conversation

niraj-elastic
Copy link
Contributor

  • 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

@niraj-elastic niraj-elastic self-assigned this Aug 15, 2024
@niraj-elastic niraj-elastic requested a review from a team as a code owner August 15, 2024 14:12
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Aug 15, 2024
Copy link
Contributor

mergify bot commented Aug 15, 2024

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @niraj-elastic? 🙏.
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

@lalit-satapathy lalit-satapathy added the Team:Integrations Label for the Integrations team label Aug 19, 2024
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations (Team:Integrations)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Aug 19, 2024
Copy link
Contributor

mergify bot commented Aug 22, 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 vsphere_cluster_metricset upstream/vsphere_cluster_metricset
git merge upstream/main
git push upstream vsphere_cluster_metricset

type assetNames struct {
outputNtNames []string
outputDsNames []string
outputHsNames []string
Copy link
Contributor

Choose a reason for hiding this comment

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

Aren't VM's part of the cluster as well ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We have included all the available list, VMs are not available in object.
image

Copy link
Contributor

Choose a reason for hiding this comment

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

If customer wants to get the VM info they can then refer to the details of the hosts and the VM associated with it (through the host metricset).

…phere_cluster_metricset

Conflicts:
	metricbeat/docs/modules/vsphere.asciidoc
	metricbeat/metricbeat.reference.yml
	metricbeat/module/vsphere/_meta/config.reference.yml
	metricbeat/module/vsphere/fields.go
Copy link
Contributor

mergify bot commented Aug 29, 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 vsphere_cluster_metricset upstream/vsphere_cluster_metricset
git merge upstream/main
git push upstream vsphere_cluster_metricset

Copy link
Contributor

mergify bot commented Aug 29, 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 vsphere_cluster_metricset upstream/vsphere_cluster_metricset
git merge upstream/main
git push upstream vsphere_cluster_metricset

…phere_cluster_metricset

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/fields.go
	x-pack/metricbeat/metricbeat.reference.yml
metricbeat/module/vsphere/cluster/_meta/fields.yml Outdated Show resolved Hide resolved
metricbeat/module/vsphere/cluster/_meta/fields.yml Outdated Show resolved Hide resolved
metricbeat/module/vsphere/cluster/_meta/fields.yml Outdated Show resolved Hide resolved
type assetNames struct {
outputNtNames []string
outputDsNames []string
outputHsNames []string
Copy link
Contributor

Choose a reason for hiding this comment

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

If customer wants to get the VM info they can then refer to the details of the hosts and the VM associated with it (through the host metricset).

Copy link
Collaborator

@kush-elastic kush-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

@niraj-elastic niraj-elastic merged commit 1058457 into elastic:main Aug 31, 2024
29 checks passed
@niraj-elastic niraj-elastic added backport-8.x Automated backport to the 8.x branch with mergify and removed backport-8.x Automated backport to the 8.x branch with mergify labels Sep 10, 2024
@ishleenk17 ishleenk17 added backport-8.15 Automated backport to the 8.15 branch with mergify and removed Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team labels Sep 12, 2024
mergify bot pushed a commit that referenced this pull request Sep 12, 2024
* 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
ishleenk17 pushed a commit that referenced this pull request Sep 14, 2024
* 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>
ishleenk17 pushed a commit that referenced this pull request Sep 14, 2024
* 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>
ishleenk17 added a commit that referenced this pull request Sep 14, 2024
…ckport (#40828)

* [vSphere] Add new Cluster metricset (#40536)

* 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>

* Update CHANGELOG.next.asciidoc

* Update CHANGELOG.next.asciidoc

* Update CHANGELOG.next.asciidoc

---------

Co-authored-by: niraj-elastic <124254029+niraj-elastic@users.noreply.github.com>
Co-authored-by: Niraj Rathod <niraj.rathod@crestdatasys.com>
Co-authored-by: subham sarkar <subham.sarkar@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-8.15 Automated backport to the 8.15 branch with mergify Team:Integrations Label for the Integrations team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants