diff options
| -rwxr-xr-x | collectors/ping.pl | 6 | ||||
| -rw-r--r-- | web/index.html | 2 | ||||
| -rw-r--r-- | web/js/nms-dhcp.js | 17 | ||||
| -rw-r--r-- | web/js/nms-map-handlers.js | 12 | ||||
| -rw-r--r-- | web/js/nms.js | 1 |
5 files changed, 33 insertions, 5 deletions
diff --git a/collectors/ping.pl b/collectors/ping.pl index b5b1eb4..ff4efce 100755 --- a/collectors/ping.pl +++ b/collectors/ping.pl @@ -19,7 +19,7 @@ my $q = $dbh->prepare("SELECT switch,host(mgmt_v4_addr) as ip,host(mgmt_v6_addr) my $lq = $dbh->prepare("SELECT linknet,addr1,addr2 FROM linknets WHERE addr1 is not null and addr2 is not null;"); my $last = time(); -my $target = 0.2; +my $target = 0.7; while (1) { my $now = time(); my $elapsed = ($now - $last); @@ -29,7 +29,7 @@ while (1) { $last = time(); # ping loopbacks my $ping = Net::Oping->new; - $ping->timeout(0.2); + $ping->timeout(0.4); $q->execute; my %ip_to_switch = (); @@ -93,7 +93,7 @@ while (1) { $dbh->commit; # ping linknets $ping = Net::Oping->new; - $ping->timeout(0.2); + $ping->timeout(0.4); $lq->execute; my @linknets = (); diff --git a/web/index.html b/web/index.html index 0dbabe8..14b60fc 100644 --- a/web/index.html +++ b/web/index.html @@ -89,6 +89,7 @@ </span> </div> </div> + <p class="navbar-text" id="dhcp-summary">(...)</p> </li> </ul> <div class="navbar-form navbar-right gondul-is-private"> @@ -300,6 +301,7 @@ <script type="text/javascript" src="js/nms-oplog.js"></script> <script type="text/javascript" src="js/nms-search.js"></script> <script type="text/javascript" src="js/nms-time.js"></script> + <script type="text/javascript" src="js/nms-dhcp.js"></script> <script src="js/jquery.datetimepicker.full.js" type="text/javascript"></script> <script type="text/javascript"> initNMS(); 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() { |