135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

working free ports after reboot but bug: row expansion

Browse Source
This commit is contained in:
Oliver Gorwits
2019-08-19 23:25:06 +01:00
parent 4c1d5d672d
commit 22302114cb
3 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/App/Netdisco/DB/Result/Virtual/PortUtilization.pm
View File

@@ -17,11 +17,28 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
ELSE 0 END) as ports_in_use,
sum(CASE WHEN (dp.type != 'propVirtual' AND dp.up_admin != 'up') THEN 1
ELSE 0 END) as ports_shutdown,
sum(CASE WHEN (dp.type != 'propVirtual' AND dp.up_admin = 'up' AND dp.up != 'up'
AND ( age(now(), to_timestamp(extract(epoch from d.last_discover) - (d.uptime - dp.lastchange)/100)) > ?::interval )) THEN 1
ELSE 0 END) as ports_free
FROM device d LEFT JOIN device_port dp
sum(CASE
WHEN ( dp.type != 'propVirtual' AND dp.up_admin = 'up' AND dp.up != 'up'
AND (age(now(), to_timestamp(extract(epoch from d.last_discover) - (d.uptime/100))) < ?::interval)
AND (last_node.time_last IS NULL OR (age(now(), last_node.time_last)) > ?::interval) )
THEN 1
WHEN ( dp.type != 'propVirtual' AND dp.up_admin = 'up' AND dp.up != 'up'
AND (last_node.time_last IS NULL OR
(age(now(), to_timestamp(extract(epoch from d.last_discover) - (d.uptime - dp.lastchange)/100)) > ?::interval)) )
THEN 1
ELSE 0
END) as ports_free
FROM device d
LEFT JOIN device_port dp
ON d.ip = dp.ip
LEFT JOIN node last_node
ON last_node.mac = (
SELECT lastnodesub.mac
FROM node lastnodesub
WHERE port = dp.port AND switch = dp.ip
ORDER BY time_last DESC
LIMIT '1'
)
GROUP BY d.dns, d.ip
ORDER BY d.dns, d.ip
ENDSQL