Issue elastic#7187/fix vsphere metricbeat host (elastic#7213)

* added host.id and host.hostname fields for vsphere

CHANGELOG.next.asciidoc

@@ -257,6 +257,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Fix checking tagsFilter using length in cloudwatch metricset. {pull}14525[14525]
 - Log bulk failures from bulk API requests to monitoring cluster. {issue}14303[14303] {pull}14356[14356]
 - Fixed bug with `elasticsearch/cluster_stats` metricset not recording license expiration date correctly. {issue}14541[14541] {pull}14591[14591]
+- Vshpere module splits `virtualmachine.host` into `virtualmachine.host.id` and `virtualmachine.host.hostname`. {issue}7187[7187] {pull}7213[7213]
 
 *Packetbeat*
 

metricbeat/docs/fields.asciidoc

@@ -32469,10 +32469,20 @@ virtualmachine
 
 
 
-*`vsphere.virtualmachine.host`*::
+*`vsphere.virtualmachine.host.id`*::
 +
 --
-Host name
+Host id
+
+
+type: keyword
+
+--
+
+*`vsphere.virtualmachine.host.hostname`*::
++
+--
+Host name of the host
 
 
 type: keyword

metricbeat/magefile.go

@@ -51,7 +51,6 @@ import (
 
 func init() {
 	common.RegisterCheckDeps(update.Update)
-
 	devtools.BeatDescription = "Metricbeat is a lightweight shipper for metrics."
 }
 

metricbeat/module/vsphere/virtualmachine/_meta/data.json

@@ -17,7 +17,8 @@
                     "mhz": 0
                 }
             },
-            "host": "ha-host",
+            "host.id": "ha-host",
+            "host.hostname": "localhost.localdomain",
             "memory": {
                 "free": {
                     "guest": {
@@ -41,4 +42,4 @@
             "name": "ha-host_VM1"
         }
     }
-}
+}

metricbeat/module/vsphere/virtualmachine/_meta/fields.yml

@@ -4,10 +4,14 @@
     virtualmachine
   release: beta
   fields:
-    - name: host
+    - name: host.id
       type: keyword
       description: >
-        Host name
+        Host id
+    - name: host.hostname
+      type: keyword
+      description: >
+        Host name of the host
     - name: name
       type: keyword
       description: >

metricbeat/module/vsphere/virtualmachine/virtualmachine.go

@@ -151,12 +151,12 @@ func (m *MetricSet) Fetch(ctx context.Context, reporter mb.ReporterV2) error {
 						"bytes": (int64(vm.Summary.QuickStats.GuestMemoryUsage) * 1024 * 1024),
 					},
 					"host": common.MapStr{
-						"bytes": (int64(vm.Summary.QuickStats.HostMemoryUsage) * 1024 * 1024),
+						"bytes": int64(vm.Summary.QuickStats.HostMemoryUsage) * 1024 * 1024,
 					},
 				},
 				"total": common.MapStr{
 					"guest": common.MapStr{
-						"bytes": (int64(vm.Summary.Config.MemorySizeMB) * 1024 * 1024),
+						"bytes": int64(vm.Summary.Config.MemorySizeMB) * 1024 * 1024,
 					},
 				},
 				"free": common.MapStr{
@@ -168,13 +168,19 @@ func (m *MetricSet) Fetch(ctx context.Context, reporter mb.ReporterV2) error {
 		}
 
 		if vm.Summary.Runtime.Host != nil {
-			event["host"] = vm.Summary.Runtime.Host.Value
+			event["host.id"] = vm.Summary.Runtime.Host.Value
 		} else {
 			m.Logger().Debug("'Host', 'Runtime' 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")
 		}
 
+		hostSystem, err := getHostSystem(ctx, c, vm.Summary.Runtime.Host.Reference())
+		if err != nil {
+			m.Logger().Debug(err.Error())
+		} else {
+			event["host.hostname"] = hostSystem.Summary.Config.Name
+		}
 		// Get custom fields (attributes) values if get_custom_fields is true.
 		if m.GetCustomFields && vm.Summary.CustomValue != nil {
 			customFields := getCustomFields(vm.Summary.CustomValue, customFieldsMap)
@@ -285,3 +291,14 @@ func setCustomFieldsMap(ctx context.Context, client *vim25.Client) (map[int32]st
 
 	return customFieldsMap, nil
 }
+
+func getHostSystem(ctx context.Context, c *vim25.Client, ref types.ManagedObjectReference) (*mo.HostSystem, error) {
+	pc := property.DefaultCollector(c)
+
+	var hs mo.HostSystem
+	err := pc.RetrieveOne(ctx, ref, []string{"summary"}, &hs)
+	if err != nil {
+		return nil, fmt.Errorf("error retrieving host information: %v", err)
+	}
+	return &hs, nil
+}

metricbeat/module/vsphere/virtualmachine/virtualmachine_test.go

@@ -48,7 +48,8 @@ func TestFetchEventContents(t *testing.T) {
 
 	t.Logf("%s/%s event: %+v", f.Module().Name(), f.Name(), event.StringToPrint())
 
-	assert.EqualValues(t, "ha-host", event["host"])
+	assert.EqualValues(t, "ha-host", event["host.id"])
+	assert.EqualValues(t, "localhost.localdomain", event["host.hostname"])
 	assert.True(t, strings.Contains(event["name"].(string), "ha-host_VM"))
 
 	cpu := event["cpu"].(common.MapStr)