diff --git a/html/includes/graphs/application/apache_bytes.inc.php b/html/includes/graphs/application/apache_bytes.inc.php
index 677dece2de..9041ab3956 100755
--- a/html/includes/graphs/application/apache_bytes.inc.php
+++ b/html/includes/graphs/application/apache_bytes.inc.php
@@ -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");
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/application/apache_cpu.inc.php b/html/includes/graphs/application/apache_cpu.inc.php
index c41a98378c..2e45037f09 100755
--- a/html/includes/graphs/application/apache_cpu.inc.php
+++ b/html/includes/graphs/application/apache_cpu.inc.php
@@ -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");
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/application/apache_hits.inc.php b/html/includes/graphs/application/apache_hits.inc.php
index 061caaf3cf..5bd1f59367 100755
--- a/html/includes/graphs/application/apache_hits.inc.php
+++ b/html/includes/graphs/application/apache_hits.inc.php
@@ -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");
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/application/apache_scoreboard.inc.php b/html/includes/graphs/application/apache_scoreboard.inc.php
index 70c5733b2f..b4340f6791 100755
--- a/html/includes/graphs/application/apache_scoreboard.inc.php
+++ b/html/includes/graphs/application/apache_scoreboard.inc.php
@@ -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"';
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/application/auth.inc.php b/html/includes/graphs/application/auth.inc.php
index b3e9aba257..97ea42a529 100644
--- a/html/includes/graphs/application/auth.inc.php
+++ b/html/includes/graphs/application/auth.inc.php
@@ -1,6 +1,6 @@
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/application/mysql_command_counters.inc.php b/html/includes/graphs/application/mysql_command_counters.inc.php
index 38a2df1077..8e484318a5 100644
--- a/html/includes/graphs/application/mysql_command_counters.inc.php
+++ b/html/includes/graphs/application/mysql_command_counters.inc.php
@@ -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" ';
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/application/mysql_connections.inc.php b/html/includes/graphs/application/mysql_connections.inc.php
index 4ec7fc3515..ef03c046ee 100644
--- a/html/includes/graphs/application/mysql_connections.inc.php
+++ b/html/includes/graphs/application/mysql_connections.inc.php
@@ -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" ';
-
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/application/mysql_files_tables.inc.php b/html/includes/graphs/application/mysql_files_tables.inc.php
index bbba4f3173..fe11654dcc 100644
--- a/html/includes/graphs/application/mysql_files_tables.inc.php
+++ b/html/includes/graphs/application/mysql_files_tables.inc.php
@@ -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" ';
-
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/application/mysql_innodb_buffer_pool.inc.php b/html/includes/graphs/application/mysql_innodb_buffer_pool.inc.php
index 507bbae3bb..2d40d3a4df 100644
--- a/html/includes/graphs/application/mysql_innodb_buffer_pool.inc.php
+++ b/html/includes/graphs/application/mysql_innodb_buffer_pool.inc.php
@@ -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" ';
-
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/application/mysql_innodb_buffer_pool_activity.inc.php b/html/includes/graphs/application/mysql_innodb_buffer_pool_activity.inc.php
index 9d96f7a7f0..f60ff06987 100644
--- a/html/includes/graphs/application/mysql_innodb_buffer_pool_activity.inc.php
+++ b/html/includes/graphs/application/mysql_innodb_buffer_pool_activity.inc.php
@@ -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" ';
-?>
+
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/application/mysql_innodb_insert_buffer.inc.php b/html/includes/graphs/application/mysql_innodb_insert_buffer.inc.php
index f7ad6de059..b219f3177c 100644
--- a/html/includes/graphs/application/mysql_innodb_insert_buffer.inc.php
+++ b/html/includes/graphs/application/mysql_innodb_insert_buffer.inc.php
@@ -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" ';
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/application/mysql_innodb_io.inc.php b/html/includes/graphs/application/mysql_innodb_io.inc.php
index bb9f44bc75..139e82123e 100644
--- a/html/includes/graphs/application/mysql_innodb_io.inc.php
+++ b/html/includes/graphs/application/mysql_innodb_io.inc.php
@@ -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" ';
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/application/mysql_innodb_io_pending.inc.php b/html/includes/graphs/application/mysql_innodb_io_pending.inc.php
index fe59ee63bc..6d9084dfea 100644
--- a/html/includes/graphs/application/mysql_innodb_io_pending.inc.php
+++ b/html/includes/graphs/application/mysql_innodb_io_pending.inc.php
@@ -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" ';
-?>
+
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/application/mysql_innodb_log.inc.php b/html/includes/graphs/application/mysql_innodb_log.inc.php
index 4d83f2154b..43e995c06f 100644
--- a/html/includes/graphs/application/mysql_innodb_log.inc.php
+++ b/html/includes/graphs/application/mysql_innodb_log.inc.php
@@ -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" ';
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/application/mysql_innodb_row_operations.inc.php b/html/includes/graphs/application/mysql_innodb_row_operations.inc.php
index bf4c707a5a..51a3e2223c 100644
--- a/html/includes/graphs/application/mysql_innodb_row_operations.inc.php
+++ b/html/includes/graphs/application/mysql_innodb_row_operations.inc.php
@@ -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" ';
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/application/mysql_innodb_semaphores.inc.php b/html/includes/graphs/application/mysql_innodb_semaphores.inc.php
index 4a05e976b1..48b7738124 100644
--- a/html/includes/graphs/application/mysql_innodb_semaphores.inc.php
+++ b/html/includes/graphs/application/mysql_innodb_semaphores.inc.php
@@ -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" ';
-?>
+
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/application/mysql_innodb_transactions.inc.php b/html/includes/graphs/application/mysql_innodb_transactions.inc.php
index 403b56f188..e97ee08a8f 100644
--- a/html/includes/graphs/application/mysql_innodb_transactions.inc.php
+++ b/html/includes/graphs/application/mysql_innodb_transactions.inc.php
@@ -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" ';
-?>
+
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/application/mysql_myisam_indexes.inc.php b/html/includes/graphs/application/mysql_myisam_indexes.inc.php
index ce6abe8441..19496722ba 100644
--- a/html/includes/graphs/application/mysql_myisam_indexes.inc.php
+++ b/html/includes/graphs/application/mysql_myisam_indexes.inc.php
@@ -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" ';
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/application/mysql_network_traffic.inc.php b/html/includes/graphs/application/mysql_network_traffic.inc.php
index b30d847a49..00c4440be3 100644
--- a/html/includes/graphs/application/mysql_network_traffic.inc.php
+++ b/html/includes/graphs/application/mysql_network_traffic.inc.php
@@ -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" ';
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/application/mysql_query_cache.inc.php b/html/includes/graphs/application/mysql_query_cache.inc.php
index b1f831e971..df635bf717 100644
--- a/html/includes/graphs/application/mysql_query_cache.inc.php
+++ b/html/includes/graphs/application/mysql_query_cache.inc.php
@@ -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" ';
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/application/mysql_query_cache_memory.inc.php b/html/includes/graphs/application/mysql_query_cache_memory.inc.php
index 5c144fd3e3..413bba45f0 100644
--- a/html/includes/graphs/application/mysql_query_cache_memory.inc.php
+++ b/html/includes/graphs/application/mysql_query_cache_memory.inc.php
@@ -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" ';
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/application/mysql_select_types.inc.php b/html/includes/graphs/application/mysql_select_types.inc.php
index 03306fd992..27b9ab262f 100644
--- a/html/includes/graphs/application/mysql_select_types.inc.php
+++ b/html/includes/graphs/application/mysql_select_types.inc.php
@@ -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" ';
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/application/mysql_slow_queries.inc.php b/html/includes/graphs/application/mysql_slow_queries.inc.php
index 287e8ffd8f..40b58a4a9e 100644
--- a/html/includes/graphs/application/mysql_slow_queries.inc.php
+++ b/html/includes/graphs/application/mysql_slow_queries.inc.php
@@ -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" ';
-
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/application/mysql_sorts.inc.php b/html/includes/graphs/application/mysql_sorts.inc.php
index 4006003e23..0c724cf5fc 100644
--- a/html/includes/graphs/application/mysql_sorts.inc.php
+++ b/html/includes/graphs/application/mysql_sorts.inc.php
@@ -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" ';
-?>
+
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/application/mysql_table_locks.inc.php b/html/includes/graphs/application/mysql_table_locks.inc.php
index bbe5f49293..d9ce6c0513 100644
--- a/html/includes/graphs/application/mysql_table_locks.inc.php
+++ b/html/includes/graphs/application/mysql_table_locks.inc.php
@@ -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" ';
-
-
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/application/mysql_temporary_objects.inc.php b/html/includes/graphs/application/mysql_temporary_objects.inc.php
index 9c835322d3..e95b08d3a6 100644
--- a/html/includes/graphs/application/mysql_temporary_objects.inc.php
+++ b/html/includes/graphs/application/mysql_temporary_objects.inc.php
@@ -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" ';
-
-
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/application/nginx_connections.inc.php b/html/includes/graphs/application/nginx_connections.inc.php
index 9d1f3da23f..e06c0c21b3 100644
--- a/html/includes/graphs/application/nginx_connections.inc.php
+++ b/html/includes/graphs/application/nginx_connections.inc.php
@@ -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" ';
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/application/nginx_req.inc.php b/html/includes/graphs/application/nginx_req.inc.php
index 7feda4c0c8..75e5d7c285 100644
--- a/html/includes/graphs/application/nginx_req.inc.php
+++ b/html/includes/graphs/application/nginx_req.inc.php
@@ -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" ';
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/mempool/auth.inc.php b/html/includes/graphs/mempool/auth.inc.php
index 1d9bbca4fe..7c64cd9bca 100755
--- a/html/includes/graphs/mempool/auth.inc.php
+++ b/html/includes/graphs/mempool/auth.inc.php
@@ -1,11 +1,11 @@
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/mempool/usage.inc.php b/html/includes/graphs/mempool/usage.inc.php
index db38b0cfd1..2ccc3f178d 100644
--- a/html/includes/graphs/mempool/usage.inc.php
+++ b/html/includes/graphs/mempool/usage.inc.php
@@ -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";
+
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/service/auth.inc.php b/html/includes/graphs/service/auth.inc.php
index 6f061d9171..c7849f8b79 100644
--- a/html/includes/graphs/service/auth.inc.php
+++ b/html/includes/graphs/service/auth.inc.php
@@ -1,10 +1,10 @@
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/service/availability.inc.php b/html/includes/graphs/service/availability.inc.php
index 28c905851d..5dd1e926d6 100755
--- a/html/includes/graphs/service/availability.inc.php
+++ b/html/includes/graphs/service/availability.inc.php
@@ -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";
-
-
-
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/storage/auth.inc.php b/html/includes/graphs/storage/auth.inc.php
index b01d2fc865..21a466fd4a 100755
--- a/html/includes/graphs/storage/auth.inc.php
+++ b/html/includes/graphs/storage/auth.inc.php
@@ -1,11 +1,11 @@
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/storage/usage.inc.php b/html/includes/graphs/storage/usage.inc.php
index c02ad16afb..8022b99a68 100644
--- a/html/includes/graphs/storage/usage.inc.php
+++ b/html/includes/graphs/storage/usage.inc.php
@@ -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++;
+
+?>
\ No newline at end of file