3 files changed, 28 insertions, 2 deletions
diff --git a/web/js/nms-dhcp.js b/web/js/nms-dhcp.js
new file mode 100644
index 0000000..b852a45
--- /dev/null
+++ b/web/js/nms-dhcp.js
@@ -0,0 +1,17 @@
+"use strict";
+
+var nmsDhcp = nmsDhcp || {
+
+}
+
+nmsDhcp.init = function() {
+	nmsData.addHandler("dhcpsummary", "nmsDhcpHandler", nmsDhcp.updateSummary);
+}
+
+nmsDhcp.updateSummary = function() {
+	var e = document.getElementById("dhcp-summary");
+	if (e == undefined) {
+		return;
+	}
+	e.innerHTML = nmsData.dhcpsummary.dhcp.clients + " clients";
+}
diff --git a/web/js/nms-map-handlers.js b/web/js/nms-map-handlers.js
index d8c870b..42044d9 100644
--- a/web/js/nms-map-handlers.js
+++ b/web/js/nms-map-handlers.js
@@ -444,7 +444,7 @@ function dhcpInfo(sw) {
 		var diff = now - then;
 		ret.data[0].value = diff;
 		ret.why = "DHCP freshness";
-		ret.score = diff/2> 800 ? 800 : parseInt(diff/2);
+		ret.score = diff/2> 600 ? 600 : parseInt(diff/2);
 	} else {
 		ret.data[0].value = "No DHCP data";
 		if (testTree(nmsData,['smanagement','switches',sw])) {
@@ -454,7 +454,7 @@ function dhcpInfo(sw) {
 				ret.score = 0;
 				ret.why = "No subnet registered";
 			} else {
-				ret.score = 800;
+				ret.score = 600;
 				ret.why = "No DHCP data";
 			}
 		} else {
@@ -544,6 +544,14 @@ function snmpInfo(sw) {
 		ret.score = 500;
 		ret.why = "No SNMP data";
 		ret.data[0].value = "No data";
+		if (testTree(nmsData,['smanagement','switches',sw])) {
+			if (nmsData.smanagement.switches[sw].community  == undefined ||
+			    nmsData.smanagement.switches[sw].community  == "disable") {
+				ret.score = 0;
+				ret.why = "SNMP disabled";
+				ret.data[0].value = "SNMP disabled";
+			}
+		}
 	} else if (nmsData.snmp.snmp[sw].misc.sysName[0].indexOf(sw) != 0) {
 		ret.score = 200;
 		ret.why = "SNMP sysName doesn't match Gondul sysname";
diff --git a/web/js/nms.js b/web/js/nms.js
index 9727c09..dc9ba96 100644
--- a/web/js/nms.js
+++ b/web/js/nms.js
@@ -398,6 +398,7 @@ function initNMS() {
 	detectHandler();
 	setupKeyhandler();
 	nmsSearch.init();
+	nmsDhcp.init();
 }
 
 function detectHandler() {