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

[Metricbeat][vSphere] Support for configurable IntervalId for performance API #40678

Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
04ae955
initial commit for intervalId supports for performance metrics
kush-elastic Sep 3, 2024
2e5d6a1
Merge branch 'main' into 36-vsphere-support-for-configurable-interval…
kush-elastic Sep 4, 2024
831b070
Merge branch 'main' into 36-vsphere-support-for-configurable-interval…
kush-elastic Sep 5, 2024
1704e6e
update docs and fix CI
kush-elastic Sep 5, 2024
2e995ba
Add changelog entry
kush-elastic Sep 5, 2024
3727a3b
fix CI
kush-elastic Sep 5, 2024
416177c
resolve review comments
kush-elastic Sep 5, 2024
d2ac1b6
fix loggers
kush-elastic Sep 5, 2024
23fd9e4
resolved review comments
kush-elastic Sep 5, 2024
8da1d2a
update versions
kush-elastic Sep 6, 2024
ab175fd
update UTs
kush-elastic Sep 6, 2024
6b08b73
update integration tests
kush-elastic Sep 6, 2024
48e72b7
10s -> 20s
kush-elastic Sep 6, 2024
24bfb61
Merge branch 'main' into 36-vsphere-support-for-configurable-interval…
kush-elastic Sep 6, 2024
7b38b73
Update CHANGELOG.next.asciidoc
kush-elastic Sep 6, 2024
587aac6
Update metricbeat/docs/modules/vsphere.asciidoc
kush-elastic Sep 6, 2024
d5cd481
make update
kush-elastic Sep 6, 2024
0c4cb23
add recover for ToMetricSeries panic
kush-elastic Sep 6, 2024
7907f68
return error instead just logging it.
kush-elastic Sep 6, 2024
1806e5c
remove restriction of interval IDs
kush-elastic Sep 9, 2024
417703a
remove unnecessary validations
kush-elastic Sep 9, 2024
7fc5691
Merge branch 'main' into 36-vsphere-support-for-configurable-interval…
kush-elastic Sep 9, 2024
ad1c095
remove recover and add empty condition
kush-elastic Sep 9, 2024
c538f15
update changelog entry
kush-elastic Sep 9, 2024
0a156c8
Merge branch 'main' into 36-vsphere-support-for-configurable-interval…
kush-elastic Sep 9, 2024
9808c1e
Fix wrapping of errors in loggers
kush-elastic Sep 9, 2024
5a79756
update data.json
kush-elastic Sep 10, 2024
a2ee751
update data.json
kush-elastic Sep 10, 2024
09f540c
fix CI and loggers
kush-elastic Sep 10, 2024
d17fa70
Merge branch 'main' into 36-vsphere-support-for-configurable-interval…
kush-elastic Sep 10, 2024
4013033
update changelog entries
kush-elastic Sep 10, 2024
3edf243
make update
kush-elastic Sep 10, 2024
2c55bfe
Merge branch 'main' of https://github.com/kush-elastic/beats into 36-…
kush-elastic Sep 10, 2024
8f162b3
fix changelog entries
kush-elastic Sep 10, 2024
99be228
update changelog entry
kush-elastic Sep 10, 2024
1002544
Merge branch 'main' into 36-vsphere-support-for-configurable-interval…
kush-elastic Sep 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
- Disable event normalization for netflow input {pull}40635[40635]
- Allow attribute selection in the Active Directory entity analytics provider. {issue}40482[40482] {pull}40662[40662]
- Improve error quality when CEL program does not correctly return an events array. {pull}40580[40580]
- Add support for period based intervalID in vSphere host and datastore metricsets {pull}40678[40678]

*Auditbeat*

Expand Down
82 changes: 78 additions & 4 deletions metricbeat/docs/modules/vsphere.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,79 @@ This file is generated! See scripts/mage/docs_collector.go
[[metricbeat-module-vsphere]]
== vSphere module

The vSphere module uses the https://github.com/vmware/govmomi[Govmomi] library to collect metrics from any Vmware SDK URL (ESXi/VCenter). This library is built for and tested against ESXi and vCenter 5.5, 6.0 and 6.5.
The vSphere module uses the https://github.com/vmware/govmomi[Govmomi] library to collect metrics from any VMware SDK URL (ESXi/VCenter).

By default it enables the metricsets `cluster`, `datastore`, `datastorecluster`, `host`, `network`, `resourcepool` and `virtualmachine`.
This module has been tested against ESXi and vCenter versions 5.5, 6.0, 6.5, and 7.0.3.

By default, the vSphere module enables the following metricsets:

1. cluster

2. datastore

3. datastorecluster

4. host

5. network

6. resourcepool

7. virtualmachine

