fix(inputs.vsphere): Use guest.guestId value if set for guest name (#…

…14635) (cherry picked from commit a0f239c)
influxdata · Feb 20, 2024 · ef83bdf · ef83bdf
1 parent 820c254
commit ef83bdf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/plugins/inputs/vsphere/endpoint.go b/plugins/inputs/vsphere/endpoint.go
@@ -840,6 +840,9 @@ func getVMs(ctx context.Context, e *Endpoint, resourceFilter *ResourceFilter) (o
 		// Sometimes Config is unknown and returns a nil pointer
 		if r.Config != nil {
 			guest = cleanGuestID(r.Config.GuestId)
+			if r.Guest.GuestId != "" {
+				guest = cleanGuestID(r.Guest.GuestId)
+			}
 			uuid = r.Config.Uuid
 		}
 		cvs := make(map[string]string)

diff --git a/plugins/inputs/vsphere/finder.go b/plugins/inputs/vsphere/finder.go
@@ -258,7 +258,8 @@ func init() {
 		"HostSystem":   {"parent", "summary.customValue", "customValue"},
 		"ResourcePool": {"parent", "customValue"},
 		"VirtualMachine": {"runtime.host", "config.guestId", "config.uuid", "runtime.powerState",
-			"summary.customValue", "guest.net", "guest.hostName", "resourcePool", "customValue"},
+			"summary.customValue", "guest.guestId", "guest.net", "guest.hostName", "resourcePool",
+			"customValue"},
 		"Datastore":              {"parent", "info", "customValue"},
 		"ClusterComputeResource": {"parent", "customValue"},
 		"Datacenter":             {"parent", "customValue"},