Add operating system from vsphere to 'os' field

CHANGELOG.next.asciidoc

@@ -235,6 +235,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Keep `etcd` followers members from reporting `leader` metricset events {pull}12004[12004]
 - Add overview dashboard to Consul module {pull}10665[10665]
 - New fields were added in the mysql/status metricset. {pull}12227[12227]
+- Add Vsphere Virtual Machine operating system to `os` field in Vsphere virtualmachine module. {pull}12391[12391]
 
 *Packetbeat*
 

metricbeat/docs/fields.asciidoc

@@ -27194,6 +27194,16 @@ type: keyword
 Virtual Machine name
 
 
+--
+
+*`vsphere.virtualmachine.os`*::
++
+--
+type: keyword
+
+Virtual Machine Operating System name
+
+
 --
 
 *`vsphere.virtualmachine.cpu.used.mhz`*::

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

@@ -12,6 +12,10 @@
       type: keyword
       description: >
         Virtual Machine name
+    - name: os
+      type: keyword
+      description: >
+        Virtual Machine Operating System name
     - name: cpu.used.mhz
       type: long
       description: >

metricbeat/module/vsphere/virtualmachine/virtualmachine.go

@@ -127,17 +127,37 @@ func (m *MetricSet) Fetch(reporter mb.ReporterV2) error {
 	}
 
 	for _, vm := range vmt {
-
 		freeMemory := (int64(vm.Summary.Config.MemorySizeMB) * 1024 * 1024) - (int64(vm.Summary.QuickStats.GuestMemoryUsage) * 1024 * 1024)
 
-		event := common.MapStr{}
-
-		event["name"] = vm.Summary.Config.Name
-		event.Put("cpu.used.mhz", vm.Summary.QuickStats.OverallCpuUsage)
-		event.Put("memory.used.guest.bytes", int64(vm.Summary.QuickStats.GuestMemoryUsage)*1024*1024)
-		event.Put("memory.used.host.bytes", int64(vm.Summary.QuickStats.HostMemoryUsage)*1024*1024)
-		event.Put("memory.total.guest.bytes", int64(vm.Summary.Config.MemorySizeMB)*1024*1024)
-		event.Put("memory.free.guest.bytes", freeMemory)
+		event := common.MapStr{
+			"name": vm.Summary.Config.Name,
+			"os":   vm.Summary.Config.GuestFullName,
+			"cpu": common.MapStr{
+				"used": common.MapStr{
+					"mhz": vm.Summary.QuickStats.OverallCpuUsage,
+				},
+			},
+			"memory": common.MapStr{
+				"used": common.MapStr{
+					"guest": common.MapStr{
+						"bytes": (int64(vm.Summary.QuickStats.GuestMemoryUsage) * 1024 * 1024),
+					},
+					"host": common.MapStr{
+						"bytes": (int64(vm.Summary.QuickStats.HostMemoryUsage) * 1024 * 1024),
+					},
+				},
+				"total": common.MapStr{
+					"guest": common.MapStr{
+						"bytes": (int64(vm.Summary.Config.MemorySizeMB) * 1024 * 1024),
+					},
+				},
+				"free": common.MapStr{
+					"guest": common.MapStr{
+						"bytes": freeMemory,
+					},
+				},
+			},
+		}
 
 		if vm.Summary.Runtime.Host != nil {
 			event["host"] = vm.Summary.Runtime.Host.Value