From a5cfd65181fcb28e5b1de5a738baad13ee8ab354 Mon Sep 17 00:00:00 2001
From: "Ole Mathias Aa. Heggem" <olemathias.aa.heggem@gmail.com>
Date: Fri, 19 Apr 2019 13:45:45 +0100
Subject: TG19

---
 web/js/nms-draw-chart.js   |  8 ++++----
 web/js/nms-info-box.js     | 13 +++++++++++++
 web/js/nms-map-handlers.js | 12 +++++++-----
 web/js/nms-time.js         |  4 ++--
 4 files changed, 26 insertions(+), 11 deletions(-)

(limited to 'web/js')

diff --git a/web/js/nms-draw-chart.js b/web/js/nms-draw-chart.js
index 1a08b21..4145a9a 100644
--- a/web/js/nms-draw-chart.js
+++ b/web/js/nms-draw-chart.js
@@ -351,16 +351,16 @@ function sizeToText(size) {
       return 'bit/s';
       break;
     case 1:
-      return 'kb/s';
+      return 'Kb/s';
       break;
     case 2:
-      return 'mb/s';
+      return 'Mb/s';
       break;
     case 3:
-      return 'gb/s';
+      return 'Gb/s';
       break;
     case 4:
-      return 'tb/s';
+      return 'Tb/s';
       break;
   }
 }
diff --git a/web/js/nms-info-box.js b/web/js/nms-info-box.js
index a6e7379..b00a442 100644
--- a/web/js/nms-info-box.js
+++ b/web/js/nms-info-box.js
@@ -638,8 +638,16 @@ var switchPortsPanel = function () {
 		expanderButton.innerHTML = "Toggle all";
 		expanderButton.setAttribute("onclick","$('.collapse-top').collapse('toggle');");
 		expanderButton.setAttribute("role","button");
+
+                var interfaceAliasButton = document.createElement("a");
+                interfaceAliasButton.innerHTML = "Toggle interfaces without ifAlias";
+                interfaceAliasButton.setAttribute("onclick", "$('.nms-interface-missing-alias').toggle();");
+                interfaceAliasButton.setAttribute("role","button");
+
 		domObj.appendChild(chart);
 		domObj.appendChild(expanderButton);
+		domObj.appendChild(document.createElement("br"));
+		domObj.appendChild(interfaceAliasButton);
 		var indicies = [];
 		for (var obj in snmpJson) {
 			indicies.push(obj);
@@ -661,10 +669,12 @@ var switchPortsPanel = function () {
 			var glyphicon = "glyphicon-remove";
 			var button = "btn-danger";
 			var title = "link down";
+			groupObj.classList.add("nms-interface-down");
 			if (snmpJson[obj].ifOperStatus == "up") {
 				glyphicon = "glyphicon-ok";
 				button = "btn-success";
 				title = "link up";
+				groupObj.classList.remove("nms-interface-down");
 			}
 			if (snmpJson[obj].ifAdminStatus == "down") {
 				glyphicon = "glyphicon-ban-circle";
@@ -680,6 +690,9 @@ var switchPortsPanel = function () {
 				}
 			} catch(e) {};
 
+			if(snmpJson[obj].ifAlias == null || snmpJson[obj].ifAlias == '') {
+				groupObj.classList.add("nms-interface-missing-alias");
+			}
 			groupObj.innerHTML = '<span class="panel-heading" style="display:block;"><a class="collapse-controller" role="button" data-toggle="collapse" href="#'+cleanObj+'-group">' + snmpJson[obj].ifName + ' </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>';
 
 			var groupObjCollapse = document.createElement("div");
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 + "%";
diff --git a/web/js/nms-time.js b/web/js/nms-time.js
index 482cfa7..d5b6379 100644
--- a/web/js/nms-time.js
+++ b/web/js/nms-time.js
@@ -39,7 +39,7 @@ nmsTime.startNowPicker = function () {
 	now.setMilliseconds(0);
 	var datepicker = $('#nowPicker').datetimepicker({
 		value: now,
-		step: 5,
+		step: 1,
 		mask:false,
 		inline:true,
 		todayButton: true,
@@ -62,7 +62,7 @@ nmsTime.setNow = function(now) {
 	var newDate = new Date(now);
 	newDate.setSeconds(0);
 	newDate.setMilliseconds(0);
-	newDate.setMinutes(newDate.getMinutes() - newDate.getMinutes()%5);
+	newDate.setMinutes(newDate.getMinutes() - newDate.getMinutes()%1);
 	nmsTime._now = newDate;
 	nmsTime._updateData();
 }
-- 
cgit v1.2.3