mirror of
https://github.com/myronblair/jarvis
synced 2026-06-30 17:50:23 -05:00
Fix network panel: include netscan devices; fix Scan Now to queue agent command
This commit is contained in:
@@ -149,7 +149,28 @@ if ($action === 'scan') {
|
||||
];
|
||||
}
|
||||
|
||||
// 3. External services we can actually ping from DO
|
||||
// 3. Netscan-discovered devices (PVE1 nmap push — status from last scan)
|
||||
$discovered = JarvisDB::query(
|
||||
'SELECT ip, mac, hostname, device_type, status, last_seen FROM network_devices
|
||||
WHERE (alias IS NULL OR alias = "") AND last_seen > DATE_SUB(NOW(), INTERVAL 15 MINUTE)
|
||||
ORDER BY ip'
|
||||
);
|
||||
foreach ($discovered as $dev) {
|
||||
if (in_array($dev['ip'], $agentIPs)) continue;
|
||||
$devices[] = [
|
||||
'ip' => $dev['ip'],
|
||||
'name' => $dev['hostname'] ?: ($dev['device_type'] ?: $dev['ip']),
|
||||
'mac' => $dev['mac'],
|
||||
'type' => $dev['device_type'] ?: 'device',
|
||||
'alive' => $dev['status'] === 'online',
|
||||
'status' => $dev['status'],
|
||||
'last_seen' => $dev['last_seen'],
|
||||
'source' => 'netscan',
|
||||
'deletable' => false,
|
||||
];
|
||||
}
|
||||
|
||||
// 4. External services we can actually ping from DO
|
||||
$external = [
|
||||
['ip' => '134.209.72.226', 'name' => 'FusionPBX DO', 'type' => 'server'],
|
||||
];
|
||||
|
||||
Reference in New Issue
Block a user