[float]
=== Supported Periods:
The Datastore and Host metricsets support performance data collection using the vSphere performance API. Given that the performance API imposes usage restrictions based on data collection intervals, users should configure the period optimally to ensure the receipt of real-time data. This configuration can be determined based on the https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.monitoring.doc/GUID-247646EA-A04B-411A-8DD4-62A3DCFCF49B.html[Data Collection Intervals] and https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.monitoring.doc/GUID-25800DE4-68E5-41CC-82D9-8811E27924BC.html[Data Collection Levels].

[IMPORTANT]

Only host and datastore metricsets have limitation of period restrictions.
kush-elastic marked this conversation as resolved.
Show resolved Hide resolved

[float]
==== Real-time data collection interval:
- 20s

[float]
==== Historical data collection interval:
- 300s
- 1800s
- 7200s
- 86400s

[float]
=== Example:
If you need to configure multiple metricsets with different periods, you can achieve this by setting up multiple vSphere modules with different metricsets as demonstrated below:

[source,yaml]
----
- module: vsphere
metricsets:
- cluster
- datastorecluster
- network
- resourcepool
- virtualmachine
period: 10s
hosts: ["https://localhost/sdk"]
username: "user"
password: "password"
insecure: false

- module: vsphere
metricsets:
- datastore
- host
period: 300s
hosts: ["https://localhost/sdk"]
username: "user"
password: "password"
insecure: false
----

[float]
=== Dashboard

The vsphere module comes with a predefined dashboard. For example:
The vSphere module includes a predefined dashboard. For example:

image::./images/metricbeat_vsphere_dashboard.png[]
image::./images/metricbeat_vsphere_vm_dashboard.png[]
Expand All @@ -36,15 +101,24 @@ metricbeat.modules:
- module: vsphere
enabled: true
metricsets: ["cluster", "datastore", "datastorecluster", "host", "network", "resourcepool", "virtualmachine"]

# Real-time data collection – An ESXi Server collects data for each performance counter every 20 seconds.
# Supported Periods:
# The Datastore and Host metricsets support performance data collection using the vSphere performance API.
Copy link
Contributor

Choose a reason for hiding this comment

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

shall we also mention that this will not impact the metrics collection other than perf metrics.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Nice idea. let me do that.

# Since the performance API has usage restrictions based on data collection intervals,
# users should ensure that the period is configured optimally to receive real-time data.
# This configuration can be determined based on the Data Collection Intervals and Data Collection Levels.
# Reference Links:
# Data Collection Intervals: https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.monitoring.doc/GUID-247646EA-A04B-411A-8DD4-62A3DCFCF49B.html
# Data Collection Levels: https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.monitoring.doc/GUID-25800DE4-68E5-41CC-82D9-8811E27924BC.html
period: 20s
hosts: ["https://localhost/sdk"]

username: "user"
password: "password"
# If insecure is true, don't verify the server's certificate chain
insecure: false
# Get custom fields when using virtualmachine metric set. Default false.
# Get custom fields when using virtualmachine metricset. Default false.
# get_custom_fields: false
----

Expand Down
11 changes: 10 additions & 1 deletion metricbeat/metricbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1008,15 +1008,24 @@ metricbeat.modules:
- module: vsphere
enabled: true
metricsets: ["cluster", "datastore", "datastorecluster", "host", "network", "resourcepool", "virtualmachine"]

# Real-time data collection – An ESXi Server collects data for each performance counter every 20 seconds.
# Supported Periods:
# The Datastore and Host metricsets support performance data collection using the vSphere performance API.
# Since the performance API has usage restrictions based on data collection intervals,
# users should ensure that the period is configured optimally to receive real-time data.
# This configuration can be determined based on the Data Collection Intervals and Data Collection Levels.
# Reference Links:
# Data Collection Intervals: https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.monitoring.doc/GUID-247646EA-A04B-411A-8DD4-62A3DCFCF49B.html
# Data Collection Levels: https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.monitoring.doc/GUID-25800DE4-68E5-41CC-82D9-8811E27924BC.html
period: 20s
hosts: ["https://localhost/sdk"]

username: "user"
password: "password"
# If insecure is true, don't verify the server's certificate chain
insecure: false
# Get custom fields when using virtualmachine metric set. Default false.
# Get custom fields when using virtualmachine metricset. Default false.
# get_custom_fields: false

#------------------------------- Windows Module -------------------------------
Expand Down
11 changes: 10 additions & 1 deletion metricbeat/module/vsphere/_meta/config.reference.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,22 @@
- module: vsphere
enabled: true
metricsets: ["cluster", "datastore", "datastorecluster", "host", "network", "resourcepool", "virtualmachine"]

