From db2993b08588e2eb638842de1de1520f1b756de8 Mon Sep 17 00:00:00 2001
From: Pontus Rydin <prydin@vmware.com>
Date: Mon, 1 Oct 2018 19:13:32 -0400
Subject: [PATCH] Add UUID to VMs in vSphere input (#4769)

---
 plugins/inputs/vsphere/endpoint.go | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/plugins/inputs/vsphere/endpoint.go b/plugins/inputs/vsphere/endpoint.go
index 22b479a5c7fee..9f4c55250909f 100644
--- a/plugins/inputs/vsphere/endpoint.go
+++ b/plugins/inputs/vsphere/endpoint.go
@@ -60,6 +60,7 @@ type objectMap map[string]objectRef
 
 type objectRef struct {
 	name      string
+	altID     string
 	ref       types.ManagedObjectReference
 	parentRef *types.ManagedObjectReference //Pointer because it must be nillable
 	guest     string
@@ -470,22 +471,22 @@ func getHosts(ctx context.Context, root *view.ContainerView) (objectMap, error)
 
 func getVMs(ctx context.Context, root *view.ContainerView) (objectMap, error) {
 	var resources []mo.VirtualMachine
-	err := root.Retrieve(ctx, []string{"VirtualMachine"}, []string{"name", "runtime.host", "config.guestId"}, &resources)
+	err := root.Retrieve(ctx, []string{"VirtualMachine"}, []string{"name", "runtime.host", "config.guestId", "config.uuid"}, &resources)
 	if err != nil {
 		return nil, err
 	}
 	m := make(objectMap)
 	for _, r := range resources {
-		var guest string
+		guest := "unknown"
+		uuid := ""
 		// Sometimes Config is unknown and returns a nil pointer
 		//
 		if r.Config != nil {
 			guest = cleanGuestID(r.Config.GuestId)
-		} else {
-			guest = "unknown"
+			uuid = r.Config.Uuid
 		}
 		m[r.ExtensibleManagedObject.Reference().Value] = objectRef{
-			name: r.Name, ref: r.ExtensibleManagedObject.Reference(), parentRef: r.Runtime.Host, guest: guest}
+			name: r.Name, ref: r.ExtensibleManagedObject.Reference(), parentRef: r.Runtime.Host, guest: guest, altID: uuid}
 	}
 	return m, nil
 }
@@ -785,6 +786,10 @@ func (e *Endpoint) populateTags(objectRef *objectRef, resourceType string, resou
 		t[resource.pKey] = objectRef.name
 	}
 
+	if resourceType == "vm" && objectRef.altID != "" {
+		t["uuid"] = objectRef.altID
+	}
+
 	// Map parent reference
 	parent, found := e.instanceInfo[objectRef.parentRef.Value]
 	if found {