mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add mac accounting improvements and fixes to graph display page

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@471 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2009-09-22 12:02:54 +00:00
parent 128a26a4f1
commit 661d0935a3
9 changed files with 134 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
html/includes/graphs/collectd_cpu.inc.php Normal file
View File

@@ -0,0 +1,10 @@
<?php
$cpu = only_alphanumeric($_GET['cpu']);
$dir = $config['collectd_dir'] . "/" . $hostname ."/cpu-" . $cpu;
$graph = graph_collectd_cpu ($dir, $graphfile, $from, $to, $width, $height, $title, $vertical);
?>

65
html/includes/graphs/mac_acc_total.inc.php Normal file
View File

@@ -0,0 +1,65 @@
<?php
function graph_mac_acc_total ($interface, $graph, $from, $to, $width, $height, $title, $vertical) {
global $config, $installdir;
list($interface, $type) = explode("-", $interface);
$imgfile = $config['install_dir'] . "/graphs/" . "$graph";
$options = "--alt-autoscale-max -E --start $from --end " . ($to - 150) . " --width $width --height $height ";
$options .= $config['rrdgraph_def_text'];
if($height < "99") { $options .= " --only-graph "; }
$hostname = gethostbyid($device);
$sql = "SELECT *, (bps_in + bps_out) AS bps FROM `mac_accounting` AS M, `interfaces` AS I, `devices` AS D WHERE M.interface_id = '$interface'
AND I.interface_id = M.interface_id AND I.device_id = D.device_id ORDER BY bps DESC LIMIT 0,10";
$query = mysql_query($sql);
if($width <= "300") { $options .= "--font LEGEND:7:".$config['mono_font']." --font AXIS:6:".$config['mono_font']." --font-render-mode normal "; }
$pluses = ""; $iter = '0';
$options .= " COMMENT:' In Out\\\\n'";
while($acc = mysql_fetch_array($query)) {
if($type == "pkts") {
$this_rrd = $config['rrd_dir'] . "/" . $acc['hostname'] . "/mac-accounting/" . $acc['ifIndex'] . "-" . $acc['mac'] . "-pkts.rrd";
$units='pps';
} else {
$this_rrd = $config['rrd_dir'] . "/" . $acc['hostname'] . "/mac-accounting/" . $acc['ifIndex'] . "-" . $acc['mac'] . ".rrd";
$units='bps';
}
if(is_file($this_rrd)) {
$name = $acc['mac'];
$addy = mysql_fetch_array(mysql_query("SELECT * FROM ipv4_mac where mac_address = '".$acc['mac']."'"));
if($addy) {
$name = @gethostbyaddr($addy['ipv4_address']);
}
$this_id = str_replace(".", "", $acc['mac']);
if(!$config['graph_colours'][$iter]) { $iter = 0; }
$colour=$config['graph_colours'][$iter];
$descr = str_pad($name, 36);
$descr = substr($descr,0,36);
$options .= " DEF:in".$this_id."=$this_rrd:IN:AVERAGE ";
$options .= " DEF:out".$this_id."temp=$this_rrd:OUT:AVERAGE ";
$options .= " CDEF:inB".$this_id."=in".$this_id.",8,* ";
$options .= " CDEF:outB".$this_id."temp=out".$this_id."temp,8,*";
$options .= " CDEF:outB".$this_id."=outB".$this_id."temp,-1,*";
$options .= " CDEF:octets".$this_id."=inB".$this_id.",outB".$this_id."temp,+";
$options .= " VDEF:totin".$this_id."=inB".$this_id.",TOTAL";
$options .= " VDEF:totout".$this_id."=outB".$this_id."temp,TOTAL";
$options .= " VDEF:tot".$this_id."=octets".$this_id.",TOTAL";
$options .= " AREA:inB".$this_id."#" . $colour . ":'" . $descr . "':STACK";
if($optionsb) {$stack="STACK";}
$optionsb .= " AREA:outB".$this_id."#" . $colour . "::$stack";
$options .= " GPRINT:inB".$this_id.":LAST:%6.2lf%s$units";
$options .= " GPRINT:totin".$this_id.":\(%6.2lf%sB\)";
$options .= " GPRINT:outB".$this_id."temp:LAST:%6.2lf%s$units";
$options .= " GPRINT:totout".$this_id.":\(%6.2lf%sB\)\\\\n";
$iter++;
}
}
$options .= $optionsb;
$thing = shell_exec($config['rrdtool'] . " graph $imgfile $options");
return $imgfile;
}
$port = $_GET['if'];
$graph = graph_mac_acc_total ($port, $graphfile, $from, $to, $width, $height, $title, $vertical);
?>

2
html/includes/print-interface.inc
View File

@@ -176,7 +176,7 @@ echo("</td>");
echo("</td></tr>");
// If we're showing graphs, generate the graph and print the img tags
if($graph_type && is_file($config['rrd_dir'] . "/" . $hostname . "/". $interface['ifIndex'] . ".rrd")) {
if($graph_type && is_file($config['rrd_dir'] . "/" . $device['hostname'] . "/". $interface['ifIndex'] . ".rrd")) {
$type = $graph_type;