# Real-time data collection – An ESXi Server collects data for each performance counter every 20 seconds.
# Supported Periods:
# The Datastore and Host metricsets support performance data collection using the vSphere performance API.
# Since the performance API has usage restrictions based on data collection intervals,
# users should ensure that the period is configured optimally to receive real-time data.
# This configuration can be determined based on the Data Collection Intervals and Data Collection Levels.
# Reference Links:
# Data Collection Intervals: https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.monitoring.doc/GUID-247646EA-A04B-411A-8DD4-62A3DCFCF49B.html
# Data Collection Levels: https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.monitoring.doc/GUID-25800DE4-68E5-41CC-82D9-8811E27924BC.html
period: 20s
hosts: ["https://localhost/sdk"]

username: "user"
password: "password"
# If insecure is true, don't verify the server's certificate chain
insecure: false
# Get custom fields when using virtualmachine metric set. Default false.
# Get custom fields when using virtualmachine metricset. Default false.
# get_custom_fields: false
11 changes: 10 additions & 1 deletion metricbeat/module/vsphere/_meta/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,22 @@
# - network
# - resourcepool
# - virtualmachine

# Real-time data collection – An ESXi Server collects data for each performance counter every 20 seconds.
# Supported Periods:
# The Datastore and Host metricsets support performance data collection using the vSphere performance API.
# Since the performance API has usage restrictions based on data collection intervals,
# users should ensure that the period is configured optimally to receive real-time data.
# This configuration can be determined based on the Data Collection Intervals and Data Collection Levels.
# Reference Links:
# Data Collection Intervals: https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.monitoring.doc/GUID-247646EA-A04B-411A-8DD4-62A3DCFCF49B.html
# Data Collection Levels: https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.monitoring.doc/GUID-25800DE4-68E5-41CC-82D9-8811E27924BC.html
period: 20s
hosts: ["https://localhost/sdk"]

username: "user"
password: "password"
# If insecure is true, don't verify the server's certificate chain
insecure: false
# Get custom fields when using virtualmachine metric set. Default false.
# Get custom fields when using virtualmachine metricset. Default false.
# get_custom_fields: false
71 changes: 68 additions & 3 deletions metricbeat/module/vsphere/_meta/docs.asciidoc
Original file line number Diff line number Diff line change
@@ -1,11 +1,76 @@
The vSphere module uses the https://github.com/vmware/govmomi[Govmomi] library to collect metrics from any Vmware SDK URL (ESXi/VCenter). This library is built for and tested against ESXi and vCenter 5.5, 6.0 and 6.5.
The vSphere module uses the https://github.com/vmware/govmomi[Govmomi] library to collect metrics from any VMware SDK URL (ESXi/VCenter).

By default it enables the metricsets `cluster`, `datastore`, `datastorecluster`, `host`, `network`, `resourcepool` and `virtualmachine`.
This module has been tested against ESXi and vCenter versions 5.5, 6.0, 6.5, and 7.0.3.

By default, the vSphere module enables the following metricsets:

1. cluster

2. datastore

3. datastorecluster

4. host

5. network

6. resourcepool

7. virtualmachine

[float]
=== Supported Periods:
The Datastore and Host metricsets support performance data collection using the vSphere performance API. Given that the performance API imposes usage restrictions based on data collection intervals, users should configure the period optimally to ensure the receipt of real-time data. This configuration can be determined based on the https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.monitoring.doc/GUID-247646EA-A04B-411A-8DD4-62A3DCFCF49B.html[Data Collection Intervals] and https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.monitoring.doc/GUID-25800DE4-68E5-41CC-82D9-8811E27924BC.html[Data Collection Levels].

[IMPORTANT]

Only host and datastore metricsets have limitation of period restrictions.

[float]
==== Real-time data collection interval:
- 20s

[float]
==== Historical data collection interval:
- 300s
- 1800s
- 7200s
- 86400s

[float]
=== Example:
If you need to configure multiple metricsets with different periods, you can achieve this by setting up multiple vSphere modules with different metricsets as demonstrated below:

[source,yaml]
----
- module: vsphere
metricsets:
- cluster
- datastorecluster
- network
- resourcepool
- virtualmachine
period: 10s
hosts: ["https://localhost/sdk"]
username: "user"
password: "password"
insecure: false

- module: vsphere
metricsets:
- datastore
- host
period: 300s
hosts: ["https://localhost/sdk"]
username: "user"
password: "password"
insecure: false
----

[float]
=== Dashboard

The vsphere module comes with a predefined dashboard. For example:
The vSphere module includes a predefined dashboard. For example:

image::./images/metricbeat_vsphere_dashboard.png[]
image::./images/metricbeat_vsphere_vm_dashboard.png[]
Loading
Loading