diff options
Diffstat (limited to 'web/js')
| -rw-r--r-- | web/js/nms-info-box.js | 8 | ||||
| -rw-r--r-- | web/js/nms-map-handlers.js | 21 | ||||
| -rw-r--r-- | web/js/nms.js | 2 |
3 files changed, 16 insertions, 15 deletions
diff --git a/web/js/nms-info-box.js b/web/js/nms-info-box.js index 8f34031..4e8b18d 100644 --- a/web/js/nms-info-box.js +++ b/web/js/nms-info-box.js @@ -686,7 +686,7 @@ var switchPortsPanel = function () { } } catch(e) {}; - groupObj.innerHTML = '<span class="panel-heading" style="display:block;"><a class="collapse-controller" role="button" data-toggle="collapse" href="#'+cleanObj+'-group">' + snmpJson[obj].ifDescr + ' </a><small>' + snmpJson[obj].ifAlias + '</small><span class="pull-right">' + traffic + '<i class="btn-xs ' + button + '"><span class="glyphicon ' + glyphicon + '" title="' + title + '" aria-hidden="true"></span></i></span></span>'; + groupObj.innerHTML = '<span class="panel-heading" style="display:block;"><a class="collapse-controller" role="button" data-toggle="collapse" href="#'+cleanObj+'-group">' + snmpJson[obj].ifDescr + ' </a><small>' + snmpJson[obj].ifName + '</small><span class="pull-right">' + traffic + '<i class="btn-xs ' + button + '"><span class="glyphicon ' + glyphicon + '" title="' + title + '" aria-hidden="true"></span></i></span></span>'; var groupObjCollapse = document.createElement("div"); groupObjCollapse.id = cleanObj + "-group"; @@ -1389,7 +1389,7 @@ var networkEditPanel = function() { }; this.save = function () { - var myData = nmsInfoBox._editStringify(this.sw); + var myData = nmsInfoBox._editStringify(this.sw,"name"); $.ajax({ type: "POST", url: "/api/write/network-update", @@ -1505,7 +1505,7 @@ nmsInfoBox._editChange = function(sw, v) { out.value = myData; }; -nmsInfoBox._editStringify = function(sw) { - nmsInfoBox._editValues['sysname'] = sw; +nmsInfoBox._editStringify = function(sw, sysname='sysname') { + nmsInfoBox._editValues[sysname] = sw; return JSON.stringify([nmsInfoBox._editValues]); }; diff --git a/web/js/nms-map-handlers.js b/web/js/nms-map-handlers.js index f9fe52b..7200c60 100644 --- a/web/js/nms-map-handlers.js +++ b/web/js/nms-map-handlers.js @@ -516,13 +516,13 @@ function getDhcpColor(stop) function dhcpUpdater() { - if (!testTree(nmsData,['dhcp','dhcp']) || !testTree(nmsData,['switches','switches'])) { + if (!testTree(nmsData,['dhcp','dhcp']) || !testTree(nmsData,['switches','switches']) || !testTree(nmsData,['smanagement','switches'])) { return } var now = nmsData.dhcp.time; for (var sw in nmsData.switches.switches) { var c = nmsColor.blue; - var s = nmsData.dhcp.dhcp[sw]; + var s = nmsData.dhcp.dhcp[nmsData.smanagement.switches[sw].traffic_vlan]; if (s == undefined) { nmsMap.setSwitchColor(sw,c); continue; @@ -536,9 +536,9 @@ function dhcpInfo(sw) { var ret = new handlerInfo("dhcp","DHCP state"); ret.why = "No DHCP data"; ret.data[0].description = "DHCP age"; - if (testTree(nmsData,['dhcp','dhcp',sw])) { + if (testTree(nmsData,['dhcp','dhcp',nmsData.smanagement.switches[sw].traffic_vlan])) { var now = nmsData.dhcp.time; - var then = nmsData.dhcp.dhcp[sw]; + var then = nmsData.dhcp.dhcp[nmsData.smanagement.switches[sw].traffic_vlan]; var diff = now - then; var divider = 6; if(tagged(sw,'slowdhcp')) { @@ -551,11 +551,11 @@ function dhcpInfo(sw) { } else { ret.data[0].value = "No DHCP data"; if (testTree(nmsData,['smanagement','switches',sw])) { - if (nmsData.smanagement.switches[sw].subnet4 == undefined || - nmsData.smanagement.switches[sw].subnet4 == "") { - ret.data[0].value = "No associated subnets"; + if (nmsData.smanagement.switches[sw].traffic_vlan == undefined || + nmsData.smanagement.switches[sw].traffic_vlan == "") { + ret.data[0].value = "No associated networks"; ret.score = 0; - ret.why = "No subnet registered"; + ret.why = "No network associated"; } else { ret.score = 350; ret.why = "No DHCP data"; @@ -565,9 +565,10 @@ function dhcpInfo(sw) { ret.why = "No management data for DHCP"; } } - if (testTree(nmsData,['dhcp','switches',sw,'clients'])) { + if (testTree(nmsData,['dhcp','networks',nmsData.smanagement.switches[sw].traffic_vlan,'clients'])) { ret.data[1] = {}; - ret.data[1].value = nmsData.dhcp.switches[sw].clients; + ret.data[1].value = nmsData.dhcp.networks[nmsData.smanagement.switches[sw].traffic_vlan].clients; + console.log() ret.data[1].description = "DHCP clients"; } if (testTree(nmsData,['switches','switches',sw, 'tags'])) { diff --git a/web/js/nms.js b/web/js/nms.js index 0caac24..5e2dc22 100644 --- a/web/js/nms.js +++ b/web/js/nms.js @@ -134,7 +134,7 @@ function nmsTimer(handler, interval, name, description) { function byteCount(bytes,precision) { if (precision ==undefined) precision = 1; - var units = ['', 'K', 'M', 'G', 'T', 'P']; + var units = ['', 'K', 'M', 'G', 'T', 'P', 'E','Z']; var i = 0; while (bytes > 1024) { bytes = bytes / 1024; |