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

probably final graph cleanups

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1909 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-03-17 14:27:03 +00:00
parent e61065a4a3
commit 7604734ec1
34 changed files with 256 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/graphs/application/apache_bytes.inc.php
+3 -2
View File
@@ -4,7 +4,8 @@ include("includes/graphs/common.inc.php");
$apache_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-apache-".$app['app_id'].".rrd";
if(is_file($apache_rrd)) {
if (is_file($apache_rrd))
{
$rrd_filename = $apache_rrd;
}
@@ -21,4 +22,4 @@ $unit_text = "KByte/sec";
include("includes/graphs/generic_simplex.inc.php");
?>
?>
html/includes/graphs/application/apache_cpu.inc.php
+3 -2
View File
@@ -4,7 +4,8 @@ include("includes/graphs/common.inc.php");
$apache_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-apache-".$app['app_id'].".rrd";
if(is_file($apache_rrd)) {
if (is_file($apache_rrd))
{
$rrd_filename = $apache_rrd;
}
@@ -21,4 +22,4 @@ $unit_text = "% Used";
include("includes/graphs/generic_simplex.inc.php");
?>
?>
html/includes/graphs/application/apache_hits.inc.php
+3 -2
View File
@@ -4,7 +4,8 @@ include("includes/graphs/common.inc.php");
$apache_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-apache-".$app['app_id'].".rrd";
if(is_file($apache_rrd)) {
if (is_file($apache_rrd))
{
$rrd_filename = $apache_rrd;
}
@@ -21,4 +22,4 @@ $unit_text = "Hits/sec";
include("includes/graphs/generic_simplex.inc.php");
?>
?>
html/includes/graphs/application/apache_scoreboard.inc.php
+56 -55
View File
@@ -2,62 +2,63 @@
include("includes/graphs/common.inc.php");
$apache_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-apache-".$app['app_id'].".rrd";
$apache_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-apache-".$app['app_id'].".rrd";
if(is_file($apache_rrd)) {
$rrd_filename = $apache_rrd;
if (is_file($apache_rrd))
{
$rrd_filename = $apache_rrd;
}
$rrd_options .= ' DEF:a='.$rrd_filename.':sb_wait:AVERAGE ';
$rrd_options .= 'DEF:b='.$rrd_filename.':sb_start:AVERAGE ';
$rrd_options .= 'DEF:c='.$rrd_filename.':sb_reading:AVERAGE ';
$rrd_options .= 'DEF:d='.$rrd_filename.':sb_writing:AVERAGE ';
$rrd_options .= 'DEF:e='.$rrd_filename.':sb_keepalive:AVERAGE ';
$rrd_options .= 'DEF:f='.$rrd_filename.':sb_dns:AVERAGE ';
$rrd_options .= 'DEF:g='.$rrd_filename.':sb_closing:AVERAGE ';
$rrd_options .= 'DEF:h='.$rrd_filename.':sb_logging:AVERAGE ';
$rrd_options .= 'DEF:i='.$rrd_filename.':sb_graceful:AVERAGE ';
$rrd_options .= 'DEF:j='.$rrd_filename.':sb_idle:AVERAGE ';
$rrd_options .= 'COMMENT:"Scoreboard Current Average Maximum" ';
$rrd_options .= 'AREA:a#4444FFFF:"Waiting " ';
$rrd_options .= 'GPRINT:a:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:a:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:a:MAX:"%6.2lf %s\n" ';
$rrd_options .= 'AREA:b#FF0000FF:"Keepalive ":STACK ';
$rrd_options .= 'GPRINT:b:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:b:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:b:MAX:"%6.2lf %s\n" ';
$rrd_options .= 'AREA:c#750F7DFF:"Reading ":STACK ';
$rrd_options .= 'GPRINT:c:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:c:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:c:MAX:"%6.2lf %s\n" ';
$rrd_options .= 'AREA:d#00FF00FF:"Sending ":STACK ';
$rrd_options .= 'GPRINT:d:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:d:AVERAGE":%6.2lf %s" ';
$rrd_options .= 'GPRINT:d:MAX:"%6.2lf %s\n" ';
$rrd_options .= 'AREA:e#157419FF:"Starting ":STACK ';
$rrd_options .= 'GPRINT:e:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:e:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:e:MAX:"%6.2lf %s\n" ';
$rrd_options .= 'AREA:f#6DC8FEFF:"DNS Lookup":STACK ';
$rrd_options .= 'GPRINT:f:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:f:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:f:MAX:"%6.2lf %s\n" ';
$rrd_options .= 'AREA:g#FFAB00FF:"Closing ":STACK ';
$rrd_options .= 'GPRINT:g:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:g:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:g:MAX:"%6.2lf %s\n" ';
$rrd_options .= 'AREA:h#FFFF00FF:"Logging ":STACK ';
$rrd_options .= 'GPRINT:h:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:h:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:h:MAX:"%6.2lf %s\n" ';
$rrd_options .= 'AREA:i#FF5576FF:"Graceful ":STACK ';
$rrd_options .= 'GPRINT:i:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:i:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:i:MAX:"%6.2lf %s\n" ';
$rrd_options .= 'AREA:j#FF4105FF:"Idle ":STACK ';
$rrd_options .= 'GPRINT:j:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:j:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:j:MAX:"%6.2lf %s\n"';
$rrd_options .= ' DEF:a='.$rrd_filename.':sb_wait:AVERAGE ';
$rrd_options .= 'DEF:b='.$rrd_filename.':sb_start:AVERAGE ';
$rrd_options .= 'DEF:c='.$rrd_filename.':sb_reading:AVERAGE ';
$rrd_options .= 'DEF:d='.$rrd_filename.':sb_writing:AVERAGE ';
$rrd_options .= 'DEF:e='.$rrd_filename.':sb_keepalive:AVERAGE ';
$rrd_options .= 'DEF:f='.$rrd_filename.':sb_dns:AVERAGE ';
$rrd_options .= 'DEF:g='.$rrd_filename.':sb_closing:AVERAGE ';
$rrd_options .= 'DEF:h='.$rrd_filename.':sb_logging:AVERAGE ';
$rrd_options .= 'DEF:i='.$rrd_filename.':sb_graceful:AVERAGE ';
$rrd_options .= 'DEF:j='.$rrd_filename.':sb_idle:AVERAGE ';
$rrd_options .= 'COMMENT:"Scoreboard Current Average Maximum" ';
$rrd_options .= 'AREA:a#4444FFFF:"Waiting " ';
$rrd_options .= 'GPRINT:a:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:a:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:a:MAX:"%6.2lf %s\n" ';
$rrd_options .= 'AREA:b#FF0000FF:"Keepalive ":STACK ';
$rrd_options .= 'GPRINT:b:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:b:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:b:MAX:"%6.2lf %s\n" ';
$rrd_options .= 'AREA:c#750F7DFF:"Reading ":STACK ';
$rrd_options .= 'GPRINT:c:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:c:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:c:MAX:"%6.2lf %s\n" ';
$rrd_options .= 'AREA:d#00FF00FF:"Sending ":STACK ';
$rrd_options .= 'GPRINT:d:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:d:AVERAGE":%6.2lf %s" ';
$rrd_options .= 'GPRINT:d:MAX:"%6.2lf %s\n" ';
$rrd_options .= 'AREA:e#157419FF:"Starting ":STACK ';
$rrd_options .= 'GPRINT:e:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:e:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:e:MAX:"%6.2lf %s\n" ';
$rrd_options .= 'AREA:f#6DC8FEFF:"DNS Lookup":STACK ';
$rrd_options .= 'GPRINT:f:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:f:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:f:MAX:"%6.2lf %s\n" ';
$rrd_options .= 'AREA:g#FFAB00FF:"Closing ":STACK ';
$rrd_options .= 'GPRINT:g:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:g:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:g:MAX:"%6.2lf %s\n" ';
$rrd_options .= 'AREA:h#FFFF00FF:"Logging ":STACK ';
$rrd_options .= 'GPRINT:h:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:h:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:h:MAX:"%6.2lf %s\n" ';
$rrd_options .= 'AREA:i#FF5576FF:"Graceful ":STACK ';
$rrd_options .= 'GPRINT:i:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:i:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:i:MAX:"%6.2lf %s\n" ';
$rrd_options .= 'AREA:j#FF4105FF:"Idle ":STACK ';
$rrd_options .= 'GPRINT:j:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:j:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:j:MAX:"%6.2lf %s\n"';
?>
?>
html/includes/graphs/application/auth.inc.php
+2 -2
View File
@@ -1,6 +1,6 @@
<?php
if(is_numeric($id) && ($config['allow_unauth_graphs'] || application_permitted($id)))
if (is_numeric($id) && ($config['allow_unauth_graphs'] || application_permitted($id)))
{
$app = get_application_by_id($id);
$device = device_by_id_cache($app['device_id']);
@@ -9,4 +9,4 @@ if(is_numeric($id) && ($config['allow_unauth_graphs'] || application_permitted($
$auth = TRUE;
}
?>
?>
html/includes/graphs/application/mysql_command_counters.inc.php
+4 -3
View File
@@ -2,9 +2,10 @@
include("includes/graphs/common.inc.php");
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
if(is_file($mysql_rrd)) {
if (is_file($mysql_rrd))
{
$rrd_filename = $mysql_rrd;
}
@@ -66,4 +67,4 @@ $rrd_options .= 'GPRINT:i:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:i:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:i:MAX:"%6.2lf %s\n" ';
?>
?>
html/includes/graphs/application/mysql_connections.inc.php
+5 -4
View File
@@ -2,11 +2,13 @@
include("includes/graphs/common.inc.php");
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
if(is_file($mysql_rrd)) {
if (is_file($mysql_rrd))
{
$rrd_filename = $mysql_rrd;
}
$rrd_options .= ' -b 1000 ';
$rrd_options .= ' DEF:a='.$rrd_filename.':MaCs:AVERAGE ';
$rrd_options .= ' DEF:b='.$rrd_filename.':MUCs:AVERAGE ';
@@ -47,5 +49,4 @@ $rrd_options .= 'GPRINT:f:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:f:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:f:MAX:"%6.2lf %s\n" ';
?>
?>
html/includes/graphs/application/mysql_files_tables.inc.php
+5 -4
View File
@@ -2,11 +2,13 @@
include("includes/graphs/common.inc.php");
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
if(is_file($mysql_rrd)) {
if (is_file($mysql_rrd))
{
$rrd_filename = $mysql_rrd;
}
$rrd_options .= ' -b 1000 ';
$rrd_options .= ' DEF:a='.$rrd_filename.':TOC:AVERAGE ';
$rrd_options .= ' DEF:b='.$rrd_filename.':OFs:AVERAGE ';
@@ -35,5 +37,4 @@ $rrd_options .= 'GPRINT:d:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:d:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:d:MAX:"%6.2lf %s\n" ';
?>
?>
html/includes/graphs/application/mysql_innodb_buffer_pool.inc.php
+6 -5
View File
@@ -2,11 +2,13 @@
include("includes/graphs/common.inc.php");
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
if(is_file($mysql_rrd)) {
$rrd_filename = $mysql_rrd;
if (is_file($mysql_rrd))
{
$rrd_filename = $mysql_rrd;
}
$rrd_options .= ' -b 1024 ';
$rrd_options .= ' DEF:a='.$rrd_filename.':IBPse:AVERAGE ';
$rrd_options .= ' DEF:b='.$rrd_filename.':IBPDBp:AVERAGE ';
@@ -35,5 +37,4 @@ $rrd_options .= 'GPRINT:d:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:d:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:d:MAX:"%6.2lf %s\n" ';
?>
?>
html/includes/graphs/application/mysql_innodb_buffer_pool_activity.inc.php
+7 -4
View File
@@ -2,11 +2,13 @@
include("includes/graphs/common.inc.php");
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
if(is_file($mysql_rrd)) {
$rrd_filename = $mysql_rrd;
if (is_file($mysql_rrd))
{
$rrd_filename = $mysql_rrd;
}
$rrd_options .= ' -b 1024 ';
$rrd_options .= ' DEF:a='.$rrd_filename.':IBRd:AVERAGE ';
$rrd_options .= ' DEF:b='.$rrd_filename.':IBCd:AVERAGE ';
@@ -34,4 +36,5 @@ $rrd_options .= 'LINE2:d#000000:"Total"\ \ ';
$rrd_options .= 'GPRINT:d:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:d:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:d:MAX:"%6.2lf %s\n" ';
?>
?>
html/includes/graphs/application/mysql_innodb_insert_buffer.inc.php
+6 -4
View File
@@ -2,11 +2,13 @@
include("includes/graphs/common.inc.php");
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
if(is_file($mysql_rrd)) {
$rrd_filename = $mysql_rrd;
if (is_file($mysql_rrd))
{
$rrd_filename = $mysql_rrd;
}
$rrd_options .= ' -b 1024 ';
$rrd_options .= ' DEF:a='.$rrd_filename.':IBIIs:AVERAGE ';
$rrd_options .= ' DEF:b='.$rrd_filename.':IBIMRd:AVERAGE ';
@@ -29,4 +31,4 @@ $rrd_options .= 'GPRINT:c:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:c:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:c:MAX:"%6.2lf %s\n" ';
?>
?>
html/includes/graphs/application/mysql_innodb_io.inc.php
+6 -5
View File
@@ -2,17 +2,18 @@
include("includes/graphs/common.inc.php");
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
if(is_file($mysql_rrd)) {
$rrd_filename = $mysql_rrd;
if (is_file($mysql_rrd))
{
$rrd_filename = $mysql_rrd;
}
$rrd_options .= ' DEF:a='.$rrd_filename.':IBIRd:AVERAGE ';
$rrd_options .= ' DEF:b='.$rrd_filename.':IBIWr:AVERAGE ';
$rrd_options .= ' DEF:c='.$rrd_filename.':IBILg:AVERAGE ';
$rrd_options .= ' DEF:d='.$rrd_filename.':IBIFSc:AVERAGE ';
$rrd_options .= 'COMMENT:" Current Average Maximum\n" ';
$rrd_options .= 'LINE1:a#22FF22:"File Reads"\ \ ';
@@ -35,4 +36,4 @@ $rrd_options .= 'GPRINT:d:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:d:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:d:MAX:"%6.2lf %s\n" ';
?>
?>
html/includes/graphs/application/mysql_innodb_io_pending.inc.php
+7 -5
View File
@@ -2,11 +2,13 @@
include("includes/graphs/common.inc.php");
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
if(is_file($mysql_rrd)) {
$rrd_filename = $mysql_rrd;
if (is_file($mysql_rrd))
{
$rrd_filename = $mysql_rrd;
}
$rrd_options .= ' DEF:a='.$rrd_filename.':IBILog:AVERAGE ';
$rrd_options .= ' DEF:b='.$rrd_filename.':IBISc:AVERAGE ';
$rrd_options .= ' DEF:c='.$rrd_filename.':IBIFLg:AVERAGE ';
@@ -15,7 +17,6 @@ $rrd_options .= ' DEF:e='.$rrd_filename.':IBIIAo:AVERAGE ';
$rrd_options .= ' DEF:f='.$rrd_filename.':IBIAd:AVERAGE ';
$rrd_options .= ' DEF:g='.$rrd_filename.':IBIAe:AVERAGE ';
$rrd_options .= 'COMMENT:" Current Average Maximum\n" ';
$rrd_options .= 'LINE1:a#22FF22:"AIO Log"\ \ ';
@@ -52,4 +53,5 @@ $rrd_options .= 'LINE1:d#CC0000:"Normal AIO Writes"\ \ ';
$rrd_options .= 'GPRINT:g:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:g:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:g:MAX:"%6.2lf %s\n" ';
?>
?>
html/includes/graphs/application/mysql_innodb_log.inc.php
+6 -5
View File
@@ -2,16 +2,17 @@
include("includes/graphs/common.inc.php");
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
if(is_file($mysql_rrd)) {
$rrd_filename = $mysql_rrd;
if (is_file($mysql_rrd))
{
$rrd_filename = $mysql_rrd;
}
$rrd_options .= ' DEF:a='.$rrd_filename.':IDBLBSe:AVERAGE ';
$rrd_options .= ' DEF:b='.$rrd_filename.':IBLFh:AVERAGE ';
$rrd_options .= ' DEF:c='.$rrd_filename.':IBLWn:AVERAGE ';
$rrd_options .= 'COMMENT:" Current Average Maximum\n" ';
$rrd_options .= 'AREA:a#FAFD9E:"Buffer Size"\ \ ';
@@ -29,4 +30,4 @@ $rrd_options .= 'GPRINT:c:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:c:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:c:MAX:"%6.2lf %s\n" ';
?>
?>
html/includes/graphs/application/mysql_innodb_row_operations.inc.php
+6 -5
View File
@@ -2,18 +2,19 @@
include("includes/graphs/common.inc.php");
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
if(is_file($mysql_rrd)) {
$rrd_filename = $mysql_rrd;
if (is_file($mysql_rrd))
{
$rrd_filename = $mysql_rrd;
}
$rrd_options .= ' DEF:a='.$rrd_filename.':IDBRDd:AVERAGE ';
$rrd_options .= ' DEF:b='.$rrd_filename.':IDBRId:AVERAGE ';
$rrd_options .= ' DEF:c='.$rrd_filename.':IDBRRd:AVERAGE ';
$rrd_options .= ' DEF:d='.$rrd_filename.':IDBRUd:AVERAGE ';
$rrd_options .= ' CDEF:e=a,b,c,d,+,+,+ ';
$rrd_options .= 'COMMENT:" Current Average Maximum\n" ';
$rrd_options .= 'AREA:a#22FF22:"Deletes"\ \ ';
@@ -41,4 +42,4 @@ $rrd_options .= 'GPRINT:e:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:e:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:e:MAX:"%6.2lf %s\n" ';
?>
?>
html/includes/graphs/application/mysql_innodb_semaphores.inc.php
+7 -5
View File
@@ -2,16 +2,17 @@
include("includes/graphs/common.inc.php");
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
if(is_file($mysql_rrd)) {
$rrd_filename = $mysql_rrd;
if (is_file($mysql_rrd))
{
$rrd_filename = $mysql_rrd;
}
$rrd_options .= ' DEF:a='.$rrd_filename.':IBSRs:AVERAGE ';
$rrd_options .= ' DEF:b='.$rrd_filename.':IBSWs:AVERAGE ';
$rrd_options .= ' DEF:c='.$rrd_filename.':IBOWs:AVERAGE ';
$rrd_options .= 'COMMENT:" Current Average Maximum\n" ';
$rrd_options .= 'LINE2:a#22FF22:"Spin Rounds"\ \ ';
@@ -28,4 +29,5 @@ $rrd_options .= 'LINE2:c#FF0000:"OS Waits"\ \ ';
$rrd_options .= 'GPRINT:c:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:c:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:c:MAX:"%6.2lf %s\n" ';
?>
?>
html/includes/graphs/application/mysql_innodb_transactions.inc.php
+6 -5
View File
@@ -2,20 +2,21 @@
include("includes/graphs/common.inc.php");
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
if(is_file($mysql_rrd)) {
$rrd_filename = $mysql_rrd;
if (is_file($mysql_rrd))
{
$rrd_filename = $mysql_rrd;
}
$rrd_options .= ' -b 1000 ';
$rrd_options .= ' DEF:a='.$rrd_filename.':IBTNx:AVERAGE ';
$rrd_options .= 'COMMENT:" Current Average Maximum\n" ';
$rrd_options .= 'LINE1:a#22FF22:"Transactions created"\ \ ';
$rrd_options .= 'GPRINT:a:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:a:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:a:MAX:"%6.2lf %s" ';
?>
?>
html/includes/graphs/application/mysql_myisam_indexes.inc.php
+6 -5
View File
@@ -2,17 +2,18 @@
include("includes/graphs/common.inc.php");
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
if(is_file($mysql_rrd)) {
$rrd_filename = $mysql_rrd;
if (is_file($mysql_rrd))
{
$rrd_filename = $mysql_rrd;
}
$rrd_options .= ' DEF:a='.$rrd_filename.':KRRs:AVERAGE ';
$rrd_options .= ' DEF:b='.$rrd_filename.':KRs:AVERAGE ';
$rrd_options .= ' DEF:c='.$rrd_filename.':KWR:AVERAGE ';
$rrd_options .= ' DEF:d='.$rrd_filename.':KWs:AVERAGE ';
$rrd_options .= 'COMMENT:" Current Average Maximum\n" ';
$rrd_options .= 'LINE1:a#22FF22:"Key read requests"\ \ ';
@@ -35,4 +36,4 @@ $rrd_options .= 'GPRINT:d:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:d:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:d:MAX:"%6.2lf %s\n" ';
?>
?>
html/includes/graphs/application/mysql_network_traffic.inc.php
+5 -5
View File
@@ -2,10 +2,11 @@
include("includes/graphs/common.inc.php");
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
if(is_file($mysql_rrd)) {
$rrd_filename = $mysql_rrd;
if (is_file($mysql_rrd))
{
$rrd_filename = $mysql_rrd;
}
$rrd_options .= ' -b 1024 ';
@@ -13,7 +14,6 @@ $rrd_options .= ' DEF:a='.$rrd_filename.':BRd:AVERAGE ';
$rrd_options .= ' DEF:b='.$rrd_filename.':BSt:AVERAGE ';
$rrd_options .= ' CDEF:c=a,-1,* ';
$rrd_options .= 'COMMENT:" Current Average Maximum\n" ';
$rrd_options .= 'LINE2:c#00AA00:"Bytes read"\ \ ';
@@ -26,4 +26,4 @@ $rrd_options .= 'GPRINT:b:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:b:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:b:MAX:"%6.2lf %s\n" ';
?>
?>
html/includes/graphs/application/mysql_query_cache.inc.php
+5 -5
View File
@@ -2,10 +2,11 @@
include("includes/graphs/common.inc.php");
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
if(is_file($mysql_rrd)) {
$rrd_filename = $mysql_rrd;
if (is_file($mysql_rrd))
{
$rrd_filename = $mysql_rrd;
}
$rrd_options .= ' -b 1024 ';
@@ -15,7 +16,6 @@ $rrd_options .= ' DEF:c='.$rrd_filename.':QCIs:AVERAGE ';
$rrd_options .= ' DEF:d='.$rrd_filename.':QCNCd:AVERAGE ';
$rrd_options .= ' DEF:e='.$rrd_filename.':QCLMPs:AVERAGE ';
$rrd_options .= 'COMMENT:" Current Average Maximum\n" ';
$rrd_options .= 'LINE2:a#22FF22:"Queries in cache"\ \ ';
@@ -43,4 +43,4 @@ $rrd_options .= 'GPRINT:e:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:e:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:e:MAX:"%6.2lf %s\n" ';
?>
?>
html/includes/graphs/application/mysql_query_cache_memory.inc.php
+5 -5
View File
@@ -2,10 +2,11 @@
include("includes/graphs/common.inc.php");
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
if(is_file($mysql_rrd)) {
$rrd_filename = $mysql_rrd;
if (is_file($mysql_rrd))
{
$rrd_filename = $mysql_rrd;
}
$rrd_options .= ' -b 1024 ';
@@ -13,7 +14,6 @@ $rrd_options .= ' -l 0 ';
$rrd_options .= ' DEF:a='.$rrd_filename.':QCs:AVERAGE ';
$rrd_options .= ' DEF:b='.$rrd_filename.':QCeFy:AVERAGE ';
$rrd_options .= 'COMMENT:" Current Average Maximum\n" ';
$rrd_options .= 'AREA:a#22FF22:"Cache size"\ \ ';
@@ -26,4 +26,4 @@ $rrd_options .= 'GPRINT:b:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:b:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:b:MAX:"%6.2lf %s\n" ';
?>
?>
html/includes/graphs/application/mysql_select_types.inc.php
+5 -5
View File
@@ -2,10 +2,11 @@
include("includes/graphs/common.inc.php");
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
if(is_file($mysql_rrd)) {
$rrd_filename = $mysql_rrd;
if (is_file($mysql_rrd))
{
$rrd_filename = $mysql_rrd;
}
$rrd_options .= ' -b 1024 ';
@@ -17,7 +18,6 @@ $rrd_options .= ' DEF:d='.$rrd_filename.':SRCk:AVERAGE ';
$rrd_options .= ' DEF:e='.$rrd_filename.':SSn:AVERAGE ';
$rrd_options .= ' CDEF:total=a,b,c,d,e,+,+,+,+ ';
$rrd_options .= 'COMMENT:" Current Average Maximum\n" ';
$rrd_options .= 'AREA:a#22FF22:"Full Join"\ \ ';
@@ -50,4 +50,4 @@ $rrd_options .= 'GPRINT:total:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:total:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:total:MAX:"%6.2lf %s\n" ';
?>
?>
html/includes/graphs/application/mysql_slow_queries.inc.php
+5 -6
View File
@@ -2,16 +2,16 @@
include("includes/graphs/common.inc.php");
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
if(is_file($mysql_rrd)) {
$rrd_filename = $mysql_rrd;
if (is_file($mysql_rrd))
{
$rrd_filename = $mysql_rrd;
}
/* $rrd_options .= ' -b 1024 '; */
$rrd_options .= ' DEF:a='.$rrd_filename.':SQs:AVERAGE ';
$rrd_options .= 'COMMENT:" Current Average Maximum\n" ';
$rrd_options .= 'LINE2:a#22FF22:"Slow queries"\ \ ';
@@ -19,5 +19,4 @@ $rrd_options .= 'GPRINT:a:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:a:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:a:MAX:"%6.2lf %s\n" ';
?>
?>
html/includes/graphs/application/mysql_sorts.inc.php
+6 -4
View File
@@ -2,10 +2,11 @@
include("includes/graphs/common.inc.php");
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
if(is_file($mysql_rrd)) {
$rrd_filename = $mysql_rrd;
if (is_file($mysql_rrd))
{
$rrd_filename = $mysql_rrd;
}
$rrd_options .= ' -b 1000 ';
@@ -35,4 +36,5 @@ $rrd_options .= "LINE2:d#FF0000:Scan\ \ ";
$rrd_options .= 'GPRINT:d:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:d:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:d:MAX:"%6.2lf %s\n" ';
?>
?>
html/includes/graphs/application/mysql_table_locks.inc.php
+5 -7
View File
@@ -2,17 +2,17 @@
include("includes/graphs/common.inc.php");
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
if(is_file($mysql_rrd)) {
$rrd_filename = $mysql_rrd;
if (is_file($mysql_rrd))
{
$rrd_filename = $mysql_rrd;
}
/* $rrd_options .= ' -b 1024 '; */
$rrd_options .= ' DEF:a='.$rrd_filename.':TLIe:AVERAGE ';
$rrd_options .= ' DEF:b='.$rrd_filename.':TLWd:AVERAGE ';
$rrd_options .= 'COMMENT:" Current Average Maximum\n" ';
$rrd_options .= 'LINE2:a#00FF00:"Table locks immed"\ \ ';
@@ -25,6 +25,4 @@ $rrd_options .= 'GPRINT:b:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:b:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:b:MAX:"%6.2lf %s\n" ';
?>
?>
html/includes/graphs/application/mysql_temporary_objects.inc.php
+5 -7
View File
@@ -2,10 +2,11 @@
include("includes/graphs/common.inc.php");
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
if(is_file($mysql_rrd)) {
$rrd_filename = $mysql_rrd;
if (is_file($mysql_rrd))
{
$rrd_filename = $mysql_rrd;
}
/* $rrd_options .= ' -b 1024 '; */
@@ -13,7 +14,6 @@ $rrd_options .= ' DEF:a='.$rrd_filename.':CTMPDTs:AVERAGE ';
$rrd_options .= ' DEF:b='.$rrd_filename.':CTMPTs:AVERAGE ';
$rrd_options .= ' DEF:c='.$rrd_filename.':CTMPFs:AVERAGE ';
$rrd_options .= 'COMMENT:" Current Average Maximum\n" ';
$rrd_options .= 'LINE2:a#22FF22:"Temp disk tables"\ \ ';
@@ -31,6 +31,4 @@ $rrd_options .= 'GPRINT:c:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:c:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:c:MAX:"%6.2lf %s\n" ';
?>
?>
html/includes/graphs/application/nginx_connections.inc.php
+5 -4
View File
@@ -2,10 +2,11 @@
include("includes/graphs/common.inc.php");
$nginx_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-nginx-".$app['app_id'].".rrd";
$nginx_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-nginx-".$app['app_id'].".rrd";
if(is_file($nginx_rrd)) {
$rrd_filename = $nginx_rrd;
if (is_file($nginx_rrd))
{
$rrd_filename = $nginx_rrd;
}
$rrd_options .= ' DEF:a='.$rrd_filename.':Active:AVERAGE ';
@@ -35,4 +36,4 @@ $rrd_options .= 'GPRINT:d:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:d:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:d:MAX:"%6.2lf %s\n" ';
?>
?>
html/includes/graphs/application/nginx_req.inc.php
+5 -4
View File
@@ -2,10 +2,11 @@
include("includes/graphs/common.inc.php");
$nginx_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-nginx-".$app['app_id'].".rrd";
$nginx_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-nginx-".$app['app_id'].".rrd";
if(is_file($nginx_rrd)) {
$rrd_filename = $nginx_rrd;
if (is_file($nginx_rrd))
{
$rrd_filename = $nginx_rrd;
}
$rrd_options .= ' -b 1000 ';
@@ -19,4 +20,4 @@ $rrd_options .= 'GPRINT:a:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:a:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:a:MAX:"%6.2lf %s\n" ';
?>
?>
html/includes/graphs/mempool/auth.inc.php
+3 -3
View File
@@ -1,11 +1,11 @@
<?php
if(is_numeric($id))
if (is_numeric($id))
{
$sql = mysql_query("SELECT * FROM `mempools` AS C, `devices` AS D where C.`mempool_id` = '".mres($id)."' AND C.device_id = D.device_id");
$mempool = mysql_fetch_assoc($sql);
if(is_numeric($mempool['device_id']) && ($config['allow_unauth_graphs'] || device_permitted($mempool['device_id'])))
if (is_numeric($mempool['device_id']) && ($config['allow_unauth_graphs'] || device_permitted($mempool['device_id'])))
{
$device = device_by_id_cache($mempool['device_id']);
$rrd_filename = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("mempool-".$mempool['mempool_type']."-".$mempool['mempool_index'].".rrd");
@@ -15,4 +15,4 @@ if(is_numeric($id))
}
}
?>
?>
html/includes/graphs/mempool/usage.inc.php
+19 -18
View File
@@ -2,26 +2,27 @@
include("includes/graphs/common.inc.php");
$rrd_options .= " -u 100 -l 0 -E -b 1024 ";
$rrd_options .= " -u 100 -l 0 -E -b 1024 ";
$iter = "1";
$iter = "1";
$rrd_options .= " COMMENT:' Used\\n'";
if($iter=="1") {$colour="CC0000";} elseif($iter=="2") {$colour="008C00";} elseif($iter=="3") {$colour="4096EE";
} elseif($iter=="4") {$colour="73880A";} elseif($iter=="5") {$colour="D01F3C";} elseif($iter=="6") {$colour="36393D";
} elseif($iter=="7") {$colour="FF0084"; unset($iter); }
$descr = substr(str_pad(short_hrDeviceDescr($mempool['mempool_descr']), 24),0,24);
$descr = str_replace(":", "\:", $descr);
$rrd_options .= " COMMENT:' Used\\n'";
$rrd_options .= " DEF:mempoolfree=$rrd_filename:free:AVERAGE ";
$rrd_options .= " DEF:mempoolused=$rrd_filename:used:AVERAGE ";
$rrd_options .= " CDEF:mempooltotal=mempoolused,mempoolfree,+ ";
$rrd_options .= " CDEF:mempoolperc=mempoolused,mempoolused,mempoolfree,+,/,100,* ";
$rrd_options .= " LINE1:mempoolperc#" . $colour . ":'" . $descr . "' ";
$rrd_options .= " GPRINT:mempoolused:LAST:%6.2lf%sB";
#$rrd_options .= " GPRINT:mempooltotal:LAST:%6.2lf%sB";
$rrd_options .= " GPRINT:mempoolperc:LAST:%3.0lf%%\\\\n";
#$rrd_options .= " GPRINT:mempoolperc:MAX:%3.0lf";
if ($iter=="1") { $colour="CC0000"; } elseif ($iter=="2") { $colour="008C00"; } elseif ($iter=="3") { $colour="4096EE"; }
elseif ($iter=="4") { $colour="73880A"; } elseif ($iter=="5") { $colour="D01F3C"; } elseif ($iter=="6") { $colour="36393D"; }
elseif ($iter=="7") { $colour="FF0084"; unset($iter); }
$descr = substr(str_pad(short_hrDeviceDescr($mempool['mempool_descr']), 24),0,24);
$descr = str_replace(":", "\:", $descr);
?>
$rrd_options .= " DEF:mempoolfree=$rrd_filename:free:AVERAGE ";
$rrd_options .= " DEF:mempoolused=$rrd_filename:used:AVERAGE ";
$rrd_options .= " CDEF:mempooltotal=mempoolused,mempoolfree,+ ";
$rrd_options .= " CDEF:mempoolperc=mempoolused,mempoolused,mempoolfree,+,/,100,* ";
$rrd_options .= " LINE1:mempoolperc#" . $colour . ":'" . $descr . "' ";
$rrd_options .= " GPRINT:mempoolused:LAST:%6.2lf%sB";
#$rrd_options .= " GPRINT:mempooltotal:LAST:%6.2lf%sB";
$rrd_options .= " GPRINT:mempoolperc:LAST:%3.0lf%%\\\\n";
#$rrd_options .= " GPRINT:mempoolperc:MAX:%3.0lf";
?>
html/includes/graphs/service/auth.inc.php
+3 -3
View File
@@ -1,10 +1,10 @@
<?php
if(is_numeric($id))
if (is_numeric($id))
{
$service = mysql_fetch_assoc(mysql_query("SELECT * FROM services WHERE service_id = '".mres($id)."'"));
if(is_numeric($service['device_id']) && ($config['allow_unauth_graphs'] || device_permitted($service['device_id'])))
if (is_numeric($service['device_id']) && ($config['allow_unauth_graphs'] || device_permitted($service['device_id'])))
{
$device = device_by_id_cache($service['device_id']);
@@ -17,4 +17,4 @@ if(is_numeric($id))
}
}
?>
?>
html/includes/graphs/service/availability.inc.php
+13 -16
View File
@@ -5,21 +5,18 @@ $scale_max = "1";
include("includes/graphs/common.inc.php");
$service_text = substr(str_pad($service['service_type'], 28),0,28);
$service_text = substr(str_pad($service['service_type'], 28),0,28);
$rrd_options .= " COMMENT:' Cur Avail\\n'";
$rrd_options .= " DEF:status=$rrd_filename:status:AVERAGE";
$rrd_options .= " CDEF:percent=status,100,*";
$rrd_options .= " CDEF:down=status,1,LT,status,UNKN,IF";
$rrd_options .= " CDEF:percentdown=down,100,*";
$rrd_options .= " AREA:percent#CCFFCC";
$rrd_options .= " AREA:percentdown#FFCCCC";
$rrd_options .= " LINE1.5:percent#009900:'" . $service_text . "'"; # Ugly hack :(
$rrd_options .= " LINE1.5:percentdown#cc0000";
$rrd_options .= " GPRINT:status:LAST:%3.0lf";
$rrd_options .= " GPRINT:percent:AVERAGE:%3.5lf%%\\\\l";
$rrd_options .= " COMMENT:' Cur Avail\\n'";
$rrd_options .= " DEF:status=$rrd_filename:status:AVERAGE";
$rrd_options .= " CDEF:percent=status,100,*";
$rrd_options .= " CDEF:down=status,1,LT,status,UNKN,IF";
$rrd_options .= " CDEF:percentdown=down,100,*";
$rrd_options .= " AREA:percent#CCFFCC";
$rrd_options .= " AREA:percentdown#FFCCCC";
$rrd_options .= " LINE1.5:percent#009900:'" . $service_text . "'"; # Ugly hack :(
$rrd_options .= " LINE1.5:percentdown#cc0000";
$rrd_options .= " GPRINT:status:LAST:%3.0lf";
$rrd_options .= " GPRINT:percent:AVERAGE:%3.5lf%%\\\\l";
?>
?>
html/includes/graphs/storage/auth.inc.php
+3 -3
View File
@@ -1,11 +1,11 @@
<?php
if(is_numeric($id))
if (is_numeric($id))
{
$sql = mysql_query("SELECT * FROM `storage` WHERE `storage_id` = '".mres($id)."'");
$storage = mysql_fetch_assoc($sql);
if(is_numeric($storage['device_id']) && ($config['allow_unauth_graphs'] || device_permitted($storage['device_id'])))
if (is_numeric($storage['device_id']) && ($config['allow_unauth_graphs'] || device_permitted($storage['device_id'])))
{
$device = device_by_id_cache($storage['device_id']);
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("storage-" . $storage['storage_mib'] . "-" . $storage['storage_descr'] . ".rrd");
@@ -16,4 +16,4 @@ if(is_numeric($id))
}
}
?>
?>
html/includes/graphs/storage/usage.inc.php
+20 -18
View File
@@ -7,25 +7,27 @@ include("includes/graphs/common.inc.php");
$rrd_options .= " -b 1024";
$iter = "1";
$iter = "1";
$rrd_options .= " COMMENT:' Size Free % Used\\n'";
$rrd_options .= " COMMENT:' Size Free % Used\\n'";
$hostname = gethostbyid($storage['device_id']);
$hostname = gethostbyid($storage['device_id']);
if($iter=="1") {$colour="CC0000";} elseif($iter=="2") {$colour="008C00";} elseif($iter=="3") {$colour="4096EE";
} elseif($iter=="4") {$colour="73880A";} elseif($iter=="5") {$colour="D01F3C";} elseif($iter=="6") {$colour="36393D";
} elseif($iter=="7") {$colour="FF0084"; $iter = "0"; }
$descr = substr(str_pad($storage[storage_descr], 12),0,12);
$descr = str_replace(":","\:",$descr);
$rrd_options .= " DEF:$storage[storage_id]used=$rrd_filename:used:AVERAGE";
$rrd_options .= " DEF:$storage[storage_id]free=$rrd_filename:free:AVERAGE";
$rrd_options .= " CDEF:$storage[storage_id]size=$storage[storage_id]used,$storage[storage_id]free,+";
$rrd_options .= " CDEF:$storage[storage_id]perc=$storage[storage_id]used,$storage[storage_id]size,/,100,*";
$rrd_options .= " LINE1.25:$storage[storage_id]perc#" . $colour . ":'$descr'";
$rrd_options .= " GPRINT:$storage[storage_id]size:LAST:%6.2lf%sB";
$rrd_options .= " GPRINT:$storage[storage_id]free:LAST:%6.2lf%sB";
$rrd_options .= " GPRINT:$storage[storage_id]perc:LAST:%5.2lf%%\\\\n";
$iter++;
if ($iter=="1") { $colour="CC0000"; } elseif ($iter=="2") { $colour="008C00"; } elseif ($iter=="3") { $colour="4096EE"; }
elseif ($iter=="4") { $colour="73880A"; } elseif ($iter=="5") { $colour="D01F3C"; } elseif ($iter=="6") { $colour="36393D"; }
elseif ($iter=="7") { $colour="FF0084"; $iter = "0"; }
?>
$descr = substr(str_pad($storage[storage_descr], 12),0,12);
$descr = str_replace(":","\:",$descr);
$rrd_options .= " DEF:$storage[storage_id]used=$rrd_filename:used:AVERAGE";
$rrd_options .= " DEF:$storage[storage_id]free=$rrd_filename:free:AVERAGE";
$rrd_options .= " CDEF:$storage[storage_id]size=$storage[storage_id]used,$storage[storage_id]free,+";
$rrd_options .= " CDEF:$storage[storage_id]perc=$storage[storage_id]used,$storage[storage_id]size,/,100,*";
$rrd_options .= " LINE1.25:$storage[storage_id]perc#" . $colour . ":'$descr'";
$rrd_options .= " GPRINT:$storage[storage_id]size:LAST:%6.2lf%sB";
$rrd_options .= " GPRINT:$storage[storage_id]free:LAST:%6.2lf%sB";
$rrd_options .= " GPRINT:$storage[storage_id]perc:LAST:%5.2lf%%\\\\n";
$iter++;
?>