1 files changed, 181 insertions, 54 deletions

diff --git a/web/nms.gathering.org/js/nms-map-handlers.js b/web/nms.gathering.org/js/nms-map-handlers.js
index fa33bad..474e8ef 100644
--- a/web/nms.gathering.org/js/nms-map-handlers.js
+++ b/web/nms.gathering.org/js/nms-map-handlers.js
@@ -49,6 +49,12 @@ var handler_traffic_tot = {
 	name:"Switch traffic map"
 };
 
+var handler_dhcp = {
+	init:dhcpInit,
+	tag:"dhcp",
+	name:"DHCP map"
+};
+
 var handler_disco = {
 	init:discoInit,
 	tag:"disco",
@@ -61,6 +67,18 @@ var handler_comment = {
 	name:"Fresh comment spotter"
 };
 
+var handler_snmp = {
+	init:snmpInit,
+	tag:"snmp",
+	name:"SNMP state"
+};
+
+var handler_cpu = {
+	init:cpuInit,
+	tag:"cpu",
+	name:"CPU utilization"
+};
+
 var handlers = [
 	handler_uplinks,
 	handler_temp,
@@ -68,7 +86,10 @@ var handlers = [
 	handler_traffic,
 	handler_disco,
 	handler_comment,
-	handler_traffic_tot
+	handler_traffic_tot,
+	handler_dhcp,
+	handler_snmp,
+	handler_cpu
 	];
 
 /*
@@ -84,7 +105,7 @@ function uplinkUpdater()
 		return;
 	if (!nmsData.switchstate.switches)
 		return;
-	for (sw in nmsData.switches.switches) {
+	for (var sw in nmsData.switches.switches) {
 		var uplinks=0;
 		if (nmsData.switchstate.switches[sw] == undefined || nmsData.switchstate.switches[sw].uplinks == undefined) {
 			uplinks=0;
@@ -95,12 +116,12 @@ function uplinkUpdater()
 
 		if (uplinks == 0) {
 			nmsMap.setSwitchColor(sw,"white");
-		} else if (nuplinks == uplinks) {
-			nmsMap.setSwitchColor(sw,green);
-		} else if (nuplinks - uplinks == 1) {
-			nmsMap.setSwitchColor(sw, orange);
-		} else if (nuplinks - uplinks == 2) {
+		} else if (uplinks == 1) {
 			nmsMap. setSwitchColor(sw, red);
+		} else if (uplinks == 2) {
+			nmsMap.setSwitchColor(sw, orange);
+		} else if (uplinks == 3) {
+			nmsMap.setSwitchColor(sw,green);
 		} else if (uplinks > 3) {
 			nmsMap.setSwitchColor(sw, blue);
 		}
@@ -115,9 +136,9 @@ function uplinkInit()
 	nmsData.addHandler("switches","mapHandler",uplinkUpdater);
 	nmsData.addHandler("switchstate","mapHandler",uplinkUpdater);
 	setLegend(1,"white","0 uplinks");	
-	setLegend(2,red,"2 missing");	
-	setLegend(3,orange,"1 missing");	
-	setLegend(4,green,"0 missing");	
+	setLegend(2,red,"1 uplink");	
+	setLegend(3,orange,"2 uplinks");	
+	setLegend(4,green,"3 uplinks");	
 	setLegend(5,blue,"4 uplinks");	
 }
 
@@ -126,44 +147,43 @@ function uplinkInit()
  */
 function trafficInit()
 {
+	nmsData.addHandler("switches","mapHandler",trafficUpdater);
+	nmsData.addHandler("switchstate","mapHandler",trafficUpdater);
 	var m = 1024 * 1024 / 8;
 	drawGradient([lightgreen,green,orange,red]);
 	setLegend(1,colorFromSpeed(0),"0 (N/A)");	
-	setLegend(5,colorFromSpeed(2000 * m) , "2000Mb/s");	
-	setLegend(4,colorFromSpeed(1500 * m),"1500Mb/s");	
-	setLegend(3,colorFromSpeed(500 * m),"500Mb/s");	
+	setLegend(5,colorFromSpeed(1100 * m) , "1100Mb/s");	
+	setLegend(4,colorFromSpeed(600 * m),"600Mb/s");	
+	setLegend(3,colorFromSpeed(300 * m),"300Mb/s");	
 	setLegend(2,colorFromSpeed(10 * m),"10Mb/s");	
 }
 
 function trafficUpdater()
 {
-	if (!nms.switches_now["switches"])
+	if (!nmsData.switchstate.switches || !nmsData.switchstate.then)
 		return;
-	for (sw in nms.switches_now["switches"]) {
+	for (var sw in nmsData.switchstate.switches) {
 		var speed = 0;
-		for (port in nms.switches_now["switches"][sw]["ports"]) {
-			if (/ge-0\/0\/44$/.exec(port) ||
-			    /ge-0\/0\/45$/.exec(port) ||
-			    /ge-0\/0\/46$/.exec(port) ||
-			    /ge-0\/0\/47$/.exec(port))
-			 {
-				 if (!nms.switches_then["switches"][sw] ||
-				     !nms.switches_then["switches"][sw]["ports"] ||
-				     !nms.switches_then["switches"][sw]["ports"][port])
-					 continue;
-				 var t = nms.switches_then["switches"][sw]["ports"][port];
-				 var n = nms.switches_now["switches"][sw]["ports"][port];
-				 speed += (parseInt(t["ifhcoutoctets"]) -parseInt(n["ifhcoutoctets"])) / (parseInt(t["time"] - n["time"]));
-				 speed += (parseInt(t["ifhcinoctets"]) -parseInt(n["ifhcinoctets"])) / (parseInt(t["time"] - n["time"]));
-			 }
+		try {
+			var t = parseInt(nmsData.switchstate.then[sw].uplinks.ifHCOutOctets);
+			var n = parseInt(nmsData.switchstate.switches[sw].uplinks.ifHCOutOctets);
+			var tt = parseInt(nmsData.switchstate.then[sw].time);
+			var nt = parseInt(nmsData.switchstate.switches[sw].time);
+		} catch (e) { continue;};
+		var tdiff = nt - tt;
+		var diff = n - t;
+		speed = diff / tdiff;
+                if(!isNaN(speed)) {
+                        nmsMap.setSwitchColor(sw,colorFromSpeed(speed));
+			nmsMap.setSwitchInfo(sw,byteCount(speed*8,0));
 		}
-                if(!isNaN(speed))
-                        setSwitchColor(sw,colorFromSpeed(speed));
 	}
 }
 
 function trafficTotInit()
 {
+	nmsData.addHandler("switches","mapHandler",trafficTotUpdater);
+	nmsData.addHandler("switchstate","mapHandler",trafficTotUpdater);
 	var m = 1024 * 1024 / 8;
 	drawGradient([lightgreen,green,orange,red]);
 	setLegend(1,colorFromSpeed(0),"0 (N/A)");	
@@ -175,20 +195,21 @@ function trafficTotInit()
 
 function trafficTotUpdater()
 {
-	if (!nms.switches_now["switches"])
+	if (!nmsData.switchstate.switches || !nmsData.switchstate.then)
 		return;
-	for (sw in nms.switches_now["switches"]) {
+	for (var sw in nmsData.switchstate.switches) {
 		var speed = 0;
-		for (port in nms.switches_now["switches"][sw]["ports"]) {
-			if (!nms.switches_then["switches"][sw] ||
-			    !nms.switches_then["switches"][sw]["ports"] ||
-			    !nms.switches_then["switches"][sw]["ports"][port])
-				continue;
-			var t = nms.switches_then["switches"][sw]["ports"][port];
-			var n = nms.switches_now["switches"][sw]["ports"][port];
-			speed += (parseInt(t["ifhcoutoctets"]) -parseInt(n["ifhcoutoctets"])) / (parseInt(t["time"] - n["time"]));
-		}
-		setSwitchColor(sw,colorFromSpeed(speed,5));
+		try {
+			var t = parseInt(nmsData.switchstate.then[sw].totals.ifHCOutOctets);
+			var n = parseInt(nmsData.switchstate.switches[sw].totals.ifHCOutOctets);
+			var tt = parseInt(nmsData.switchstate.then[sw].time);
+			var nt = parseInt(nmsData.switchstate.switches[sw].time);
+		} catch (e) { continue;};
+		var tdiff = nt - tt;
+		var diff = n - t;
+		speed = diff / tdiff;
+                if(!isNaN(speed))
+                        nmsMap.setSwitchColor(sw,colorFromSpeed(speed));
 	}
 }
 
@@ -196,14 +217,13 @@ function colorFromSpeed(speed,factor)
 {
 	var m = 1024 * 1024 / 8;
 	if (factor == undefined)
-		factor = 2;
+		factor = 1.1;
 	if (speed == 0)
 		return blue;
 	speed = speed < 0 ? 0 : speed;
 	return getColorStop( 1000 * (speed / (factor * (1000 * m))));
 }
 
-
 /*
  * Tweaked this to scale from roughly 20C to 35C. Hence the -20  and /15
  * thing (e.g., "0" is 20 and "15" is 35 by the time we pass it to
@@ -222,27 +242,35 @@ function temp_color(t)
 
 function tempUpdater()
 {
-	for (sw in nms.switches_now["switches"]) {
+	if(!nmsData.switches)
+		return;
+
+	for ( var sw in nmsData.switches["switches"]) {
 		var t = "white";
 		var temp = "";
-		if (nms.switches_now["switches"][sw]["temp"]) {
-			t = temp_color(nms.switches_now["switches"][sw]["temp"]);
-			temp = nms.switches_now["switches"][sw]["temp"] + "°C";
-		}
 		
-		setSwitchColor(sw, t);
-		switchInfoText(sw, temp);
+		if(!nmsData.switchstate || !nmsData.switchstate.switches || !nmsData.switchstate.switches[sw] || !nmsData.switchstate.switches[sw].temp)
+			continue;
+
+		var t = nmsData.switchstate.switches[sw].temp;
+		temp = t + "°C";
+		t = temp_color(temp);
+		nmsMap.setSwitchColor(sw, t);
+		nmsMap.setSwitchInfo(sw, temp);
+
 	}
 }
 
 function tempInit()
-{
+{ 
+	//Padded the gradient with extra colors for the upper unused values
 	drawGradient(["black",blue,lightblue,lightgreen,green,orange,red]);
 	setLegend(1,temp_color(15),"15 °C");	
 	setLegend(2,temp_color(20),"20 °C");	
 	setLegend(3,temp_color(25),"25 °C");	
 	setLegend(4,temp_color(30),"30 °C");	
 	setLegend(5,temp_color(35),"35 °C");	
+	nmsData.addHandler("switchstate","mapHandler",tempUpdater);
 }
 
 function pingUpdater()
@@ -252,6 +280,7 @@ function pingUpdater()
 	}
 	for (var sw in nmsData.switches.switches) {
 		try {
+            var c;
 			if (nmsData.ping.switches[sw].age > 0) {
 				c = red;
 			} else {
@@ -284,6 +313,8 @@ function commentUpdater()
 	if (nmsData.comments == undefined || nmsData.comments.comments == undefined) {
 		return
 	}
+	if(!nmsData.switches) 
+		return;
 	for (var sw in nmsData.switches.switches) {
 		var c = "white";
 		if (nmsData.comments.comments[sw] == undefined) {
@@ -329,6 +360,55 @@ function commentInit()
 	setLegend(5,green ,"Old/inactive only");	
 }
 
+function getDhcpColor(stop)
+{
+	stop = parseInt(stop);
+	stop = stop * 0.85;
+	if (stop < 0)
+		stop = 1000;
+	if (stop > 1000)
+		stop = 1000;
+	return getColorStop(stop);
+}
+
+function dhcpUpdater()
+{
+	var realnow = Date.now();
+	var now = Math.floor(realnow / 1000);
+	if (nmsData.dhcp == undefined || nmsData.dhcp.dhcp == undefined) {
+		return
+	}
+	if (nmsData.switches == undefined || nmsData.switches.switches == undefined) {
+		return;
+	}
+	try {
+	for (var sw in nmsData.switches.switches) {
+		var c = blue;
+		if (nmsData.dhcp.dhcp[sw] == undefined) {
+			nmsMap.setSwitchColor(sw,c);
+			continue;
+		}
+		var s = nmsData.dhcp.dhcp[sw];
+		var then = parseInt(s);
+		c = getDhcpColor(now - then);
+		nmsMap.setSwitchColor(sw, c);
+	}
+	} catch(e) {
+		console.log(e);
+	}
+}
+
+function dhcpInit()
+{
+	drawGradient([green,lightgreen,orange,red]);
+	nmsData.addHandler("dhcp","mapHandler",dhcpUpdater);
+	setLegend(1,"white","Undefined");
+	setLegend(2,getDhcpColor(1),"1 Second old");
+	setLegend(3,getDhcpColor(300),"300 Seconds old");
+	setLegend(4,getDhcpColor(900),"900 Seconds old");
+	setLegend(5,getDhcpColor(1200),"1200 Seconds old");
+}
+
 /*
  * Testing-function to randomize colors of linknets and switches
  */
@@ -362,3 +442,50 @@ function discoInit()
 	setLegend(5,"white","!");
 }
 
+function snmpUpdater() {
+	for (var sw in nmsData.switches.switches) {
+		if (nmsData.snmp.snmp[sw] == undefined || nmsData.snmp.snmp[sw].misc == undefined) {
+			nmsMap.setSwitchColor(sw, red);
+		} else if (nmsData.snmp.snmp[sw].misc.sysName[0] != sw) {
+			nmsMap.setSwitchColor(sw, orange);
+		} else {
+			nmsMap.setSwitchColor(sw, green);
+		}
+	}
+}
+function snmpInit() {
+	nmsData.addHandler("snmp", "mapHandler", snmpUpdater);
+	
+	setLegend(1,green,"OK");	
+	setLegend(2,orange, "Sysname mismatch");
+	setLegend(3,red,"No SNMP data");
+	setLegend(4,green, "");
+	setLegend(5,green,"");
+
+}
+function cpuUpdater() {
+	for (var sw in nmsData.switches.switches) {
+		try {
+			var cpu = 0;
+			for (var u in nmsData.snmp.snmp[sw].misc.jnxOperatingCPU) {
+				var local = nmsData.snmp.snmp[sw].misc['jnxOperatingCPU'][u];
+				cpu = Math.max(nmsData.snmp.snmp[sw].misc.jnxOperatingCPU[u],cpu);
+			}
+			nmsMap.setSwitchColor(sw, getColorStop(cpu * 10));
+			nmsMap.setSwitchInfo(sw, cpu + " % ");
+		} catch (e) {
+			nmsMap.setSwitchColor(sw, "white");
+			nmsMap.setSwitchInfo(sw, "N/A");
+		}
+	}
+}
+
+function cpuInit() {
+	nmsData.addHandler("snmp", "mapHandler", cpuUpdater);
+	drawGradient([green,orange,red]);
+	setLegend(1,getColorStop(0),"0 %");
+	setLegend(2,getColorStop(250),"25 %");
+	setLegend(3,getColorStop(600),"60 %");
+	setLegend(4,getColorStop(1000),"100 %");
+	setLegend(5,"white","N/A");
+}