aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--extras/misc/varnish.vcl4
-rw-r--r--web/js/nms-color-util.js9
-rw-r--r--web/js/nms-map-handlers.js87
3 files changed, 85 insertions, 15 deletions
diff --git a/extras/misc/varnish.vcl b/extras/misc/varnish.vcl
index addef0d..492f001 100644
--- a/extras/misc/varnish.vcl
+++ b/extras/misc/varnish.vcl
@@ -52,4 +52,8 @@ sub vcl_backend_response {
set beresp.uncacheable = false;
set beresp.ttl = 5s;
}
+ if (bereq.url ~ "\.(html|css|js)") {
+ # Mainly for ease of development
+ set beresp.ttl = 10s;
+ }
}
diff --git a/web/js/nms-color-util.js b/web/js/nms-color-util.js
index ec7f619..0f50126 100644
--- a/web/js/nms-color-util.js
+++ b/web/js/nms-color-util.js
@@ -69,6 +69,8 @@ nmsColor.drawGradient = function(gradients) {
*/
nmsColor.getColorStop = function(x) {
x = parseInt(x);
+ if (isNaN(x))
+ x = 0;
if (x > 999)
x = 999;
if (x < 0)
@@ -84,7 +86,12 @@ nmsColor._getColor = function(x,y) {
if (nmsColor._cache[x] != undefined)
return nmsColor._cache[x];
var ctx = nmsMap._c.hidden.ctx; // FIXME: Move it away...
- var imageData = ctx.getImageData(x, y, 1, 1);
+ try {
+ var imageData = ctx.getImageData(x, y, 1, 1);
+ } catch(e) {
+ console.log("x: " + x);
+ console.log(e);
+ }
var data = imageData.data;
if (data.length < 4)
return false;
diff --git a/web/js/nms-map-handlers.js b/web/js/nms-map-handlers.js
index 33c8ad8..38407d1 100644
--- a/web/js/nms-map-handlers.js
+++ b/web/js/nms-map-handlers.js
@@ -21,6 +21,7 @@ var handler_uplinks = {
var handler_temp = {
init:tempInit,
+ getInfo:tempInfo,
tag:"temp",
name:"Temperature"
};
@@ -46,6 +47,7 @@ var handler_traffic_tot = {
var handler_dhcp = {
init:dhcpInit,
+ getInfo:dhcpInfo,
tag:"dhcp",
name:"DHCP"
};
@@ -294,6 +296,29 @@ function tempUpdater()
}
}
+function tempInfo(sw)
+{
+ var ret = new handlerInfo("temp","Temperature");
+ ret.why = "Temp";
+ ret.score = 0;
+ ret.data[0].value = "N/A";
+ if (testTree(nmsData,['switchstate','switches',sw,'temp'])) {
+ let temp = nmsData.switchstate.switches[sw].temp;
+ if (temp == undefined) {
+ ret.data[0].value = "N/A";
+ } else {
+ temp = parseInt(temp);
+ ret.data[0].value = temp + "°C";
+ }
+ if (temp > 30 && temp < 50) {
+ ret.score = temp;
+ } else if (temp > 50 && temp < 100) {
+ ret.score = temp * 5;
+ ret.why = "Very high temperature";
+ }
+ }
+ return ret;
+}
function tempInit()
{
//Padded the gradient with extra colors for the upper unused values
@@ -325,12 +350,13 @@ function pingInfo(sw)
{
var ret = new handlerInfo("ping","Latency(ms)");
ret.why = "Latency";
+ ret.score = 999;
if (testTree(nmsData,['ping','switches',sw])) {
var v4 = nmsData.ping.switches[sw].latency4;
var v6 = nmsData.ping.switches[sw].latency6;
- if (v4 == undefined)
+ if (v4 == undefined || v4 == null || isNaN(v4))
v4 = undefined;
- if (v6 == undefined)
+ if (v6 == undefined || v6 == null || isNaN(v6))
v6 = undefined;
ret.data[0].value = v4;
ret.data[0].description = "IPv4 latency(ms)";
@@ -341,10 +367,10 @@ function pingInfo(sw)
ret.score = 1000;
ret.why = "No IPv4 or IPv6 ping reply";
} else if(v6 == undefined) {
- ret.score = 200;
+ ret.score = 100;
ret.why = "No IPv6 ping reply";
} else if (v4 == undefined) {
- ret.score = 199;
+ ret.score = 99;
ret.why = "No IPv4 ping reply";
}
@@ -408,6 +434,36 @@ function dhcpUpdater()
nmsMap.setSwitchColor(sw, c);
}
}
+function dhcpInfo(sw) {
+ var ret = new handlerInfo("dhcp","DHCP state");
+ ret.why = "No DHCP data";
+ ret.data[0].description = "DHCP age (seconds)";
+ if (testTree(nmsData,['dhcp','dhcp',sw])) {
+ var now = nmsData.dhcp.time;
+ var then = nmsData.dhcp.dhcp[sw];
+ var diff = now - then;
+ ret.data[0].value = diff;
+ ret.why = "DHCP freshness";
+ ret.score = diff/2> 800 ? 800 : parseInt(diff/2);
+ } 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";
+ ret.score = 0;
+ ret.why = "No subnet registered";
+ } else {
+ ret.score = 800;
+ ret.why = "No DHCP data";
+ }
+ } else {
+ ret.score = 100;
+ ret.why = "No management data for DHCP";
+ }
+ }
+ return ret;
+}
function dhcpInit()
{
@@ -481,10 +537,10 @@ function secondsToTime(input) {
function snmpInfo(sw) {
var ret = new handlerInfo("snmp","SNMP data");
- ret.why = "No data";
+ ret.why = "No SNMP data";
if (!testTree(nmsData,['snmp','snmp',sw,'misc'])) {
- ret.score = 800;
- ret.why = "No data";
+ ret.score = 500;
+ ret.why = "No SNMP data";
ret.data[0].value = "No data";
} else if (nmsData.snmp.snmp[sw].misc.sysName[0] != sw) {
ret.score = 200;
@@ -493,7 +549,7 @@ function snmpInfo(sw) {
ret.data[1] = { description: "SNMP sysName", value: nmsData.snmp.snmp[sw].misc.sysName[0] };
} else {
ret.score = 0;
- ret.data[0].value = "SNMP freshly updated";
+ ret.data[0].value = "Available";
ret.why = "SNMP all good";
}
if (testTree(nmsData,['snmp','snmp',sw,'misc','sysUpTimeInstance',''])) {
@@ -501,11 +557,11 @@ function snmpInfo(sw) {
var upstring = secondsToTime(uptime);
ret.data.push({value: upstring, description: "System uptime"});
if (uptime < 60*5 && ret.score < 500) {
- ret.score = 500;
+ ret.score = 550;
ret.why = "System rebooted last 5 minutes";
}
if (uptime < 60*15 && ret.score < 250) {
- ret.score = 250;
+ ret.score = 350;
ret.why = "System rebooted last 15 minutes";
}
}
@@ -565,10 +621,10 @@ function mgmtInfo(sw) {
ret.score = 1000;
} else if (mg.mgmt_v4_addr == undefined || mg.mgmt_v4_addr == "") {
ret.why = "No IPv4 management IP";
- ret.score = 240;
+ ret.score = 140;
} else if (mg.mgmt_v6_addr == undefined || mg.mgmt_v6_addr == "") {
ret.why = "No IPv6 management IP";
- ret.score = 239;
+ ret.score = 139;
}
} else {
ret.score = 1000;
@@ -618,13 +674,16 @@ function healthUpdater() {
for (var sw in nmsData.switches.switches) {
var worst = healthInfo(sw);
nmsMap.setSwitchColor(sw, nmsColor.getColorStop(worst.score));
- nmsMap.setSwitchInfo(sw, worst.tag);
+ if (worst.score > 200)
+ nmsMap.setSwitchInfo(sw, worst.tag);
+ else
+ nmsMap.setSwitchInfo(sw, undefined);
}
}
function healthInit() {
nmsData.addHandler("ping", "mapHandler", healthUpdater);
- nmsColor.drawGradient([nmsColor.green,nmsColor.orange,nmsColor.red]);
+ nmsColor.drawGradient([nmsColor.green,nmsColor.lightgreen, nmsColor.orange,nmsColor.red]);
setLegend(1,nmsColor.getColorStop(0),"All good");
setLegend(2,nmsColor.getColorStop(250),"Ok-ish");
setLegend(3,nmsColor.getColorStop(600),"Ick-ish");
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-20 04:51:00 +0000