diff options
| author | Ole Mathias Aa. Heggem <olemathias.aa.heggem@gmail.com> | 2019-04-19 13:45:45 +0100 |
|---|---|---|
| committer | olemathias.aa.heggem@gmail.com <root@gondul.tg19.gathering.org> | 2019-04-19 13:45:45 +0100 |
| commit | a5cfd65181fcb28e5b1de5a738baad13ee8ab354 (patch) | |
| tree | a78e589c318dcc62e69c8223f4d38d54a6c8c045 /web/js/nms-map-handlers.js | |
| parent | a877c0bea0ba4e1ce2342c4046f6a96a611d9501 (diff) | |
TG19
Diffstat (limited to 'web/js/nms-map-handlers.js')
| -rw-r--r-- | web/js/nms-map-handlers.js | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/web/js/nms-map-handlers.js b/web/js/nms-map-handlers.js index a715a77..1779bb5 100644 --- a/web/js/nms-map-handlers.js +++ b/web/js/nms-map-handlers.js @@ -571,8 +571,10 @@ function dhcpInfo(sw) { var clientPortsUp = 0; var clientPortsUp = setTree(nmsData,['switchstate','switches',sw,'clients','live'],0); var clientPortsTotal = setTree(nmsData,['switchstate','switches',sw,'clients','total'],0); - if (testTree(nmsData,['dhcp','networks',nmsData.smanagement.switches[sw].traffic_vlan,'clients'])) { - dhcpClients = nmsData.dhcp.networks[nmsData.smanagement.switches[sw].traffic_vlan].clients; + if (testTree(nmsData,['smanagement','switches',sw,'traffic_vlan'])) { + if (testTree(nmsData,['dhcp','networks',nmsData.smanagement.switches[sw].traffic_vlan,'clients'])) { + dhcpClients = nmsData.dhcp.networks[nmsData.smanagement.switches[sw].traffic_vlan].clients; + } } if (testTree(nmsData,['dhcp','dhcp4',nmsData.smanagement.switches[sw].traffic_vlan])) { var now = nmsData.dhcp.time; @@ -848,10 +850,10 @@ function cpuInfo(sw) { ret.score = 0; } else if (cpu < 50) { ret.score = 100; - } else if (cpu < 95) { - ret.score = cpu * 2; + } else if (cpu < 70 ) { + ret.score = cpu * 3; } else { - ret.score = cpu * 4; + ret.score = cpu * 7; } ret.why = "CPU utilization: " + cpu + "%"; ret.data[0].value = cpu + "%"; |