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

fixes

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2660 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-10-07 13:42:02 +00:00
parent 9f6408c72c
commit 870cb75038
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
html/includes/graphs/customer/bits.inc.php
View File

@@ -9,6 +9,8 @@ foreach (dbFetchRows("SELECT * FROM `ports` AS I, `devices` AS D WHERE `port_des
$rrd_filename = $config['rrd_dir'] . "/" . $port['hostname'] . "/port-" . safename($port['ifIndex'] . ".rrd"); $rrd_filename = $config['rrd_dir'] . "/" . $port['hostname'] . "/port-" . safename($port['ifIndex'] . ".rrd");
$rrd_list[$i]['filename'] = $rrd_filename; $rrd_list[$i]['filename'] = $rrd_filename;
$rrd_list[$i]['descr'] = $port['hostname'] ."-". $port['ifDescr']; $rrd_list[$i]['descr'] = $port['hostname'] ."-". $port['ifDescr'];
$rrd_list[$i]['descr_in'] = shorthost($port['hostname']);
$rrd_list[$i]['descr_out'] = makeshortif($port['ifDescr']);
$i++; $i++;
} }
} }

8
html/map.php
View File

@@ -3,10 +3,10 @@
### FIXME : remove link when port/host is not in the database (things /seen/ but not *discovered*) ### FIXME : remove link when port/host is not in the database (things /seen/ but not *discovered*)
### No, that should be there... I like to see that stuff :> (adama) ### No, that should be there... I like to see that stuff :> (adama)
# ini_set('display_errors', 1); ini_set('display_errors', 1);
# ini_set('display_startup_errors', 1); ini_set('display_startup_errors', 1);
# ini_set('log_errors', 1); ini_set('log_errors', 1);
# ini_set('error_reporting', E_ALL); ini_set('error_reporting', E_ALL);
$links = 1; $links = 1;

2
html/pages/device/routing/ospf.inc.php
View File

@@ -109,7 +109,7 @@ foreach (dbFetchRows("SELECT * FROM `ospf_instances` WHERE `device_id` = ?", arr
$host = @dbFetchRow("SELECT * FROM ipv4_addresses AS A, ports AS I, devices AS D WHERE A.ipv4_address = ? $host = @dbFetchRow("SELECT * FROM ipv4_addresses AS A, ports AS I, devices AS D WHERE A.ipv4_address = ?
AND I.interface_id = A.interface_id AND D.device_id = I.device_id", array($nbr['ospfNbrRtrId'])); AND I.interface_id = A.interface_id AND D.device_id = I.device_id", array($nbr['ospfNbrRtrId']));
if (is_array($host)) { $rtr_id = generate_device_link($host, $nbr['ospfNbrRtrId']); } else { $rtr_id = "unknown"; } if (is_array($host)) { $rtr_id = generate_device_link($host); } else { $rtr_id = "unknown"; }
echo('<tr bgcolor="'.$nbr_bg.'">'); echo('<tr bgcolor="'.$nbr_bg.'">');
echo(' <td width=5></td>'); echo(' <td width=5></td>');