Merge branch 'main' of github.com:elastic/beats into kubeadm_filebeat

elastic · Sep 18, 2024 · a419fcb · a419fcb
2 parents b50a0cb + 0d56a64
commit a419fcb
Show file tree

Hide file tree

Showing 26 changed files with 122 additions and 122 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -337,7 +337,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
 - Add new metrics for the vSphere Virtualmachine metricset. {pull}40485[40485]
 - Add support for snapshot in vSphere virtualmachine metricset {pull}40683[40683]
 - 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 metrics related to triggered alarms in all the vSphere metricsets. {pull}40714[40714] {pull}40876[40876]
 - Add support for period based intervalID in vSphere host and datastore metricsets {pull}40678[40678]
 - Add new metrics fot datastore and minor changes to overall vSphere metrics {pull}40766[40766]
 - Add `metrics_count` to Prometheus module if `metrics_count: true` is set. {pull}40411[40411]

diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -67022,10 +67022,10 @@ type: keyword
 
 --
 
-*`vsphere.cluster.triggerd_alarms.*`*::
+*`vsphere.cluster.triggered_alarms.*`*::
 +
 --
-List of all the triggerd alarms.
+List of all the triggered alarms.
 
 
 type: object
@@ -67185,10 +67185,10 @@ type: keyword
 
 --
 
-*`vsphere.datastore.triggerd_alarms.*`*::
+*`vsphere.datastore.triggered_alarms.*`*::
 +
 --
-List of all the triggerd alarms.
+List of all the triggered alarms.
 
 
 type: object
@@ -67288,10 +67288,10 @@ type: long
 
 --
 
-*`vsphere.datastorecluster.triggerd_alarms.*`*::
+*`vsphere.datastorecluster.triggered_alarms.*`*::
 +
 --
-List of all the triggerd alarms.
+List of all the triggered alarms.
 
 
 type: object
@@ -67655,10 +67655,10 @@ type: keyword
 
 --
 
-*`vsphere.host.triggerd_alarms.*`*::
+*`vsphere.host.triggered_alarms.*`*::
 +
 --
-List of all the triggerd alarms.
+List of all the triggered alarms.
 
 
 type: object
@@ -67794,10 +67794,10 @@ type: long
 
 --
 
-*`vsphere.network.triggerd_alarms.*`*::
+*`vsphere.network.triggered_alarms.*`*::
 +
 --
-List of all the triggerd alarms.
+List of all the triggered alarms.
 
 
 type: object
@@ -68030,10 +68030,10 @@ type: keyword
 
 --
 
-*`vsphere.resourcepool.triggerd_alarms.*`*::
+*`vsphere.resourcepool.triggered_alarms.*`*::
 +
 --
-List of all the triggerd alarms.
+List of all the triggered alarms.
 
 
 type: object
@@ -68267,10 +68267,10 @@ type: long
 
 --
 
-*`vsphere.virtualmachine.triggerd_alarms.*`*::
+*`vsphere.virtualmachine.triggered_alarms.*`*::
 +
 --
-List of all the triggerd alarms.
+List of all the triggered alarms.
 
 
 type: object

