1 files changed, 135 insertions, 65 deletions

diff --git a/web/nms.gathering.org/nms2/js/nms-map-handlers.js b/web/nms.gathering.org/nms2/js/nms-map-handlers.js
index 762788a..9b2d44c 100644
--- a/web/nms.gathering.org/nms2/js/nms-map-handlers.js
+++ b/web/nms.gathering.org/nms2/js/nms-map-handlers.js
@@ -21,38 +21,62 @@
 var handler_uplinks = {
 	updater:uplinkUpdater,
 	init:uplinkInit,
+	tag:"uplink",
 	name:"Uplink map"
 };
 
 var handler_temp = {
 	updater:tempUpdater,
 	init:tempInit,
+	tag:"temp",
 	name:"Temperature map"
 };
 
 var handler_ping = {
 	updater:pingUpdater,
 	init:pingInit,
+	tag:"ping",
 	name:"IPv4 Ping map"
 };
 
 var handler_traffic = {
 	updater:trafficUpdater,
 	init:trafficInit,
+	tag:"traffic",
 	name:"Uplink traffic map"
 };
 
+var handler_traffic_tot = {
+	updater:trafficTotUpdater,
+	init:trafficTotInit,
+	tag:"traffictot",
+	name:"Switch traffic map"
+};
+
 var handler_disco = {
 	updater:randomizeColors,
 	init:discoInit,
+	tag:"disco",
 	name:"Disco fever"
 };
 
 var handler_comment = {
 	updater:commentUpdater,
 	init:commentInit,
+	tag:"comment",
 	name:"Fresh comment spotter"
 };
+
+var handlers = [
+	handler_uplinks,
+	handler_temp,
+	handler_ping,
+	handler_traffic,
+	handler_disco,
+	handler_comment,
+	handler_traffic_tot
+	];
+
 /*
  * Update function for uplink map
  * Run periodically when uplink map is active.
@@ -78,15 +102,15 @@ function uplinkUpdater()
 			 }
 		}
 		if (uplinks == 0) {
-			setSwitchColor(sw,"blue");
+			setSwitchColor(sw,"white");
 		} else if (uplinks == 1) {
-			setSwitchColor(sw,"red");
+			setSwitchColor(sw,red);
 		} else if (uplinks == 2) {
-			setSwitchColor(sw, "yellow");
+			setSwitchColor(sw, orange);
 		} else if (uplinks == 3) { 
-			setSwitchColor(sw, "green");
+			setSwitchColor(sw, green);
 		} else if (uplinks > 3) {
-			setSwitchColor(sw, "white");
+			setSwitchColor(sw, blue);
 		}
 	}
 }
@@ -94,13 +118,27 @@ function uplinkUpdater()
 /*
  * Init-function for uplink map
  */
+function uplinkInit()
+{
+	setLegend(1,"white","0 uplinks");	
+	setLegend(2,red,"1 uplink");	
+	setLegend(3,orange,"2 uplinks");	
+	setLegend(4,green,"3 uplinks");	
+	setLegend(5,blue,"4 uplinks");	
+}
+
+/*
+ * Init-function for uplink map
+ */
 function trafficInit()
 {
-	setLegend(1,"blue","0 (N/A)");	
-	setLegend(5,"red", "1000Mb/s or more");	
-	setLegend(4,"yellow","100Mb/s to 800Mb/s");	
-	setLegend(3,"green", "5Mb/s to 100Mb/s");	
-	setLegend(2,"white","0 to 5Mb/s");	
+	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(2,colorFromSpeed(10 * m),"10Mb/s");	
 }
 
 function trafficUpdater()
@@ -115,37 +153,62 @@ function trafficUpdater()
 			    /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"]));
 			 }
 		}
-		var m = 1024 * 1024 / 8;
-		if (speed == 0) {
-			setSwitchColor(sw,"blue");
-		} else if (speed > (1000 * m)) {
-			setSwitchColor(sw,"red");
-		} else if (speed > (800 * m)) {
-			setSwitchColor(sw, "yellow");
-		} else if (speed > (5 * m)) { 
-			setSwitchColor(sw, "green");
-		} else {
-			setSwitchColor(sw, "white");
-		}
+		setSwitchColor(sw,colorFromSpeed(speed));
 	}
 }
 
 /*
  * Init-function for uplink map
  */
