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

View File

@@ -15,11 +15,11 @@ $unit_text = str_pad(truncate($unit_text,$unitlen),$unitlen);
if($width > "500")
{
$rrd_options .= " COMMENT:'".substr(str_pad($unit_text, $descr_len+5),0,$descr_len+5)." Current Average Maximum '";
$rrd_options .= " COMMENT:'".substr(str_pad($unit_text, $descr_len+5),0,$descr_len+5)."Now Min Max Avg\l'";
if (!$nototal) { $rrd_options .= " COMMENT:'Total '"; }
$rrd_options .= " COMMENT:'\l'";
} else {
$rrd_options .= " COMMENT:'".substr(str_pad($unit_text, $descr_len+5),0,$descr_len+5)."Now Ave Max Avg\l'";
$rrd_options .= " COMMENT:'".substr(str_pad($unit_text, $descr_len+5),0,$descr_len+5)."Now Min Max Avg\l'";
}

View File

@@ -16,7 +16,7 @@ $units='';
$total_units='';
$colours='mixed';
$scale_min = "0";
$scale_min = "0";
$nototal = 1;
@@ -25,4 +25,4 @@ if ($rrd_list)
include("includes/graphs/generic_multi_line.inc.php");
}
?>
?>

View File

@@ -5,7 +5,7 @@
echo("<tr><th>Port</th><th>Traffic</th><th>Sync Speed</th><th>Attainable Speed</th><th>Attenuation</th><th>SNR Margin</th><th>Output Powers</th></tr>");
$i = "0";
$ports = dbFetchRows("select * from `ports` AS P, `ports_adsl` AS A WHERE P.device_id = ? AND A.interface_id = P.interface_id AND P.deleted = '0' ORDER BY `ifIndex` ASC", array($device['device_id']));
foreach ($ports as $interface)
foreach ($ports as $port)
{
include("includes/print-interface-adsl.inc.php");
$i++;