nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-26 08:03:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Next front page improvement

Browse Source 
- load all files in include directory
- half-baked attempt to make HTML output more readable
- add top hosts by total bits box
- horrible hack to generate_device_link() to make it possible to insert the device_bits graph
This commit is contained in:
Paul Gear
2013-11-26 14:35:23 +10:00
parent 663c3649a9
commit a5b152cd98
7 changed files with 97 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/front/common.inc.php → html/includes/front/boxes.inc.php
+15 -2
View File
@@ -1,6 +1,6 @@
<?php
/*
* LibreNMS front page graphs - common code
* LibreNMS front page graphs
*
* Copyright (c) 2013 Gear Consulting Pty Ltd <http://libertysys.com.au/>
*
@@ -10,7 +10,20 @@
* option) any later version. Please see LICENSE.txt at the top level of
* the source code distribution for details.
*/
?>
<script type="text/javascript" src="js/jquery.cycle.all.js"></script>
<script type="text/javascript" src="js/jquery-cycle-boxes.js"></script>
<?php
echo("<div class='right-2-col-fixed'>\n<div class='boxes'>\n");
foreach (get_matching_files($config['html_dir']."/includes/front/", "/^top_.*\.php$/") as $file) {
echo("<div class=box>\n");
include_once($file);
echo("</div>\n");
}
echo("</div>\n");
echo("</div>\n");
?>
html/includes/front/top_device_bits.inc.php
+42
View File
@@ -0,0 +1,42 @@
<?php
/*
* LibreNMS front page top devices graph
* - Find most utilised devices that have been polled in the last N minutes
*
* Copyright (c) 2013 Gear Consulting Pty Ltd <http://libertysys.com.au/>
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation, either version 3 of the License, or (at your
* option) any later version. Please see LICENSE.txt at the top level of
* the source code distribution for details.
*/
$minutes = 15;
$seconds = $minutes * 60;
$top = $config['front_page_settings']['top']['devices'];
$query = "
SELECT *, sum(p.ifInOctets_rate + p.ifOutOctets_rate) as total
FROM ports as p, devices as d
WHERE d.device_id = p.device_id
AND unix_timestamp() - p.poll_time < $seconds
AND ( p.ifInOctets_rate > 0
OR p.ifOutOctets_rate > 0 )
GROUP BY d.device_id
ORDER BY total desc
LIMIT $top
";
echo("<strong>Top $top devices (last $minutes minutes)</strong>\n");
echo("<table class='simple'>\n");
foreach (dbFetchRows($query) as $result) {
echo("<tr>".
"<td>".generate_device_link($result, shorthost($result['hostname']))."</td>".
"<td>".generate_device_link($result,
generate_minigraph_image($result, $config['time']['day'], $config['time']['now'], "device_bits", "no", 150, 21, '&'), array(), 0, 0, 0)."</td>".
"</tr>\n");
}
echo("</table>\n");
?>
html/includes/front/top_graphs.inc.php
-38
View File
@@ -1,38 +0,0 @@
<?php
/*
* LibreNMS front page graphs
*
* Copyright (c) 2013 Gear Consulting Pty Ltd <http://libertysys.com.au/>
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation, either version 3 of the License, or (at your
* option) any later version. Please see LICENSE.txt at the top level of
* the source code distribution for details.
*/
require_once("includes/front/common.inc.php");
echo('<div class="right-2-col-fixed">');
echo('<div class="boxes">');
echo('<div class=box>');
require_once("includes/front/top_ports.inc.php");
echo('</div>');
/*
echo('<div class=box>');
echo('<h5>Something</h5>');
echo('<p>Next 1</p>');
echo('</div>');
echo('<div class=box>');
echo('<h5>Something else</h5>');
echo('<p>Next 2</p>');
echo('</div>');
*/
echo('</div>');
echo('</div>');
?>
html/includes/front/top_ports.inc.php
+6 -6
View File
@@ -26,14 +26,14 @@ $query = "
LIMIT $top
";
echo("<strong>Top $top ports (last $minutes minutes)</strong>");
echo('<table class="simple">');
echo("<strong>Top $top ports (last $minutes minutes)</strong>\n");
echo("<table class='simple'>\n");
foreach (dbFetchRows($query) as $result) {
echo('<tr><td>'.
echo("<tr><td>".
generate_device_link($result, shorthost($result['hostname'])).
'</td><td>'.generate_port_link($result).
'</td><td>'.generate_port_link($result, generate_port_thumbnail($result)).'</td></tr>');
"</td><td>".generate_port_link($result).
"</td><td>".generate_port_link($result, generate_port_thumbnail($result))."</td></tr>\n");
}
echo('</table>');
echo("</table>\n");
?>