-function uplinkInit()
+function trafficTotInit()
 {
-	setLegend(1,"blue","0 uplinks");	
-	setLegend(2,"red","1 uplink");	
-	setLegend(3,"yellow","2 uplinks");	
-	setLegend(4,"green","3 uplinks");	
-	setLegend(5,"white","4 uplinks");	
+	var m = 1024 * 1024 / 8;
+	drawGradient([lightgreen,green,orange,red]);
+	setLegend(1,colorFromSpeed(0),"0 (N/A)");	
+	setLegend(5,colorFromSpeed(5000 * m,5) , "5000Mb/s");	
+	setLegend(4,colorFromSpeed(3000 * m,5),"3000Mb/s");	
+	setLegend(3,colorFromSpeed(1000 * m,5),"1000Mb/s");	
+	setLegend(2,colorFromSpeed(100 * m,5),"100Mb/s");	
+}
+
+function trafficTotUpdater()
+{
+	if (!nms.switches_now["switches"])
+		return;
+	for (sw in nms.switches_now["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));
+	}
+}
+
+function colorFromSpeed(speed,factor)
+{
+	var m = 1024 * 1024 / 8;
+	if (factor == undefined)
+		factor = 2;
+	if (speed == 0)
+		return blue;
+	speed = speed < 0 ? 0 : speed;
+	return getColorStop( 1000 * (speed / (factor * (1000 * m))));
 }
 
 
@@ -158,11 +221,11 @@ function temp_color(t)
 {
 	if (t == undefined) {
 		console.log("Temp_color, but temp is undefined");
-		return "blue";
+		return blue;
 	}
-	t = parseInt(t) - 20;
-	t = Math.floor((t / 15) * 100);
-	return rgb_from_max(t);
+	t = parseInt(t) - 12;
+	t = Math.floor((t / 23) * 1000);
+	return getColorStop(t);
 }
 
 function tempUpdater()
@@ -179,23 +242,28 @@ function tempUpdater()
 
 function tempInit()
 {
-	setLegend(1,temp_color(20),"20 °C");	
-	setLegend(2,temp_color(22),"22 °C");	
-	setLegend(3,temp_color(27),"27 °C");	
-	setLegend(4,temp_color(31),"31 °C");	
+	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");	
 }
 
 function pingUpdater()
 {
+	if (!nms.ping_data || !nms.ping_data["switches"]) {
+		resetColors();
+		return;
+	}
 	for (var sw in nms.switches_now["switches"]) {
-		var c = "blue";
+		var c = blue;
 		if (nms.ping_data['switches'] && nms.ping_data['switches'][sw])
 			c = gradient_from_latency(nms.ping_data["switches"][sw]["latency"]);
 		setSwitchColor(sw, c);
 	}
 	for (var ln in nms.switches_now["linknets"]) {
-		var c1 = "blue";
+		var c1 = blue;
 		var c2 = c1;
 		if (nms.ping_data['linknets'] && nms.ping_data['linknets'][ln]) {
 			c1 = gradient_from_latency(nms.ping_data["linknets"][ln][0]);
@@ -207,56 +275,58 @@ function pingUpdater()
 
 function pingInit()
 {
+	drawGradient([green,lightgreen,orange,red]);
 	setLegend(1,gradient_from_latency(1),"1ms");	
 	setLegend(2,gradient_from_latency(30),"30ms");	
 	setLegend(3,gradient_from_latency(60),"60ms");	
-	setLegend(4,gradient_from_latency(80),"80ms");	
-	setLegend(5,"#0000ff" ,"No response");	
+	setLegend(4,gradient_from_latency(100),"100ms");	
+	setLegend(5,gradient_from_latency(undefined) ,"No response");	
 }
 
 function commentUpdater()
 {
 	var realnow = Date.now();
-	if (nms.now) {
-		realnow = Date.parse(nms.now);
-	}
 	var now = Math.floor(realnow / 1000);
 	for (var sw in nms.switches_now["switches"]) {
-		var c = "green";
+		var c = "white";
 		var s = nms.switches_now["switches"][sw];
 		if (s["comments"] && s["comments"].length > 0) {
 			var then = 0;
+			var active = 0;
+			var persist = 0;
 			c = "yellow";
 			for (var v in s["comments"]) {
 				var then_test = parseInt(s["comments"][v]["time"]);
-				if (then_test > then && then_test <= now)
+				if (then_test > then && s["comments"][v]["state"] != "inactive")
 					then = then_test;
+				if (s["comments"][v]["state"] == "active") {
+					active++;
+				}
+				if (s["comments"][v]["state"] == "persist")
+					persist++;
 			}
 			if (then > (now - (60*15))) {
-				c = "red";
-			} else if (then > (now - (120*60))) {
-				c = "orange";
-			} else if (then < (now - (60*60*24))) {
-				c = "white";
+				c = red;
+			} else if (active > 0) {
+				c = orange;
+			} else if (persist > 0) {
+				c = blue;
+			} else {
+				c = green;
 			}
-			/*
-			 * Special case during time travel: We have
-			 * comments, but are not showing them yet.
-			 */
-			if (then == 0)
-				c = "green";
 		}
 		setSwitchColor(sw, c);
 	}
 }
 
+
 function commentInit()
 {
-	setLegend(1,"green","0 comments");
-	setLegend(2,"white","1d+ old");
-	setLegend(3,"red", "0 - 15m old");
-	setLegend(4,"orange","15m - 120m old");	
-	setLegend(5,"yellow" ,"2h - 24h old");	
+	setLegend(1,"white","0 comments");
+	setLegend(2,blue,"Persistent");
+	setLegend(3,red, "New");
+	setLegend(4,orange,"Active");	
+	setLegend(5,green ,"Old/inactive only");	
 }
 /*
  * Testing-function to randomize colors of linknets and switches
@@ -274,10 +344,10 @@ function randomizeColors()
 function discoInit()
 {
 	setNightMode(true);
-	setLegend(1,"blue","Y");	
-	setLegend(2,"red", "M");
-	setLegend(3,"yellow","C");
-	setLegend(4,"green", "A");
+	setLegend(1,blue,"Y");	
+	setLegend(2,red, "M");
+	setLegend(3,orange,"C");
+	setLegend(4,green, "A");
 	setLegend(5,"white","!");
 }