fix(devices): derive presence from endpoints and align inventory ordering

This commit is contained in:
lda committed 2026-10-10 19:01:42 +07:00 Verified
1 parent 7caba52e57
commit f91186a7b1
6 files changed
+121 -6

No files matched your search

@@ -211,7 +211,8 @@ fn add_agent_device_to_entry(
)
.min();
entry.label_ip = entry.label_ip.into_iter().chain(label_ip).min();
let device_offline = agent_device.device.presence() == Presence::Offline;
let device_presence = agent_device.presence();
let device_offline = device_presence == Presence::Offline;
if let Some(summary) = device_known_device(&agent_device, context)
&& entry.known_device.is_none()
{
@@ -262,7 +263,6 @@ fn add_agent_device_to_entry(
.map(|current| current.max(last_seen))
.unwrap_or(last_seen),
);
let device_presence = agent_device.device.presence();
entry.presence = std::cmp::max(entry.presence, device_presence);
let agent_id = agent_device.device.agent_id.clone();
@@ -452,6 +452,42 @@ fn unknown_ip_only_offline_device_is_hidden_by_default() {
assert!(devices.is_empty());
}
#[test]
fn endpoint_presence_overrides_conflicting_cached_summary() {
for connected in [false, true] {
for (cached, evidence) in [
(Presence::Unknown, Presence::Offline),
(Presence::Online, Presence::Unknown),
(Presence::Offline, Presence::Online),
] {
let mut row = offline_ip_only_unknown("agent-a", "ip:192.168.1.2", "192.168.1.2", 20);
row.device.presence = cached.as_str().into();
let mut endpoint = endpoint_with_presence(
EndpointSource::Neighbor,
None,
Some("192.168.1.2"),
evidence,
20,
);
endpoint.hostname = None;
row.endpoints = vec![endpoint];
let ctx = if connected {
context(&["agent-a"])
} else {
context(&[])
};
let devices = build_fleet_devices(Vec::new(), vec![row], &ctx);
assert_eq!(devices[0].presence, evidence);
assert_eq!(devices[0].endpoints[0].presence, evidence);
assert_eq!(devices[0].agents[0].connected, connected);
if evidence == Presence::Offline {
assert_eq!(devices[0].display_name, "Offline device: 192.168.1.2");
assert!(devices[0].ips.is_empty());
}
}
}
}
#[test]
fn unnamed_endpoint_labels_preserve_presence_and_inactive_ips() {
for (presence, mac, ip, expected) in [