diff --git a/metricbeat/module/vsphere/cluster/_meta/data.json b/metricbeat/module/vsphere/cluster/_meta/data.json
@@ -15,7 +15,7 @@
  },
  "vsphere": {
  "cluster": {
- "triggerd_alarms": [
+ "triggered_alarms": [
  {
  "status": "red",
  "triggered_time": "2024-09-09T13:23:00.786Z",

diff --git a/metricbeat/module/vsphere/cluster/_meta/fields.yml b/metricbeat/module/vsphere/cluster/_meta/fields.yml
@@ -52,8 +52,8 @@
  type: keyword
  description: >
  List of all the Network names associated with the cluster.
- - name: triggerd_alarms.*
+ - name: triggered_alarms.*
  type: object
  object_type: keyword
  description: >
- List of all the triggerd alarms.
+ List of all the triggered alarms.
diff --git a/metricbeat/module/vsphere/cluster/cluster.go b/metricbeat/module/vsphere/cluster/cluster.go
@@ -55,7 +55,7 @@ type assetNames struct {
  outputHostNames []string
 }
 
-type triggerdAlarm struct {
+type triggeredAlarm struct {
  Name string `json:"name"`
  ID string `json:"id"`
  Status string `json:"status"`
@@ -65,8 +65,8 @@ type triggerdAlarm struct {
 }
 
 type metricData struct {
- assetNames assetNames
- triggerdAlarms []triggerdAlarm
+ assetNames  assetNames
+ triggeredAlarms []triggeredAlarm
 }
 
 // New creates a new instance of the MetricSet.
@@ -136,13 +136,13 @@ func (m *ClusterMetricSet) Fetch(ctx context.Context, reporter mb.ReporterV2) er
  m.Logger().Warn("Metric das_config.enabled not found")
  }
 
- triggerdAlarm, err := getTriggerdAlarm(ctx, pc, clt[i].TriggeredAlarmState)
+ triggeredAlarm, err := getTriggeredAlarm(ctx, pc, clt[i].TriggeredAlarmState)
  if err != nil {
  m.Logger().Errorf("Failed to retrieve alerts from cluster %s: %w", clt[i].Name, err)
  }
 
  reporter.Event(mb.Event{
- MetricSetFields: m.mapEvent(clt[i], &metricData{assetNames: assetNames, triggerdAlarms: triggerdAlarm}),
+ MetricSetFields: m.mapEvent(clt[i], &metricData{assetNames: assetNames, triggeredAlarms: triggeredAlarm}),
  })
  }
  }
@@ -194,10 +194,10 @@ func getAssetNames(ctx context.Context, pc *property.Collector, cl *mo.ClusterCo
  }, nil
 }
 
-func getTriggerdAlarm(ctx context.Context, pc *property.Collector, triggeredAlarmState []types.AlarmState) ([]triggerdAlarm, error) {
- var triggeredAlarms []triggerdAlarm
+func getTriggeredAlarm(ctx context.Context, pc *property.Collector, triggeredAlarmState []types.AlarmState) ([]triggeredAlarm, error) {
+ var triggeredAlarms []triggeredAlarm
  for _, alarmState := range triggeredAlarmState {
- var triggeredAlarm triggerdAlarm
+ var triggeredAlarm triggeredAlarm
  var alarm mo.Alarm
  err := pc.RetrieveOne(ctx, alarmState.Alarm, nil, &alarm)
  if err != nil {

diff --git a/metricbeat/module/vsphere/cluster/data.go b/metricbeat/module/vsphere/cluster/data.go
@@ -40,8 +40,8 @@ func (m *ClusterMetricSet) mapEvent(cl mo.ClusterComputeResource, data *metricDa
  "name": cl.Name,
  }
 
- if len(data.triggerdAlarms) > 0 {
- event.Put("triggerd_alarms", data.triggerdAlarms)
+ if len(data.triggeredAlarms) > 0 {
+ event.Put("triggered_alarms", data.triggeredAlarms)
  }
 
  if cl.Configuration.DasConfig.Enabled != nil {

diff --git a/metricbeat/module/vsphere/datastore/_meta/fields.yml b/metricbeat/module/vsphere/datastore/_meta/fields.yml
@@ -64,11 +64,11 @@
  type: keyword
  description: >
  Status of the datastore.
- - name: triggerd_alarms.*
+ - name: triggered_alarms.*
  type: object
  object_type: keyword
  description: >
- List of all the triggerd alarms.
+ List of all the triggered alarms.
  - name: vm.count
  type: long
  description: >

diff --git a/metricbeat/module/vsphere/datastore/data.go b/metricbeat/module/vsphere/datastore/data.go
@@ -49,8 +49,8 @@ func (m *DataStoreMetricSet) mapEvent(ds mo.Datastore, data *metricData) mapstr.
  },
  }
 
- if len(data.triggerdAlarms) > 0 {
- event.Put("triggerd_alarms", data.triggerdAlarms)
+ if len(data.triggeredAlarms) > 0 {
+ event.Put("triggered_alarms", data.triggeredAlarms)
  }
 
  if ds.Summary.Capacity > 0 {

diff --git a/metricbeat/module/vsphere/datastore/datastore.go b/metricbeat/module/vsphere/datastore/datastore.go
@@ -55,7 +55,7 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
  return &DataStoreMetricSet{ms}, nil
 }
 
-type triggerdAlarm struct {
+type triggeredAlarm struct {
  Name string `json:"name"`
  ID string `json:"id"`
  Status string `json:"status"`
@@ -65,9 +65,9 @@ type triggerdAlarm struct {
 }
 
 type metricData struct {
- perfMetrics map[string]interface{}
- assetNames assetNames
- triggerdAlarms []triggerdAlarm
+ perfMetrics  map[string]interface{}
+ assetNames  assetNames
+ triggeredAlarms []triggeredAlarm
 }
 
 type assetNames struct {
@@ -149,16 +149,16 @@ func (m *DataStoreMetricSet) Fetch(ctx context.Context, reporter mb.ReporterV2)
  m.Logger().Errorf("Failed to retrieve performance metrics from datastore %s: %v", dst[i].Name, err)
  }
 
- triggerdAlarm, err := getTriggerdAlarm(ctx, pc, dst[i].TriggeredAlarmState)
+ triggeredAlarm, err := getTriggeredAlarm(ctx, pc, dst[i].TriggeredAlarmState)
  if err != nil {
  m.Logger().Errorf("Failed to retrieve alerts from datastore %s: %w", dst[i].Name, err)
  }
 
  reporter.Event(mb.Event{
  MetricSetFields: m.mapEvent(dst[i], &metricData{
- perfMetrics: metricMap,
- triggerdAlarms: triggerdAlarm,
- assetNames: assetNames,
+ perfMetrics:  metricMap,
+ triggeredAlarms: triggeredAlarm,
+ assetNames:  assetNames,
  }),
  })
  }
@@ -213,10 +213,10 @@ func getAssetNames(ctx context.Context, pc *property.Collector, ds *mo.Datastore
  }, nil
 }
 
-func getTriggerdAlarm(ctx context.Context, pc *property.Collector, triggeredAlarmState []types.AlarmState) ([]triggerdAlarm, error) {
- var triggeredAlarms []triggerdAlarm
+func getTriggeredAlarm(ctx context.Context, pc *property.Collector, triggeredAlarmState []types.AlarmState) ([]triggeredAlarm, error) {
+ var triggeredAlarms []triggeredAlarm
  for _, alarmState := range triggeredAlarmState {
- var triggeredAlarm triggerdAlarm
+ var triggeredAlarm triggeredAlarm
  var alarm mo.Alarm
  err := pc.RetrieveOne(ctx, alarmState.Alarm, nil, &alarm)
  if err != nil {

diff --git a/metricbeat/module/vsphere/datastorecluster/_meta/fields.yml b/metricbeat/module/vsphere/datastorecluster/_meta/fields.yml
@@ -26,8 +26,8 @@
  type: long
  description: >
  Number of datastores in the Datastore Cluster.
- - name: triggerd_alarms.*
+ - name: triggered_alarms.*
  type: object
  object_type: keyword
  description: >
- List of all the triggerd alarms.
+ List of all the triggered alarms.
diff --git a/metricbeat/module/vsphere/datastorecluster/data.go b/metricbeat/module/vsphere/datastorecluster/data.go
@@ -38,8 +38,8 @@ func (m *DatastoreClusterMetricSet) mapEvent(datastoreCluster mo.StoragePod, dat
  },
  }
 
- if len(data.triggerdAlarms) > 0 {
- event.Put("triggerd_alarms", data.triggerdAlarms)
+ if len(data.triggeredAlarms) > 0 {
+ event.Put("triggered_alarms", data.triggeredAlarms)
  }
 
  return event

diff --git a/metricbeat/module/vsphere/datastorecluster/datastorecluster.go b/metricbeat/module/vsphere/datastorecluster/datastorecluster.go
@@ -60,11 +60,11 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
 }
 
 type metricData struct {
- assetNames assetNames
- triggerdAlarms []triggerdAlarm
+ assetNames  assetNames
+ triggeredAlarms []triggeredAlarm
 }
 
-type triggerdAlarm struct {
+type triggeredAlarm struct {
  Name string `json:"name"`
  ID string `json:"id"`
  Status string `json:"status"`
@@ -122,12 +122,12 @@ func (m *DatastoreClusterMetricSet) Fetch(ctx context.Context, reporter mb.Repor
  m.Logger().Errorf("Failed to retrieve object from datastore cluster %s: v", datastoreCluster[i].Name, err)
  }
 
- triggerdAlarm, err := getTriggerdAlarm(ctx, pc, datastoreCluster[i].TriggeredAlarmState)
+ triggeredAlarm, err := getTriggeredAlarm(ctx, pc, datastoreCluster[i].TriggeredAlarmState)
  if err != nil {
  m.Logger().Errorf("Failed to retrieve alerts from datastore cluster %s: %w", datastoreCluster[i].Name, err)
  }
 
- reporter.Event(mb.Event{MetricSetFields: m.mapEvent(datastoreCluster[i], &metricData{assetNames: assetNames, triggerdAlarms: triggerdAlarm})})
+ reporter.Event(mb.Event{MetricSetFields: m.mapEvent(datastoreCluster[i], &metricData{assetNames: assetNames, triggeredAlarms: triggeredAlarm})})
  }
 
  return nil
@@ -154,10 +154,10 @@ func getAssetNames(ctx context.Context, pc *property.Collector, dsc *mo.StorageP
  }, nil
 }
 
-func getTriggerdAlarm(ctx context.Context, pc *property.Collector, triggeredAlarmState []types.AlarmState) ([]triggerdAlarm, error) {
- var triggeredAlarms []triggerdAlarm
+func getTriggeredAlarm(ctx context.Context, pc *property.Collector, triggeredAlarmState []types.AlarmState) ([]triggeredAlarm, error) {
+ var triggeredAlarms []triggeredAlarm
  for _, alarmState := range triggeredAlarmState {
- var triggeredAlarm triggerdAlarm
+ var triggeredAlarm triggeredAlarm
  var alarm mo.Alarm
  err := pc.RetrieveOne(ctx, alarmState.Alarm, nil, &alarm)
  if err != nil {

diff --git a/metricbeat/module/vsphere/fields.go b/metricbeat/module/vsphere/fields.go
diff --git a/metricbeat/module/vsphere/host/_meta/data.json b/metricbeat/module/vsphere/host/_meta/data.json
@@ -15,7 +15,7 @@
  },
  "vsphere": {
  "host": {
- "triggerd_alarms": [
+ "triggered_alarms": [
  {
  "status": "red",
  "triggered_time": "2024-09-09T13:23:00.786Z",

diff --git a/metricbeat/module/vsphere/host/_meta/fields.yml b/metricbeat/module/vsphere/host/_meta/fields.yml
@@ -146,11 +146,11 @@
  type: keyword
  description: >
  The overall health status of a host in the vSphere environment.
- - name: triggerd_alarms.*
+ - name: triggered_alarms.*
  type: object
  object_type: keyword
  description: >
- List of all the triggerd alarms.
+ List of all the triggered alarms.
  - name: uptime
  type: long
  description: >

diff --git a/metricbeat/module/vsphere/host/data.go b/metricbeat/module/vsphere/host/data.go
@@ -46,8 +46,8 @@ func (m *HostMetricSet) mapEvent(hs mo.HostSystem, data *metricData) mapstr.M {
  m.Logger().Debug("'Hardware' or 'Summary' data not found. This is either a parsing error from vsphere library, an error trying to reach host/guest or incomplete information returned from host/guest")
  }
 
- if len(data.triggerdAlarms) > 0 {
- event.Put("triggerd_alarms", data.triggerdAlarms)
+ if len(data.triggeredAlarms) > 0 {
+ event.Put("triggered_alarms", data.triggeredAlarms)
  }
 
  if len(data.assetNames.outputVmNames) > 0 {