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 #40634) [vSphere][datastore_cluster] Add support for new metrics in datastore_cluster metricset #40791

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 12, 2024

Description

Here are the following metrics to be added for the datastore cluster data stream in the vSphere metricbeat module. Here we added a new performance API to get more detailed information from vSphere.

Metrics Type Metrics API Field Mappings
Datastore cluster capacity StoragePod.Summary.Capacity Summary capacity.bytes
  StoragePod.Summary.FreeSpace Summary free_space.bytes

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

…_cluster metricset (#40634)

* initial commit for datastore cluster

* mage update

* update:
- data.json
- field.yml

* doc updates

* datastore_cluster -> datastorecluster

* resolve review comments

* fix UTs

* update URL for UTs

* update UTs

* fix field mapping

* update data.json

(cherry picked from commit 30320a3)

# Conflicts:
#	metricbeat/docs/modules/vsphere.asciidoc
#	metricbeat/docs/modules_list.asciidoc
#	metricbeat/metricbeat.reference.yml
#	metricbeat/module/vsphere/_meta/README.md
#	metricbeat/module/vsphere/_meta/config.reference.yml
#	metricbeat/module/vsphere/_meta/config.yml
#	metricbeat/module/vsphere/_meta/docs.asciidoc
#	metricbeat/module/vsphere/fields.go
#	metricbeat/modules.d/vsphere.yml.disabled
#	x-pack/metricbeat/metricbeat.reference.yml
@mergify mergify bot requested review from a team as code owners September 12, 2024 12:43
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 12, 2024
@mergify mergify bot requested review from AndersonQ and VihasMakwana and removed request for a team September 12, 2024 12:43
Copy link
Contributor Author

mergify bot commented Sep 12, 2024

Cherry-pick of 30320a3 has failed:

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

You are currently cherry-picking commit 30320a3bfc.
  (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:   metricbeat/docs/fields.asciidoc
	new file:   metricbeat/docs/modules/vsphere/datastorecluster.asciidoc
	modified:   metricbeat/include/list_common.go
	new file:   metricbeat/module/vsphere/datastorecluster/_meta/data.json
	new file:   metricbeat/module/vsphere/datastorecluster/_meta/docs.asciidoc
	new file:   metricbeat/module/vsphere/datastorecluster/_meta/fields.yml
	new file:   metricbeat/module/vsphere/datastorecluster/data.go
	new file:   metricbeat/module/vsphere/datastorecluster/data_test.go
	new file:   metricbeat/module/vsphere/datastorecluster/datastorecluster.go
	new file:   metricbeat/module/vsphere/datastorecluster/datastorecluster_test.go

Unmerged paths:
  (use "git add <file>..." 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/README.md
	both modified:   metricbeat/module/vsphere/_meta/config.reference.yml
	both modified:   metricbeat/module/vsphere/_meta/config.yml
	both modified:   metricbeat/module/vsphere/_meta/docs.asciidoc
	both modified:   metricbeat/module/vsphere/fields.go
	both modified:   metricbeat/modules.d/vsphere.yml.disabled
	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-40634 upstream/mergify/bp/8.15/pr-40634
git merge upstream/8.15
git push upstream mergify/bp/8.15/pr-40634

@ishleenk17
Copy link
Contributor

Closing in lieu of #40829

@ishleenk17 ishleenk17 closed this Sep 14, 2024
@mergify mergify bot deleted the mergify/bp/8.15/pr-40634 branch September 14, 2024 10:38
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