fix(inputs.vsphere): Use guest.guestId value if set for guest name (#14635)
This commit is contained in:
parent
d8dc29be85
commit
a0f239c88f
|
|
@ -840,6 +840,9 @@ func getVMs(ctx context.Context, e *Endpoint, resourceFilter *ResourceFilter) (o
|
||||||
// Sometimes Config is unknown and returns a nil pointer
|
// Sometimes Config is unknown and returns a nil pointer
|
||||||
if r.Config != nil {
|
if r.Config != nil {
|
||||||
guest = cleanGuestID(r.Config.GuestId)
|
guest = cleanGuestID(r.Config.GuestId)
|
||||||
|
if r.Guest.GuestId != "" {
|
||||||
|
guest = cleanGuestID(r.Guest.GuestId)
|
||||||
|
}
|
||||||
uuid = r.Config.Uuid
|
uuid = r.Config.Uuid
|
||||||
}
|
}
|
||||||
cvs := make(map[string]string)
|
cvs := make(map[string]string)
|
||||||
|
|
|
||||||
|
|
@ -258,7 +258,8 @@ func init() {
|
||||||
"HostSystem": {"parent", "summary.customValue", "customValue"},
|
"HostSystem": {"parent", "summary.customValue", "customValue"},
|
||||||
"ResourcePool": {"parent", "customValue"},
|
"ResourcePool": {"parent", "customValue"},
|
||||||
"VirtualMachine": {"runtime.host", "config.guestId", "config.uuid", "runtime.powerState",
|
"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"},
|
"Datastore": {"parent", "info", "customValue"},
|
||||||
"ClusterComputeResource": {"parent", "customValue"},
|
"ClusterComputeResource": {"parent", "customValue"},
|
||||||
"Datacenter": {"parent", "customValue"},
|
"Datacenter": {"parent", "customValue"},
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue