ignore adsl stats out of sanity (3.2KdB SNR? GET FUCKED CISCO.) Clean up legend for generic_multi_line. Add CISCO-VPDN-MGMT MIBs

git-svn-id: http://www.observium.org/svn/observer/trunk@2694 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-10-21 10:54:06 +00:00
parent 12824ab8ac
commit 634e944987
6 changed files with 3356 additions and 12 deletions
+10 -7
View File
@@ -48,14 +48,14 @@ if (isset($port_stats[$port['ifIndex']]['adslLineCoding']))
$rrdfile = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("port-".$port['ifIndex']."-adsl.rrd");
$rrd_create = " --step 300";
$rrd_create .= " DS:AtucCurrSnrMgn:GAUGE:600:0:U";
$rrd_create .= " DS:AtucCurrAtn:GAUGE:600:0:U";
$rrd_create .= " DS:AtucCurrOutputPwr:GAUGE:600:0:U";
$rrd_create .= " DS:AtucCurrSnrMgn:GAUGE:600:0:635";
$rrd_create .= " DS:AtucCurrAtn:GAUGE:600:0:635";
$rrd_create .= " DS:AtucCurrOutputPwr:GAUGE:600:0:635";
$rrd_create .= " DS:AtucCurrAttainableR:GAUGE:600:0:U";
$rrd_create .= " DS:AtucChanCurrTxRate:GAUGE:600:0:U";
$rrd_create .= " DS:AturCurrSnrMgn:GAUGE:600:0:U";
$rrd_create .= " DS:AturCurrAtn:GAUGE:600:0:U";
$rrd_create .= " DS:AturCurrOutputPwr:GAUGE:600:0:U";
$rrd_create .= " DS:AturCurrSnrMgn:GAUGE:600:0:635";
$rrd_create .= " DS:AturCurrAtn:GAUGE:600:0:635";
$rrd_create .= " DS:AturCurrOutputPwr:GAUGE:600:0:635";
$rrd_create .= " DS:AturCurrAttainableR:GAUGE:600:0:U";
$rrd_create .= " DS:AturChanCurrTxRate:GAUGE:600:0:U";
$rrd_create .= " DS:AtucPerfLofs:COUNTER:600:U:100000000000";
@@ -101,13 +101,16 @@ if (isset($port_stats[$port['ifIndex']]['adslLineCoding']))
}
dbUpdate($port['adsl_update'], 'ports_adsl', '`interface_id` = ?', array($port['interface_id']));
if($this_port['adslAtucCurrSnrMgn'] > "1280") { $this_port['adslAtucCurrSnrMgn'] = "U"; }
if($this_port['adslAturCurrSnrMgn'] > "1280") { $this_port['adslAturCurrSnrMgn'] = "U"; }
$rrdupdate = "N";
foreach ($adsl_oids as $oid)
{
$oid = "adsl".$oid;
$data = str_replace("\"", "", $this_port[$oid]);
## Set data to be "unknown" if it's garbled, unexistant or zero
if (!is_numeric($data)) { $data = "0"; }
if (!is_numeric($data)) { $data = "U"; }
$rrdupdate .= ":$data";
}