add ADSL graphs to web interface

git-svn-id: http://www.observium.org/svn/observer/trunk@1406 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-07-18 08:51:18 +00:00
parent fd40717a8c
commit 9503ecd473
7 changed files with 197 additions and 3 deletions
@@ -28,8 +28,8 @@
$rrd_options .= " DEF:".$id."min=$filename:$rra:MIN";
$rrd_options .= " DEF:".$id."max=$filename:$rra:MAX";
$rrd_options .= " LINE1.25:".$id."#".$colour.":'$descr'";
$rrd_options .= " GPRINT:".$id.":LAST:%6.2lf GPRINT:".$id."min:MIN:%6.2lf";
$rrd_options .= " GPRINT:".$id."max:MAX:%6.2lf GPRINT:".$id.":AVERAGE:%6.2lf\\\\n";
$rrd_options .= " GPRINT:".$id.":LAST:%5.2lf%s GPRINT:".$id."min:MIN:%5.2lf%s";
$rrd_options .= " GPRINT:".$id."max:MAX:%5.2lf%s GPRINT:".$id.":AVERAGE:%5.2lf%s\\\\n";
$i++; $iter++;
}
@@ -0,0 +1,38 @@
<?php
if($_GET['id']) { $interface = $_GET['id'];
} elseif($_GET['port']) { $interface = $_GET['port'];
} elseif($_GET['if']) { $interface = $_GET['if'];
} elseif($_GET['interface']) { $interface = $_GET['interface']; }
$query = mysql_query("SELECT * FROM `ports` AS I, `devices` AS D WHERE I.interface_id = '".$interface."'
AND I.device_id = D.device_id");
$port = mysql_fetch_array($query);
#if(is_file($config['rrd_dir'] . "/" . $port['hostname'] . "/" . safename($port['ifIndex'] . ".rrd"))) {
$rrd_filename = $config['rrd_dir'] . "/" . $port['hostname'] . "/port-" . safename($port['ifIndex'] . "-adsl.rrd");
#}
$rrd_list[0]['filename'] = $rrd_filename;
$rrd_list[0]['descr'] = "Downstream";
$rrd_list[0]['rra'] = "AturCurrAtn";
$rrd_list[1]['filename'] = $rrd_filename;
$rrd_list[1]['descr'] = "Upstream";
$rrd_list[1]['rra'] = "AtucCurrAtn";
$unit_text = "dB";
$units='';
$total_units='';
$colours='mixed';
$scale_min = "0";
$nototal = 1;
if ($rrd_list) {
include ("generic_multi_line.inc.php");
}
?>
@@ -0,0 +1,38 @@
<?php
if($_GET['id']) { $interface = $_GET['id'];
} elseif($_GET['port']) { $interface = $_GET['port'];
} elseif($_GET['if']) { $interface = $_GET['if'];
} elseif($_GET['interface']) { $interface = $_GET['interface']; }
$query = mysql_query("SELECT * FROM `ports` AS I, `devices` AS D WHERE I.interface_id = '".$interface."'
AND I.device_id = D.device_id");
$port = mysql_fetch_array($query);
#if(is_file($config['rrd_dir'] . "/" . $port['hostname'] . "/" . safename($port['ifIndex'] . ".rrd"))) {
$rrd_filename = $config['rrd_dir'] . "/" . $port['hostname'] . "/port-" . safename($port['ifIndex'] . "-adsl.rrd");
#}
$rrd_list[0]['filename'] = $rrd_filename;
$rrd_list[0]['descr'] = "Downstream";
$rrd_list[0]['rra'] = "AtucCurrOutputPwr";
$rrd_list[1]['filename'] = $rrd_filename;
$rrd_list[1]['descr'] = "Upstream";
$rrd_list[1]['rra'] = "AturCurrOutputPwr";
$unit_text = "dBm";
$units='';
$total_units='';
$colours='mixed';
$scale_min = "0";
$nototal = 1;
if ($rrd_list) {
include ("generic_multi_line.inc.php");
}
?>
@@ -0,0 +1,38 @@
<?php
if($_GET['id']) { $interface = $_GET['id'];
} elseif($_GET['port']) { $interface = $_GET['port'];
} elseif($_GET['if']) { $interface = $_GET['if'];
} elseif($_GET['interface']) { $interface = $_GET['interface']; }
$query = mysql_query("SELECT * FROM `ports` AS I, `devices` AS D WHERE I.interface_id = '".$interface."'
AND I.device_id = D.device_id");
$port = mysql_fetch_array($query);
#if(is_file($config['rrd_dir'] . "/" . $port['hostname'] . "/" . safename($port['ifIndex'] . ".rrd"))) {
$rrd_filename = $config['rrd_dir'] . "/" . $port['hostname'] . "/port-" . safename($port['ifIndex'] . "-adsl.rrd");
#}
$rrd_list[0]['filename'] = $rrd_filename;
$rrd_list[0]['descr'] = "Downstream";
$rrd_list[0]['rra'] = "AtucCurrSnrMgn";
$rrd_list[1]['filename'] = $rrd_filename;
$rrd_list[1]['descr'] = "Upstream";
$rrd_list[1]['rra'] = "AturCurrSnrMgn";
$unit_text = "dB";
$units='';
$total_units='';
$colours='mixed';
$scale_min = "0";
$nototal = 1;
if ($rrd_list) {
include ("generic_multi_line.inc.php");
}
?>
@@ -0,0 +1,40 @@
<?php
if($_GET['id']) { $interface = $_GET['id'];
} elseif($_GET['port']) { $interface = $_GET['port'];
} elseif($_GET['if']) { $interface = $_GET['if'];
} elseif($_GET['interface']) { $interface = $_GET['interface']; }
$query = mysql_query("SELECT * FROM `ports` AS I, `devices` AS D WHERE I.interface_id = '".$interface."'
AND I.device_id = D.device_id");
$port = mysql_fetch_array($query);
#if(is_file($config['rrd_dir'] . "/" . $port['hostname'] . "/" . safename($port['ifIndex'] . ".rrd"))) {
$rrd_filename = $config['rrd_dir'] . "/" . $port['hostname'] . "/port-" . safename($port['ifIndex'] . "-adsl.rrd");
#}
$rrd_list[0]['filename'] = $rrd_filename;
$rrd_list[0]['descr'] = "Downstream";
$rrd_list[0]['rra'] = "AtucChanCurrTxRate";
$rrd_list[1]['filename'] = $rrd_filename;
$rrd_list[1]['descr'] = "Upstream";
$rrd_list[1]['rra'] = "AturChanCurrTxRate";
$unit_text = "Bits/sec";
$units='';
$total_units='';
$colours='mixed';
$scale_min = "0";
$nototal = 1;
if ($rrd_list) {
include ("generic_multi_line.inc.php");
}
?>
+2 -1
View File
@@ -84,6 +84,7 @@ echo ("<a href='".$config['base_url']."/device/" . $device['device_id'] . "/inte
print_optionbar_end();
echo("<div style='margin: 5px;'>");
include("pages/device/port/".mres($_GET['optb']).".inc.php");
echo("</div>");
?>
+39
View File
@@ -0,0 +1,39 @@
<?php
if(file_exists($config['rrd_dir'] . "/" . $hostname . "/port-". $ifIndex . "-adsl.rrd")) {
$iid = $id;
echo("<div class=graphhead>ADSL Line Speed</div>");
$graph_type = "port_adsl_speed";
include("includes/print-interface-graphs.inc.php");
echo("<div class=graphhead>ADSL Line Attenuation</div>");
$graph_type = "port_adsl_attenuation";
include("includes/print-interface-graphs.inc.php");
echo("<div class=graphhead>ADSL Line SNR Margin</div>");
$graph_type = "port_adsl_snr";
include("includes/print-interface-graphs.inc.php");
echo("<div class=graphhead>ADSL Output Powers</div>");
$graph_type = "port_adsl_power";
include("includes/print-interface-graphs.inc.php");
}
# $graph_array['height'] = "100";
# $graph_array['width'] = "385";
# $graph_array['to'] = $now;
# $graph_array['port'] = $ports['fileserver'];
# $graph_array['type'] = "port_bits";
# $graph_array['from'] = $day;
# $graph_array['legend'] = "no";
# $graph_array['popup_title'] = "Central Fileserver";
# print_graph_popup($graph_array);
?>