Skip to content

Commit d17885e

Browse files
mergify[bot]niraj-elastic
mergify[bot]
and
niraj-elastic
authored
[8.15](backport #40876) [vSphere] update field name for triggered_alarm (#40882)
* [vSphere] update field name for triggered_alarm (#40876) * update field name * update changelog * update changelog --------- Co-authored-by: Niraj Rathod <niraj.rathod@crestdatasys.com> (cherry picked from commit 0d56a64) # Conflicts: # metricbeat/module/vsphere/cluster/cluster.go # metricbeat/module/vsphere/datastore/datastore.go # metricbeat/module/vsphere/datastorecluster/datastorecluster.go # metricbeat/module/vsphere/host/host.go # metricbeat/module/vsphere/network/network.go # metricbeat/module/vsphere/resourcepool/resourcepool.go # metricbeat/module/vsphere/virtualmachine/virtualmachine.go * resolve merge conflicts * fix lint issue --------- Co-authored-by: niraj-elastic <124254029+niraj-elastic@users.noreply.github.com> Co-authored-by: niraj-elastic <niraj.rathod@elastic.co>
1 parent 8c80b65 commit d17885e

File tree

26 files changed

+122
-122
lines changed

26 files changed

+122
-122
lines changed

‎CHANGELOG.next.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
216216
- Add support for snapshot in vSphere virtualmachine metricset {pull}40683[40683]
217217
- Add support for new metrics in datastorecluster metricset. {pull}40694[40694]
218218
- Update fields to use mapstr in vSphere virtualmachine metricset {pull}40707[40707]
219-
- Add metrics related to alert in all the vSphere metricsets. {pull}40714[40714]
219+
- Add metrics related to triggered alarms in all the vSphere metricsets. {pull}40714[40714] {pull}40876[40876]
220220
- Add support for period based intervalID in vSphere host and datastore metricsets {pull}40678[40678]
221221
- Add new metrics for datastore and minor changes to overall vSphere metrics {pull}40766[40766]
222222
- Log the total time taken for GCP `ListTimeSeries` and `AggregatedList` requests {pull}40661[40661]

‎metricbeat/docs/fields.asciidoc

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -67012,10 +67012,10 @@ type: keyword
6701267012

6701367013
--
6701467014

67015-
*`vsphere.cluster.triggerd_alarms.*`*::
67015+
*`vsphere.cluster.triggered_alarms.*`*::
6701667016
+
6701767017
--
67018-
List of all the triggerd alarms.
67018+
List of all the triggered alarms.
6701967019

6702067020

6702167021
type: object
@@ -67175,10 +67175,10 @@ type: keyword
6717567175

6717667176
--
6717767177

67178-
*`vsphere.datastore.triggerd_alarms.*`*::
67178+
*`vsphere.datastore.triggered_alarms.*`*::
6717967179
+
6718067180
--
67181-
List of all the triggerd alarms.
67181+
List of all the triggered alarms.
6718267182

6718367183

6718467184
type: object
@@ -67278,10 +67278,10 @@ type: long
6727867278

6727967279
--
6728067280

67281-
*`vsphere.datastorecluster.triggerd_alarms.*`*::
67281+
*`vsphere.datastorecluster.triggered_alarms.*`*::
6728267282
+
6728367283
--
67284-
List of all the triggerd alarms.
67284+
List of all the triggered alarms.
6728567285

6728667286

6728767287
type: object
@@ -67645,10 +67645,10 @@ type: keyword
6764567645

6764667646
--
6764767647

67648-
*`vsphere.host.triggerd_alarms.*`*::
67648+
*`vsphere.host.triggered_alarms.*`*::
6764967649
+
6765067650
--
67651-
List of all the triggerd alarms.
67651+
List of all the triggered alarms.
6765267652

6765367653

6765467654
type: object
@@ -67784,10 +67784,10 @@ type: long
6778467784

6778567785
--
6778667786

67787-
*`vsphere.network.triggerd_alarms.*`*::
67787+
*`vsphere.network.triggered_alarms.*`*::
6778867788
+
6778967789
--
67790-
List of all the triggerd alarms.
67790+
List of all the triggered alarms.
6779167791

6779267792

6779367793
type: object
@@ -68020,10 +68020,10 @@ type: keyword
6802068020

6802168021
--
6802268022

68023-
*`vsphere.resourcepool.triggerd_alarms.*`*::
68023+
*`vsphere.resourcepool.triggered_alarms.*`*::
6802468024
+
6802568025
--
68026-
List of all the triggerd alarms.
68026+
List of all the triggered alarms.
6802768027

6802868028

6802968029
type: object
@@ -68257,10 +68257,10 @@ type: long
6825768257

6825868258
--
6825968259

68260-
*`vsphere.virtualmachine.triggerd_alarms.*`*::
68260+
*`vsphere.virtualmachine.triggered_alarms.*`*::
6826168261
+
6826268262
--
68263-
List of all the triggerd alarms.
68263+
List of all the triggered alarms.
6826468264

6826568265

6826668266
type: object

‎metricbeat/module/vsphere/cluster/_meta/data.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
"vsphere": {
1717
"cluster": {
18-
"triggerd_alarms": [
18+
"triggered_alarms": [
1919
{
2020
"status": "red",
2121
"triggered_time": "2024-09-09T13:23:00.786Z",

‎metricbeat/module/vsphere/cluster/_meta/fields.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
type: keyword
5353
description: >
5454
List of all the Network names associated with the cluster.
55-
- name: triggerd_alarms.*
55+
- name: triggered_alarms.*
5656
type: object
5757
object_type: keyword
5858
description: >
59-
List of all the triggerd alarms.
59+
List of all the triggered alarms.

‎metricbeat/module/vsphere/cluster/cluster.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ type assetNames struct {
5555
outputHostNames []string
5656
}
5757

58-
type triggerdAlarm struct {
58+
type triggeredAlarm struct {
5959
Name string `json:"name"`
6060
ID string `json:"id"`
6161
Status string `json:"status"`
@@ -65,8 +65,8 @@ type triggerdAlarm struct {
6565
}
6666

6767
type metricData struct {
68-
assetNames assetNames
69-
triggerdAlarms []triggerdAlarm
68+
assetNames assetNames
69+
triggeredAlarms []triggeredAlarm
7070
}
7171

7272
// New creates a new instance of the MetricSet.
@@ -136,13 +136,13 @@ func (m *ClusterMetricSet) Fetch(ctx context.Context, reporter mb.ReporterV2) er
136136
m.Logger().Warn("Metric das_config.enabled not found")
137137
}
138138

139-
triggerdAlarm, err := getTriggerdAlarm(ctx, pc, clt[i].TriggeredAlarmState)
139+
triggeredAlarm, err := getTriggeredAlarm(ctx, pc, clt[i].TriggeredAlarmState)
140140
if err != nil {
141141
m.Logger().Errorf("Failed to retrieve alerts from cluster %s: %w", clt[i].Name, err)
142142
}
143143

144144
reporter.Event(mb.Event{
145-
MetricSetFields: m.mapEvent(clt[i], &metricData{assetNames: assetNames, triggerdAlarms: triggerdAlarm}),
145+
MetricSetFields: m.mapEvent(clt[i], &metricData{assetNames: assetNames, triggeredAlarms: triggeredAlarm}),
146146
})
147147
}
148148
}
@@ -194,10 +194,10 @@ func getAssetNames(ctx context.Context, pc *property.Collector, cl *mo.ClusterCo
194194
}, nil
195195
}
196196

197-
func getTriggerdAlarm(ctx context.Context, pc *property.Collector, triggeredAlarmState []types.AlarmState) ([]triggerdAlarm, error) {
198-
triggeredAlarms := make([]triggerdAlarm, 0, len(triggeredAlarmState))
197+
func getTriggeredAlarm(ctx context.Context, pc *property.Collector, triggeredAlarmState []types.AlarmState) ([]triggeredAlarm, error) {
198+
triggeredAlarms := make([]triggeredAlarm, 0, len(triggeredAlarmState))
199199
for _, alarmState := range triggeredAlarmState {
200-
var triggeredAlarm triggerdAlarm
200+
var triggeredAlarm triggeredAlarm
201201
var alarm mo.Alarm
202202
err := pc.RetrieveOne(ctx, alarmState.Alarm, nil, &alarm)
203203
if err != nil {

‎metricbeat/module/vsphere/cluster/data.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ func (m *ClusterMetricSet) mapEvent(cl mo.ClusterComputeResource, data *metricDa
4040
"name": cl.Name,
4141
}
4242

43-
if len(data.triggerdAlarms) > 0 {
44-
event.Put("triggerd_alarms", data.triggerdAlarms)
43+
if len(data.triggeredAlarms) > 0 {
44+
event.Put("triggered_alarms", data.triggeredAlarms)
4545
}
4646

4747
if cl.Configuration.DasConfig.Enabled != nil {

‎metricbeat/module/vsphere/datastore/_meta/fields.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@
6464
type: keyword
6565
description: >
6666
Status of the datastore.
67-
- name: triggerd_alarms.*
67+
- name: triggered_alarms.*
6868
type: object
6969
object_type: keyword
7070
description: >
71-
List of all the triggerd alarms.
71+
List of all the triggered alarms.
7272
- name: vm.count
7373
type: long
7474
description: >

‎metricbeat/module/vsphere/datastore/data.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ func (m *DataStoreMetricSet) mapEvent(ds mo.Datastore, data *metricData) mapstr.
4949
},
5050
}
5151

52-
if len(data.triggerdAlarms) > 0 {
53-
event.Put("triggerd_alarms", data.triggerdAlarms)
52+
if len(data.triggeredAlarms) > 0 {
53+
event.Put("triggered_alarms", data.triggeredAlarms)
5454
}
5555

5656
if ds.Summary.Capacity > 0 {

‎metricbeat/module/vsphere/datastore/datastore.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
5555
return &DataStoreMetricSet{ms}, nil
5656
}
5757

58-
type triggerdAlarm struct {
58+
type triggeredAlarm struct {
5959
Name string `json:"name"`
6060
ID string `json:"id"`
6161
Status string `json:"status"`
@@ -65,9 +65,9 @@ type triggerdAlarm struct {
6565
}
6666

6767
type metricData struct {
68-
perfMetrics map[string]interface{}
69-
assetNames assetNames
70-
triggerdAlarms []triggerdAlarm
68+
perfMetrics map[string]interface{}
69+
assetNames assetNames
70+
triggeredAlarms []triggeredAlarm
7171
}
7272

7373
type assetNames struct {
@@ -149,16 +149,16 @@ func (m *DataStoreMetricSet) Fetch(ctx context.Context, reporter mb.ReporterV2)
149149
m.Logger().Errorf("Failed to retrieve performance metrics from datastore %s: %v", dst[i].Name, err)
150150
}
151151

152-
triggerdAlarm, err := getTriggerdAlarm(ctx, pc, dst[i].TriggeredAlarmState)
152+
triggeredAlarm, err := getTriggeredAlarm(ctx, pc, dst[i].TriggeredAlarmState)
153153
if err != nil {
154154
m.Logger().Errorf("Failed to retrieve alerts from datastore %s: %w", dst[i].Name, err)
155155
}
156156

157157
reporter.Event(mb.Event{
158158
MetricSetFields: m.mapEvent(dst[i], &metricData{
159-
perfMetrics: metricMap,
160-
triggerdAlarms: triggerdAlarm,
161-
assetNames: assetNames,
159+
perfMetrics: metricMap,
160+
triggeredAlarms: triggeredAlarm,
161+
assetNames: assetNames,
162162
}),
163163
})
164164
}
@@ -213,10 +213,10 @@ func getAssetNames(ctx context.Context, pc *property.Collector, ds *mo.Datastore
213213
}, nil
214214
}
215215

216-
func getTriggerdAlarm(ctx context.Context, pc *property.Collector, triggeredAlarmState []types.AlarmState) ([]triggerdAlarm, error) {
217-
triggeredAlarms := make([]triggerdAlarm, 0, len(triggeredAlarmState))
216+
func getTriggeredAlarm(ctx context.Context, pc *property.Collector, triggeredAlarmState []types.AlarmState) ([]triggeredAlarm, error) {
217+
triggeredAlarms := make([]triggeredAlarm, 0, len(triggeredAlarmState))
218218
for _, alarmState := range triggeredAlarmState {
219-
var triggeredAlarm triggerdAlarm
219+
var triggeredAlarm triggeredAlarm
220220
var alarm mo.Alarm
221221
err := pc.RetrieveOne(ctx, alarmState.Alarm, nil, &alarm)
222222
if err != nil {

‎metricbeat/module/vsphere/datastorecluster/_meta/fields.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
type: long
2727
description: >
2828
Number of datastores in the Datastore Cluster.
29-
- name: triggerd_alarms.*
29+
- name: triggered_alarms.*
3030
type: object
3131
object_type: keyword
3232
description: >
33-
List of all the triggerd alarms.
33+
List of all the triggered alarms.

0 commit comments

Comments
 (0)