diff --git a/metricbeat/module/vsphere/datastore/_meta/data.json b/metricbeat/module/vsphere/datastore/_meta/data.json index 7a263d487a3..dc690b8d40e 100644 --- a/metricbeat/module/vsphere/datastore/_meta/data.json +++ b/metricbeat/module/vsphere/datastore/_meta/data.json @@ -1,42 +1,4 @@ { -<<<<<<< HEAD - "@timestamp": "2017-10-12T08:05:34.853Z", - "event": { - "dataset": "vsphere.datastore", - "duration": 115000, - "module": "vsphere" - }, - "metricset": { - "name": "datastore", - "period": 10000 - }, - "service": { - "address": "127.0.0.1:33365", - "type": "vsphere" - }, - "vsphere": { - "datastore": { - "iops": 0, - "host": { - "count": 1, - "names": [ - "DC3_H0" - ] - }, - "status": "green", - "vm": { - "count": 6, - "names": [ - "DC3_H0_VM0" - ] - }, - "read": { - "bytes": 0, - "latency": { - "total": { - "ms": 0 - } -======= "@timestamp": "2017-10-12T08:05:34.853Z", "event": { "dataset": "vsphere.datastore", @@ -97,31 +59,6 @@ }, "fstype": "local", "name": "LocalDS_0" ->>>>>>> 3f44bd1f9b ([Metricbeat][vSphere] New metrics support and minor changes to existing metricsets (#40766)) } - }, - "write": { - "bytes": 337000, - "latency": { - "total": { - "ms": 0 - } - } - }, - "capacity": { - "free": { - "bytes": 37120094208 - }, - "total": { - "bytes": 74686664704 - }, - "used": { - "bytes": 37566570496, - "pct": 0.502988996026061 - } - }, - "fstype": "local", - "name": "LocalDS_0" } - } } \ No newline at end of file diff --git a/metricbeat/module/vsphere/datastore/datastore.go b/metricbeat/module/vsphere/datastore/datastore.go index 14fce5a4385..cae46466ac7 100644 --- a/metricbeat/module/vsphere/datastore/datastore.go +++ b/metricbeat/module/vsphere/datastore/datastore.go @@ -126,56 +126,6 @@ func (m *DataStoreMetricSet) Fetch(ctx context.Context, reporter mb.ReporterV2) for i := range dst { if ctx.Err() != nil { return ctx.Err() -<<<<<<< HEAD - default: - assetNames, err := getAssetNames(ctx, pc, &dst[i]) - if err != nil { - m.Logger().Errorf("Failed to retrieve object from host %s: %w", dst[i].Name, err) - continue - } - - spec := types.PerfQuerySpec{ - Entity: dst[i].Reference(), - MetricId: metricIds, - MaxSample: 1, - IntervalId: 20, // right now we are only grabbing real time metrics from the performance manager - } - - // Query performance data - samples, err := perfManager.Query(ctx, []types.PerfQuerySpec{spec}) - if err != nil { - m.Logger().Debugf("Failed to query performance data for host %s: %v", dst[i].Name, err) - continue - } - - if len(samples) == 0 { - m.Logger().Debugf("No samples returned from performance manager") - continue - } - - results, err := perfManager.ToMetricSeries(ctx, samples) - if err != nil { - m.Logger().Debugf("Failed to query performance data to metric series for host %s: %v", dst[i].Name, err) - continue - } - - metricMap := make(map[string]interface{}) - for _, result := range results[0].Value { - if len(result.Value) > 0 { - metricMap[result.Name] = result.Value[0] - continue - } - m.Logger().Debugf("For host %s,Metric %v: No result found", dst[i].Name, result.Name) - } - - reporter.Event(mb.Event{ - MetricSetFields: m.mapEvent(dst[i], &metricData{ - perfMetrics: metricMap, - assetNames: *assetNames, - }), - }) -======= ->>>>>>> 3f44bd1f9b ([Metricbeat][vSphere] New metrics support and minor changes to existing metricsets (#40766)) } assetNames, err := getAssetNames(ctx, pc, &dst[i]) @@ -246,8 +196,6 @@ func getAssetNames(ctx context.Context, pc *property.Collector, ds *mo.Datastore outputVmNames: outputVmNames, }, nil } -<<<<<<< HEAD -======= func (m *DataStoreMetricSet) getPerfMetrics(ctx context.Context, perfManager *performance.Manager, dst mo.Datastore, metrics map[string]*types.PerfCounterInfo) (metricMap map[string]interface{}, err error) { metricMap = make(map[string]interface{}) @@ -317,4 +265,3 @@ func (m *DataStoreMetricSet) getPerfMetrics(ctx context.Context, perfManager *pe return metricMap, nil } ->>>>>>> 3f44bd1f9b ([Metricbeat][vSphere] New metrics support and minor changes to existing metricsets (#40766)) diff --git a/metricbeat/module/vsphere/fields.go b/metricbeat/module/vsphere/fields.go index 35b91b906a3..54f4f093b7a 100644 --- a/metricbeat/module/vsphere/fields.go +++ b/metricbeat/module/vsphere/fields.go @@ -32,9 +32,5 @@ func init() { // AssetVsphere returns asset data. // This is the base64 encoded zlib format compressed contents of module/vsphere. func AssetVsphere() string { -<<<<<<< HEAD - return "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" -======= return "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" ->>>>>>> 3f44bd1f9b ([Metricbeat][vSphere] New metrics support and minor changes to existing metricsets (#40766)) } diff --git a/metricbeat/module/vsphere/host/_meta/data.json b/metricbeat/module/vsphere/host/_meta/data.json index a5f3b833e9f..cbeac0c106a 100644 --- a/metricbeat/module/vsphere/host/_meta/data.json +++ b/metricbeat/module/vsphere/host/_meta/data.json @@ -120,11 +120,7 @@ "vm": { "count": 2, "names": [ -<<<<<<< HEAD - "DC0_H0_VM0", -======= "DC0_H0_VM0", ->>>>>>> 3f44bd1f9b ([Metricbeat][vSphere] New metrics support and minor changes to existing metricsets (#40766)) "DC0_H0_VM1" ] }, @@ -134,10 +130,6 @@ "LocalDS_0" ] }, -<<<<<<< HEAD - "network_count": 1, -======= ->>>>>>> 3f44bd1f9b ([Metricbeat][vSphere] New metrics support and minor changes to existing metricsets (#40766)) "network_names": [ "VM Network" ], diff --git a/metricbeat/module/vsphere/host/host.go b/metricbeat/module/vsphere/host/host.go index 37a90248bbe..59973e0f66f 100644 --- a/metricbeat/module/vsphere/host/host.go +++ b/metricbeat/module/vsphere/host/host.go @@ -140,51 +140,6 @@ func (m *HostMetricSet) Fetch(ctx context.Context, reporter mb.ReporterV2) error for i := range hst { if ctx.Err() != nil { return ctx.Err() -<<<<<<< HEAD - default: - assetNames, err := getAssetNames(ctx, pc, &hst[i]) - if err != nil { - m.Logger().Errorf("Failed to retrieve object from host %s: %w", hst[i].Name, err) - } - - spec := types.PerfQuerySpec{ - Entity: hst[i].Reference(), - MetricId: metricIds, - MaxSample: 1, - IntervalId: 20, // right now we are only grabbing real time metrics from the performance manager - } - - // Query performance data - samples, err := perfManager.Query(ctx, []types.PerfQuerySpec{spec}) - if err != nil { - m.Logger().Errorf("Failed to query performance data from host %s: %v", hst[i].Name, err) - continue - } - - if len(samples) == 0 { - m.Logger().Debug("No samples returned from performance manager") - continue - } - - results, err := perfManager.ToMetricSeries(ctx, samples) - if err != nil { - m.Logger().Errorf("Failed to convert performance data to metric series for host %s: %v", hst[i].Name, err) - } - - metricMap := make(map[string]interface{}) - for _, result := range results[0].Value { - if len(result.Value) > 0 { - metricMap[result.Name] = result.Value[0] - continue - } - m.Logger().Debugf("For host %s,Metric %v: No result found", hst[i].Name, result.Name) - } - - reporter.Event(mb.Event{ - MetricSetFields: m.mapEvent(hst[i], &metricData{perfMetrics: metricMap, assetNames: assetNames}), - }) -======= ->>>>>>> 3f44bd1f9b ([Metricbeat][vSphere] New metrics support and minor changes to existing metricsets (#40766)) } assetNames, err := getAssetNames(ctx, pc, &hst[i]) if err != nil { @@ -248,8 +203,6 @@ func getAssetNames(ctx context.Context, pc *property.Collector, hs *mo.HostSyste outputVmNames: outputVmNames, }, nil } -<<<<<<< HEAD -======= func (m *HostMetricSet) getPerfMetrics(ctx context.Context, perfManager *performance.Manager, hst mo.HostSystem, metrics map[string]*types.PerfCounterInfo) (metricMap map[string]interface{}, err error) { metricMap = make(map[string]interface{}) @@ -319,4 +272,3 @@ func (m *HostMetricSet) getPerfMetrics(ctx context.Context, perfManager *perform return metricMap, nil } ->>>>>>> 3f44bd1f9b ([Metricbeat][vSphere] New metrics support and minor changes to existing metricsets (#40766)) diff --git a/metricbeat/module/vsphere/virtualmachine/_meta/data.json b/metricbeat/module/vsphere/virtualmachine/_meta/data.json index 70b40a4b672..902f309278c 100644 --- a/metricbeat/module/vsphere/virtualmachine/_meta/data.json +++ b/metricbeat/module/vsphere/virtualmachine/_meta/data.json @@ -15,77 +15,6 @@ }, "vsphere": { "virtualmachine": { -<<<<<<< HEAD - "network.names": [ - "PROD_VCF" - ], - "os": "Microsoft Windows 10 (64-bit)", - "datastore": { - "count": 1 - }, - "memory": { - "used": { - "guest": { - "bytes": 0 - }, - "host": { - "bytes": 0 - } - }, - "total": { - "guest": { - "bytes": 4294967296 - } - }, - "free": { - "guest": { - "bytes": 4294967296 - } - } - }, - "network": { - "count": 1 - }, - "host.hostname": "phx-w1c1", - "name": "phx-14", - "cpu": { - "free": { - "mhz": 0 - }, - "used": { - "mhz": 0 - }, - "total": { - "mhz": 0 - } - }, - "uptime": 0, - "status": "green", - "network_names": [ - "PROD_VCF" - ], - "datastore.names": [ - "VxRailtec-Virtual-SAN-Datastore-247df-bc1d-5aad2" - ], - "host.id": "host-20", - "snapshot.info": [ - { - "Name": "Snapshot_1", - "Description": "Test snapshot 1", - "CreateTime": "2024-09-01T12:34:56Z" - - }, - { - "Name": "Snapshot_2", - "Description": "Test snapshot 2", - "CreateTime": "2024-09-03T2:34:56Z" - } - ], - "snapshot.count": 2 - } - } - } -======= "name": "xt0nmfpv9", "uptime": 5348978, "status": "green", @@ -162,4 +91,3 @@ } } } ->>>>>>> 3f44bd1f9b ([Metricbeat][vSphere] New metrics support and minor changes to existing metricsets (#40766)) diff --git a/metricbeat/module/vsphere/virtualmachine/data_test.go b/metricbeat/module/vsphere/virtualmachine/data_test.go index d73196f2ee0..1c7a15991b5 100644 --- a/metricbeat/module/vsphere/virtualmachine/data_test.go +++ b/metricbeat/module/vsphere/virtualmachine/data_test.go @@ -122,25 +122,6 @@ func TestEventMapping(t *testing.T) { "customField1": "value1", "customField2": "value2", }, -<<<<<<< HEAD - "network.names": []string{"network-1", "network-2"}, - "network_names": []string{"network-1", "network-2"}, - "datastore.names": []string{"ds1", "ds2"}, - "snapshot.info": []VMSnapshotData{ - { - ID: 123, - Name: "Snapshot_1", - Description: "Test snapshot 1", - CreateTime: time.Time{}, - State: types.VirtualMachinePowerStatePoweredOff, - }, - { - ID: 745, - Name: "Snapshot_2", - Description: "Test snapshot 2", - CreateTime: time.Time{}, - State: types.VirtualMachinePowerStatePoweredOn, -======= "network_names": []string{"network-1", "network-2"}, "snapshot": mapstr.M{ "info": []VMSnapshotData{ @@ -158,7 +139,6 @@ func TestEventMapping(t *testing.T) { CreateTime: common.Time{}, State: types.VirtualMachinePowerStatePoweredOn, }, ->>>>>>> 3f44bd1f9b ([Metricbeat][vSphere] New metrics support and minor changes to existing metricsets (#40766)) }, }, "snapshot.count": 2, diff --git a/metricbeat/module/vsphere/virtualmachine/virtualmachine.go b/metricbeat/module/vsphere/virtualmachine/virtualmachine.go index beca6a5bafb..aeef362e849 100644 --- a/metricbeat/module/vsphere/virtualmachine/virtualmachine.go +++ b/metricbeat/module/vsphere/virtualmachine/virtualmachine.go @@ -61,19 +61,11 @@ type VMData struct { } type VMSnapshotData struct { -<<<<<<< HEAD - ID int32 - Name string - Description string - CreateTime time.Time - State types.VirtualMachinePowerState -======= ID int32 `json:"id"` Name string `json:"name"` Description string `json:"description"` CreateTime common.Time `json:"createtime"` State types.VirtualMachinePowerState `json:"state"` ->>>>>>> 3f44bd1f9b ([Metricbeat][vSphere] New metrics support and minor changes to existing metricsets (#40766)) } // New creates a new instance of the MetricSet.