diff options
| -rwxr-xr-x | collectors/ping.pl | 2 | ||||
| -rwxr-xr-x | include/config.pm | 1 | ||||
| -rwxr-xr-x | web/api/public/switch-state | 2 | ||||
| -rw-r--r-- | web/js/nms-map-handlers.js | 10 |
4 files changed, 8 insertions, 7 deletions
diff --git a/collectors/ping.pl b/collectors/ping.pl index d5acded..b5b1eb4 100755 --- a/collectors/ping.pl +++ b/collectors/ping.pl @@ -58,8 +58,8 @@ while (1) { } my $result = $ping->ping(); - my %dropped = %{$ping->get_dropped()}; die $ping->get_error if (!defined($result)); + my %dropped = %{$ping->get_dropped()}; $dbh->do('COPY ping (switch, latency_ms) FROM STDIN'); # date is implicitly now. my $drops = 0; diff --git a/include/config.pm b/include/config.pm index 8b4a10d..4d20e43 100755 --- a/include/config.pm +++ b/include/config.pm @@ -35,6 +35,7 @@ our @snmp_objects = [ ['ifInUnknownProtos'], ['ifOutQLen'], ['sysUpTime'], + ['ciscoEnvMonTemperatureStatusValue'], ['jnxOperatingTemp'], ['jnxOperatingCPU'], ['jnxOperatingDescr'], diff --git a/web/api/public/switch-state b/web/api/public/switch-state index eaa8be3..b7cd70c 100755 --- a/web/api/public/switch-state +++ b/web/api/public/switch-state @@ -45,7 +45,7 @@ while ( my $ref = $q->fetchrow_hashref() ) { } $json{'switches'}{$sysname}{totals}{'total'} += 1; } - $json{'switches'}{$sysname}{'temp'} = $data{'misc'}{'jnxOperatingTemp'}{'7.1.0.0'}; + $json{'switches'}{$sysname}{'temp'} = $data{'misc'}{'jnxOperatingTemp'}{'7.1.0.0'} || $data{'misc'}{'ciscoEnvMonTemperatureStatusValue'}{'1011'}; $json{'switches'}{$sysname}{'time'} = $ref->{'time'}; } diff --git a/web/js/nms-map-handlers.js b/web/js/nms-map-handlers.js index 21ed709..d8c870b 100644 --- a/web/js/nms-map-handlers.js +++ b/web/js/nms-map-handlers.js @@ -350,8 +350,8 @@ function pingUpdater() function pingInfo(sw) { var ret = new handlerInfo("ping","Latency(ms)"); - ret.why = "Latency"; - ret.score = 999; + ret.why = "Latency (?)"; + ret.score =0; if (testTree(nmsData,['ping','switches',sw])) { var v4 = nmsData.ping.switches[sw].latency4; var v6 = nmsData.ping.switches[sw].latency6; @@ -375,8 +375,8 @@ function pingInfo(sw) ret.why = "No IPv4 ping reply"; } - v4 = parseFloat(v4) * 10; - v6 = parseFloat(v6) * 10; + v4 = parseFloat(v4) ; + v6 = parseFloat(v6) ; if (v4 > ret.score || v6 > ret.score) { ret.why = "Latency"; ret.score = parseInt(v4 > v6 ? v4 : v6); @@ -544,7 +544,7 @@ function snmpInfo(sw) { ret.score = 500; ret.why = "No SNMP data"; ret.data[0].value = "No data"; - } else if (nmsData.snmp.snmp[sw].misc.sysName[0] != sw) { + } else if (nmsData.snmp.snmp[sw].misc.sysName[0].indexOf(sw) != 0) { ret.score = 200; ret.why = "SNMP sysName doesn't match Gondul sysname"; ret.data[0].value = ret.why; |