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 ability to pass error message to graph, and use this for mac accounting

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2353 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-05-20 16:05:29 +00:00
parent 096f551f6f
commit e7eac601b9
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
html/includes/graphs/graph.inc.php
View File

@@ -91,14 +91,19 @@ function graph_error($string)
exit();
}
if (!$auth)
{
if ($error_msg) {
graph_error($graph_error);
} elseif (!$auth) {
if ($width < 200)
{
graph_error("No Auth");
} else {
graph_error("No Authorisation");
}
} else {
#$rrd_options .= " HRULE:0#999999";
if ($no_file)

20
html/includes/graphs/macaccounting/auth.inc.php
View File

@@ -6,16 +6,20 @@ if (is_numeric($id))
$acc = dbFetchRow("SELECT * FROM `mac_accounting` AS M, `ports` AS I, `devices` AS D WHERE M.ma_id = ? AND I.interface_id = M.interface_id AND I.device_id = D.device_id", array($id));
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");
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");
$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 .= " :: " . formatMac($acc['mac']);
$auth = TRUE;
$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 .= " :: " . formatMac($acc['mac']);
$auth = TRUE;
}
} else {
$graph_error = "file not found";
}
}
?>