Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
2004252
update event
lucian-ioan Aug 28, 2024
a2c2591
update fields.yml
lucian-ioan Aug 28, 2024
d81254b
add changelog entry
lucian-ioan Aug 28, 2024
e9147ab
update sample event
lucian-ioan Aug 28, 2024
2eb74a8
elastic-package build
lucian-ioan Aug 28, 2024
11a135b
fix sample event
lucian-ioan Aug 28, 2024
8ce790b
fix vsphere name and fstype
lucian-ioan Aug 28, 2024
321a5e2
follow changelog guidelines
Sep 2, 2024
0cbd1bc
update fields
Sep 2, 2024
0677108
better field descriptions
Sep 2, 2024
3b98122
update sample event
Sep 2, 2024
38b42aa
package build
Sep 2, 2024
2cb93db
add metric types
Sep 3, 2024
9f6b19f
revert dockerfile
Sep 3, 2024
73366a7
add dockerfile newline
Sep 3, 2024
6a47c43
add period
lucian-ioan Sep 18, 2024
57aad0b
add triggered alarms
lucian-ioan Sep 18, 2024
4c5186f
Merge branch 'main' into update_vsphere_datastore_integration
lucian-ioan Sep 18, 2024
4c457aa
add disk capacity fields
lucian-ioan Sep 18, 2024
7bb821b
add metric types
lucian-ioan Sep 18, 2024
7cad138
update tag
lucian-ioan Sep 18, 2024
5333a11
update version to 1.15.0-next
lucian-ioan Sep 19, 2024
73a1b47
update kibana version to 8.15.2
lucian-ioan Sep 19, 2024
4afc186
remove global period
lucian-ioan Sep 19, 2024
ac62604
remove latency and iops fields
lucian-ioan Sep 19, 2024
9c7ae05
update triggered alarms to group
lucian-ioan Sep 19, 2024
1bdac8d
add tags in stream.yml.hbs
lucian-ioan Sep 19, 2024
47317a7
add system tests
lucian-ioan Sep 19, 2024
0b87f5b
Merge remote-tracking branch 'origin' into update_vsphere_datastore_i…
lucian-ioan Sep 19, 2024
9c15224
update readme
lucian-ioan Sep 19, 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
3 changes: 3 additions & 0 deletions packages/vsphere/changelog.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# newer versions go on top
- version: "1.15.0-next"
changes:
- description: Add additional metrics for datastore datastream
type: enhancement
link: https://github.com/elastic/integrations/pull/10911
- description: Add additional metrics for host datastream.
type: enhancement
link: https://github.com/elastic/integrations/pull/10894
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"events": [
{
"vsphere": {
"datastore": {
"disk": {
"capacity": {
"usage": {
"bytes": 520505786368
},
"bytes": 1610344300544
},
"provisioned": {
"bytes": 520505786368
}
},
"capacity": {
"free": {
"bytes": 37120094208
},
"total": {
"bytes": 74686664704
},
"used": {
"bytes": 37566570496,
"pct": 0.502988996026061
}
},
"fstype": "OTHER",
"host": {
"count": 1,
"names": "DC0_H0"
},
"name": "LocalDS_0",
"read": {
"bytes": 1024
},
"status": "green",
"vm": {
"count": 4,
"names": [
"DC0_C0_RP0_VM0",
"DC0_C0_RP0_VM1",
"DC0_H0_VM0",
"DC0_H0_VM1"
]
},
"write": {
"bytes": 450560
}
}
}
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"expected": [
{
"ecs": {
"version": "8.11.0"
},
"vsphere": {
"datastore": {
"capacity": {
"free": {
"bytes": 37120094208
},
"total": {
"bytes": 74686664704
},
"used": {
"bytes": 37566570496,
"pct": 0.502988996026061
}
},
"disk": {
"capacity": {
"bytes": 1610344300544,
"usage": {
"bytes": 520505786368
}
},
"provisioned": {
"bytes": 520505786368
}
},
"fstype": "OTHER",
"host": {
"count": 1,
"names": "DC0_H0"
},
"name": "LocalDS_0",
"read": {
"bytes": 1024
},
"status": "green",
"vm": {
"count": 4,
"names": [
"DC0_C0_RP0_VM0",
"DC0_C0_RP0_VM1",
"DC0_H0_VM0",
"DC0_H0_VM1"
]
},
"write": {
"bytes": 450560
}
}
}
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,13 @@ username: {{username}}
password: {{password}}
# If insecure is true, don't verify the server's certificate chain
insecure: {{insecure}}

tags:
{{#each tags as |tag|}}
- {{tag}}
{{/each}}

{{#if processors}}
processors:
{{processors}}
{{/if}}
{{/if}}
43 changes: 22 additions & 21 deletions packages/vsphere/data_stream/datastore/fields/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,33 +63,17 @@
type: keyword
description: >
List of all the host names associated with the datastore.
- name: iops
type: long
metric_type: gauge
description: >
Storage I/O Control aggregated Input/Output Operations Per Second.
- name: read.bytes
type: long
metric_type: gauge
unit: byte
description: >
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

metric_type to be added for new metrics.

Rate of reading data from the datastore.
format: bytes
- name: read.latency.total.ms
type: long
metric_type: gauge
unit: ms
description: >
Average amount of time for a read operation from the datastore in milliseconds.
- name: status
type: keyword
description: >
Status of the datastore.
- name: triggerd_alarms.*
type: object
object_type: keyword
description: >
List of all the triggerd alarms.
- name: vm.count
type: long
metric_type: gauge
Expand All @@ -106,9 +90,26 @@
description: >
Rate of writing data to the datastore.
format: bytes
- name: write.latency.total.ms
metric_type: gauge
unit: ms
type: long
- name: triggered_alarms
type: group
description: >
Average amount of time for a write operation from the datastore in milliseconds.
List of all the triggered alarms.
fields:
- name: status
type: keyword
description: Status of the alarm.
- name: triggered_time
type: date
description: Time when the alarm was triggered.
- name: description
type: keyword
description: Description of the alarm.
- name: entity_name
type: keyword
description: Name of the entity associated with the alarm.
- name: name
type: keyword
description: Name of the alarm.
- name: id
type: keyword
description: Unique identifier for the alarm.
13 changes: 13 additions & 0 deletions packages/vsphere/data_stream/datastore/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,19 @@ streams:
title: vSphere datastore metrics
description: vSphere datastore metrics
vars:
- name: period
type: text
title: Period
description: The vSphere performance API allows for collecting host and datastore metrics at various intervals, including real-time (every 20 seconds), 5 minutes, or longer durations. Properly configuring the "period" parameter is crucial to manage usage restrictions and ensure accurate data collection. For more information on optimizing your data collection setup, refer to the [Data Collection Intervals](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.monitoring.doc/GUID-247646EA-A04B-411A-8DD4-62A3DCFCF49B.html) and [Data Collection Levels](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.monitoring.doc/GUID-25800DE4-68E5-41CC-82D9-8811E27924BC.html) documentation.
default: 20s
- name: tags
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Tags is not added to hbs file.

type: text
title: Tags
multi: true
required: true
show_user: false
default:
- vsphere-datastore
- name: processors
type: yaml
title: Processors
Expand Down
83 changes: 58 additions & 25 deletions packages/vsphere/data_stream/datastore/sample_event.json
Original file line number Diff line number Diff line change
@@ -1,48 +1,50 @@
{
"@timestamp": "2023-06-29T08:03:30.114Z",
"@timestamp": "2024-09-02T10:04:25.122Z",
"agent": {
"ephemeral_id": "8b019ff3-cbda-41fa-b1ff-974d482b9694",
"id": "5096d7cc-1e4b-4959-abea-7355be2913a7",
"name": "docker-fleet-agent",
"ephemeral_id": "4da294a3-ad54-47f4-92c7-544e1356a0d8",
"id": "b01ab3cf-51ad-4c4d-87bd-fc2d4aa59d8a",
"name": "elastic-agent-76236",
"type": "metricbeat",
"version": "8.8.1"
"version": "8.16.0"
},
"data_stream": {
"dataset": "vsphere.datastore",
"namespace": "ep",
"namespace": "86691",
"type": "metrics"
},
"ecs": {
"version": "8.11.0"
},
"elastic_agent": {
"id": "5096d7cc-1e4b-4959-abea-7355be2913a7",
"snapshot": false,
"version": "8.8.1"
"id": "b01ab3cf-51ad-4c4d-87bd-fc2d4aa59d8a",
"snapshot": true,
"version": "8.16.0"
},
"event": {
"agent_id_status": "verified",
"dataset": "vsphere.datastore",
"duration": 23155458,
"ingested": "2023-06-29T08:03:31Z",
"duration": 190147614,
"ingested": "2024-09-02T10:04:27Z",
"module": "vsphere"
},
"host": {
"architecture": "aarch64",
"containerized": false,
"hostname": "docker-fleet-agent",
"id": "d08b346fbb8f49f5a2bb1a477f8ceb54",
"architecture": "x86_64",
"containerized": true,
"hostname": "elastic-agent-76236",
"id": "e744630f9d4f43dc818e497d221bd0b2",
"ip": [
"172.23.0.7"
"172.18.0.4",
"172.21.0.2"
],
"mac": [
"02-42-AC-17-00-07"
"02-42-AC-12-00-04",
"02-42-AC-15-00-02"
],
"name": "docker-fleet-agent",
"name": "elastic-agent-76236",
"os": {
"codename": "focal",
"family": "debian",
"kernel": "5.10.104-linuxkit",
"kernel": "5.15.153.1-microsoft-standard-WSL2",
"name": "Ubuntu",
"platform": "ubuntu",
"type": "linux",
Expand All @@ -54,25 +56,56 @@
"period": 10000
},
"service": {
"address": "https://elastic-package-service_vsphere-metrics_1:8989/sdk",
"address": "https://svc-vsphere-metrics:8989/sdk",
"type": "vsphere"
},
"vsphere": {
"datastore": {
"disk": {
"capacity": {
"usage": {
"bytes": 520505786368
},
"bytes": 1610344300544
},
"provisioned": {
"bytes": 520505786368
}
},
"capacity": {
"free": {
"bytes": 47869427712
"bytes": 37120094208
},
"total": {
"bytes": 62725623808
"bytes": 74686664704
},
"used": {
"bytes": 14856196096,
"pct": 0.237
"bytes": 37566570496,
"pct": 0.502988996026061
}
},
"fstype": "OTHER",
"name": "LocalDS_0"
"host": {
"count": 1,
"names": "DC0_H0"
},
"name": "LocalDS_0",
"read": {
"bytes": 1024
},
"status": "green",
"vm": {
"count": 4,
"names": [
"DC0_C0_RP0_VM0",
"DC0_C0_RP0_VM1",
"DC0_H0_VM0",
"DC0_H0_VM1"
]
},
"write": {
"bytes": 450560
}
}
}
}
Loading