fix customer and iftype graphs since port rrd filename changes

git-svn-id: http://www.observium.org/svn/observer/trunk@1673 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-08-12 19:15:19 +00:00
parent 3114f4558b
commit e68c74ea85
2 changed files with 3 additions and 3 deletions

View File

@@ -4,8 +4,8 @@
$query = mysql_query("SELECT * FROM `ports` AS I, `devices` AS D WHERE `port_descr_type` = 'cust' AND `port_descr_descr` = '".mres($_GET['id'])."' AND D.device_id = I.device_id");
while($int = mysql_fetch_array($query)) {
if(is_file($config['rrd_dir'] . "/" . $int['hostname'] . "/" . safename($int['ifIndex'] . ".rrd"))) {
$rrd_filenames[] = $config['rrd_dir'] . "/" . $int['hostname'] . "/" . safename($int['ifIndex'] . ".rrd");
if(is_file($config['rrd_dir'] . "/" . $int['hostname'] . "/port-" . safename($int['ifIndex'] . ".rrd"))) {
$rrd_filenames[] = $config['rrd_dir'] . "/" . $int['hostname'] . "/port-" . safename($int['ifIndex'] . ".rrd");
}
}

View File

@@ -54,7 +54,7 @@ echo("<table cellpadding=7 cellspacing=0 class=devicetable width=100%>");
echo("</td></tr><tr bgcolor='$bg'><td>");
if(file_exists($config['rrd_dir'] . "/" . $interface['hostname'] . "/" . $interface['ifIndex'] . ".rrd")) {
if(file_exists($config['rrd_dir'] . "/" . $interface['hostname'] . "/port-" . $interface['ifIndex'] . ".rrd")) {
$graph_type = "port_bits";
include("includes/print-interface-graphs.inc.php");