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

improve mac accounting (why was it in port? am i mental?)

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2201 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-04-29 16:49:37 +00:00
parent 28558969c4
commit 7b13ceef8f
5 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
html/includes/graphs/macaccounting/auth.inc.php Normal file
View File

@@ -0,0 +1,26 @@
<?php
if (is_numeric($id))
{
$query = mysql_query("SELECT * FROM `mac_accounting` AS M, `ports` AS I, `devices` AS D WHERE M.ma_id = '".mres($_GET['id'])."'
AND I.interface_id = M.interface_id AND I.device_id = D.device_id");
$acc = mysql_fetch_assoc($query);
if (($config['allow_unauth_graphs'] || port_permitted($acc['interface_id']))
&& is_file($config['rrd_dir'] . "/" . $acc['hostname'] . "/" . safename("cip-" . $acc['ifIndex'] . "-" . $acc['mac'] . ".rrd")))
{
$rrd_filename = $config['rrd_dir'] . "/" . $acc['hostname'] . "/" . safename("cip-" . $acc['ifIndex'] . "-" . $acc['mac'] . ".rrd");
$port = get_port_by_id($acc['interface_id']);
$device = device_by_id_cache($port['device_id']);
$title = generate_device_link($device);
$title .= " :: Port ".generate_port_link($port);
$title .= " :: " . $acc['mac'];
$auth = TRUE;
}
}
?>

11
html/includes/graphs/macaccounting/bits.inc.php
View File

@@ -1,17 +1,8 @@
<?php
$query = mysql_query("SELECT * FROM `mac_accounting` AS M, `ports` AS I, `devices` AS D WHERE M.ma_id = '".mres($_GET['id'])."'
AND I.interface_id = M.interface_id AND I.device_id = D.device_id");
$acc = mysql_fetch_assoc($query);
if (is_file($config['rrd_dir'] . "/" . $acc['hostname'] . "/" . safename("cip-" . $acc['ifIndex'] . "-" . $acc['mac'] . ".rrd")))
{
$rrd_filename = $config['rrd_dir'] . "/" . $acc['hostname'] . "/". safename("cip-" . $acc['ifIndex'] . "-" . $acc['mac'] . ".rrd");
}
$rra_in = "IN";
$rra_out = "OUT";
include("includes/graphs/generic_bits.inc.php");
?>
?>

11
html/includes/graphs/macaccounting/pkts.inc.php
View File

@@ -1,14 +1,5 @@
<?php
$query = mysql_query("SELECT * FROM `mac_accounting` AS M, `ports` AS I, `devices` AS D WHERE M.ma_id = '".mres($_GET['id'])."'
AND I.interface_id = M.interface_id AND I.device_id = D.device_id");
$acc = mysql_fetch_assoc($query);
if (is_file($config['rrd_dir'] . "/" . $acc['hostname'] . "/" . safename("cip-" . $acc['ifIndex'] . "-" . $acc['mac'] . ".rrd")))
{
$rrd_filename = $config['rrd_dir'] . "/" . $acc['hostname'] . "/" . safename("cip-" . $acc['ifIndex'] . "-" . $acc['mac'] . ".rrd");
}
$rra_in = "PIN";
$rra_out = "POUT";
@@ -25,4 +16,4 @@ $unit_text = "Pkts\ \ \ ";
include("includes/graphs/generic_duplex.inc.php");
?>
?>