Skip to content

Commit

Permalink
[vSphere] add triggered alarm to existing metricsets. (#40714)
Browse files Browse the repository at this point in the history
* add alert names

* update host metricset

* add alert metrics to all the metricsets

* add changelog entry

* update data_test

* add triggerd alarms

* added entity name

* mage check

---------

Co-authored-by: Niraj Rathod <niraj.rathod@crestdatasys.com>
Co-authored-by: Kush Rana <kush.rana@elastic.co>
Co-authored-by: harnish-elastic <harnish.chavda@elastic.co>
(cherry picked from commit 885a2db)
  • Loading branch information
niraj-elastic authored and mergify[bot] committed Sep 15, 2024
1 parent 943d1ea commit 2177780
Show file tree
Hide file tree
Showing 27 changed files with 691 additions and 84 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
- Add support for snapshot in vSphere virtualmachine metricset {pull}40683[40683]
- Add new metricset datastorecluster for vSphere module. {pull}40694[40694]
- Update fields to use mapstr in vSphere virtualmachine metricset {pull}40707[40707]
- Add metrics related to alert in all the vSphere metricsets. {pull}40714[40714]
- Add support for period based intervalID in vSphere host and datastore metricsets {pull}40678[40678]
- Add new metrics for datastore and minor changes to overall vSphere metrics {pull}40766[40766]

Expand Down
70 changes: 70 additions & 0 deletions metricbeat/docs/fields.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -66955,6 +66955,16 @@ type: keyword

--

*`vsphere.cluster.triggerd_alarms.*`*::
+
--
List of all the triggerd alarms.


type: object

--

[float]
=== datastore

Expand Down Expand Up @@ -67108,6 +67118,16 @@ type: keyword

--

*`vsphere.datastore.triggerd_alarms.*`*::
+
--
List of all the triggerd alarms.


type: object

--

*`vsphere.datastore.vm.count`*::
+
--
Expand Down Expand Up @@ -67201,6 +67221,16 @@ type: long

--

*`vsphere.datastorecluster.triggerd_alarms.*`*::
+
--
List of all the triggerd alarms.


type: object

--

[float]
=== host

Expand Down Expand Up @@ -67558,6 +67588,16 @@ type: keyword

--

*`vsphere.host.triggerd_alarms.*`*::
+
--
List of all the triggerd alarms.


type: object

--

*`vsphere.host.uptime`*::
+
--
Expand Down Expand Up @@ -67687,6 +67727,16 @@ type: long

--

*`vsphere.network.triggerd_alarms.*`*::
+
--
List of all the triggerd alarms.


type: object

--

[float]
=== resourcepool

Expand Down Expand Up @@ -67913,6 +67963,16 @@ type: keyword

--

*`vsphere.resourcepool.triggerd_alarms.*`*::
+
--
List of all the triggerd alarms.


type: object

--

[float]
=== virtualmachine

Expand Down Expand Up @@ -68140,6 +68200,16 @@ type: long

--

*`vsphere.virtualmachine.triggerd_alarms.*`*::
+
--
List of all the triggerd alarms.


type: object

--

[[exported-fields-windows]]
== Windows fields

Expand Down
118 changes: 76 additions & 42 deletions metricbeat/module/vsphere/cluster/_meta/data.json
Original file line number Diff line number Diff line change
@@ -1,47 +1,81 @@
{
"@timestamp": "2017-10-12T08:05:34.853Z",
"event": {
"dataset": "vsphere.cluster",
"duration": 115000,
"module": "vsphere"
},
"metricset": {
"name": "cluster",
"period": 10000
},
"service": {
"address": "127.0.0.1:33365",
"type": "vsphere"
},
"vsphere": {
"@timestamp": "2017-10-12T08:05:34.853Z",
"event": {
"dataset": "vsphere.cluster",
"duration": 115000,
"module": "vsphere"
},
"metricset": {
"name": "cluster",
"period": 10000
},
"service": {
"address": "127.0.0.1:33365",
"type": "vsphere"
},
"vsphere": {
"cluster": {
"name": "Cluster_1",
"das_config": {
"enabled": false,
"admission": {
"control": {
"enabled": true
}
"triggerd_alarms": [
{
"status": "red",
"triggered_time": "2024-09-09T13:23:00.786Z",
"description": "Default alarm to monitor system boards. See the host's Hardware Status tab for more details.",
"entity_name": "121.0.0.0",
"name": "Host hardware system board status",
"id": "alarm-121.host-12"
},
{
"triggered_time": "2024-09-09T13:23:00.786Z",
"description": "Default alarm to monitor storage. See the host's Hardware Status tab for more details.",
"entity_name": "121.0.0.0",
"name": "Host storage status",
"id": "alarm-124.host-12",
"status": "red"
},
{
"entity_name": "121.0.0.0",
"name": "Host memory usage",
"id": "alarm-4.host-12",
"status": "yellow",
"triggered_time": "2024-08-28T10:31:26.621Z",
"description": "Default alarm to monitor host memory usage"
},
{
"name": "CPU Utilization",
"id": "alarm-703.host-12",
"status": "red",
"triggered_time": "2024-08-28T10:31:26.621Z",
"description": "",
"entity_name": "121.0.0.0"
}
],
"name": "Cluster_1",
"das_config": {
"enabled": false,
"admission": {
"control": {
"enabled": true
}
}
},
"host": {
"count": 1,
"names": [
"Host_1"
]
},
"datastore": {
"count": 1,
"names": [
"Datastore_1"
]
},
"network": {
"count": 1,
"names": [
"Network_1"
]
}
},
"host": {
"count": 1,
"names": [
"Host_1"
]
},
"datastore": {
"count": 1,
"names": [
"Datastore_1"
]
},
"network": {
"count": 1,
"names": [
"Network_1"
]
}
}
}
}
}
7 changes: 6 additions & 1 deletion metricbeat/module/vsphere/cluster/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,9 @@
- name: names
type: keyword
description: >
List of all the Network names associated with the cluster.
List of all the Network names associated with the cluster.
- name: triggerd_alarms.*
type: object
object_type: keyword
description: >
List of all the triggerd alarms.
Loading

0 comments on commit 2177780

Please sign in to comment.