nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-30 16:14:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #271 from laf/issue-laf-34

Browse Source 
Fixed links for health graphs
This commit is contained in:
Paul Gear
2014-07-07 19:52:02 +10:00
parent e8d89ce1ae 9585796271
commit 9d4f29da83
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/pages/device/health/mempool.inc.php
+1 -1
View File
@@ -23,7 +23,7 @@ foreach (dbFetchRows("SELECT * FROM `mempools` WHERE device_id = ?", array($devi
$text_descr = rewrite_entity_descr($mempool['mempool_descr']); $text_descr = rewrite_entity_descr($mempool['mempool_descr']);
$mempool_url = "device/".$device['device_id']."/health/mempool/"; $mempool_url = "graphs/id=".$mempool['mempool_id']."/type=mempool_usage/";
$mini_url = "graph.php?id=".$mempool['mempool_id']."&type=".$graph_type."&from=".$config['time']['day']."&to=".$config['time']['now']."&width=80&height=20&bg=f4f4f4"; $mini_url = "graph.php?id=".$mempool['mempool_id']."&type=".$graph_type."&from=".$config['time']['day']."&to=".$config['time']['now']."&width=80&height=20&bg=f4f4f4";
$mempool_popup = "onmouseover=\"return overlib('<div class=list-large>".$device['hostname']." - ".$text_descr; $mempool_popup = "onmouseover=\"return overlib('<div class=list-large>".$device['hostname']." - ".$text_descr;
html/pages/device/health/processor.inc.php
+1 -1
View File
@@ -8,7 +8,7 @@ echo("<table width=100% cellpadding=6 cellspacing=0>");
$i = '1'; $i = '1';
foreach (dbFetchRows("SELECT * FROM `processors` WHERE device_id = ?", array($device['device_id'])) as $proc) foreach (dbFetchRows("SELECT * FROM `processors` WHERE device_id = ?", array($device['device_id'])) as $proc)
{ {
$proc_url = "device/device=".$device['device_id']."/tab=health/metric=processor/"; $proc_url = "graphs/id=".$proc['processor_id']."/type=processor_usage/";
$mini_url = "graph.php?id=".$proc['processor_id']."&amp;type=".$graph_type."&amp;from=".$config['time']['day']."&amp;to=".$config['time']['now']."&amp;width=80&amp;height=20&amp;bg=f4f4f4"; $mini_url = "graph.php?id=".$proc['processor_id']."&amp;type=".$graph_type."&amp;from=".$config['time']['day']."&amp;to=".$config['time']['now']."&amp;width=80&amp;height=20&amp;bg=f4f4f4";
html/pages/device/health/storage.inc.php
+3 -3
View File
@@ -25,7 +25,7 @@ foreach (dbFetchRows("SELECT * FROM `storage` WHERE device_id = ? ORDER BY stora
$total = formatStorage($total); $total = formatStorage($total);
$free = formatStorage($free); $free = formatStorage($free);
$fs_url = "device/device=".$device['device_id']."/tab=health/metric=storage/"; $fs_url = "graphs/id=".$drive['drive_id']."/type=storage_usage/";
$fs_popup = "onmouseover=\"return overlib('<div class=list-large>".$device['hostname']." - ".$drive['storage_descr']; $fs_popup = "onmouseover=\"return overlib('<div class=list-large>".$device['hostname']." - ".$drive['storage_descr'];
$fs_popup .= "</div><img src=\'graph.php?id=" . $drive['storage_id'] . "&amp;type=".$graph_type."&amp;from=".$config['time']['month']."&amp;to=".$config['time']['now']."&amp;width=400&amp;height=125\'>"; $fs_popup .= "</div><img src=\'graph.php?id=" . $drive['storage_id'] . "&amp;type=".$graph_type."&amp;from=".$config['time']['month']."&amp;to=".$config['time']['now']."&amp;width=400&amp;height=125\'>";
@@ -33,14 +33,14 @@ foreach (dbFetchRows("SELECT * FROM `storage` WHERE device_id = ? ORDER BY stora
$background = get_percentage_colours($percent); $background = get_percentage_colours($percent);
echo("<tr bgcolor='$row_colour'><th><a href='$fs_url' $fs_popup>" . $drive['storage_descr'] . "</a></td><td> echo("<tr bgcolor='$row_colour'><td><a href='$fs_url' $fs_popup>" . $drive['storage_descr'] . "</a></td><td>
<a href='$fs_url' $fs_popup>".print_percentage_bar (400, 20, $perc, "$used / $total", "ffffff", $background['left'], $perc . "%", "ffffff", $background['right'])."</a> <a href='$fs_url' $fs_popup>".print_percentage_bar (400, 20, $perc, "$used / $total", "ffffff", $background['left'], $perc . "%", "ffffff", $background['right'])."</a>
</td><td>" . $free . "</td><td></td></tr>"); </td><td>" . $free . "</td><td></td></tr>");
$graph_array['id'] = $drive['storage_id']; $graph_array['id'] = $drive['storage_id'];
$graph_array['type'] = $graph_type; $graph_array['type'] = $graph_type;
echo("<tr bgcolor='$row_colour'><td colspan=6>"); echo("<tr bgcolor='$row_colour'><td colspan=4>");
include("includes/print-graphrow.inc.php"); include("includes/print-graphrow.inc.php");