From e6eae49d0f863bb029a3360c5812a07f76f4814b Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Fri, 7 Oct 2011 23:05:50 +0000 Subject: [PATCH] mroe mysql fixes git-svn-id: http://www.observium.org/svn/observer/trunk@2670 61d68cd4-352d-0410-923a-c4978735b2b8 --- .../application/mysql_innodb_io.inc.php | 18 ++++++++--------- .../application/mysql_innodb_log.inc.php | 16 +++++++-------- .../application/mysql_network_traffic.inc.php | 20 +++++-------------- 3 files changed, 22 insertions(+), 32 deletions(-) diff --git a/html/includes/graphs/application/mysql_innodb_io.inc.php b/html/includes/graphs/application/mysql_innodb_io.inc.php index 139e82123..8af3ff1b6 100644 --- a/html/includes/graphs/application/mysql_innodb_io.inc.php +++ b/html/includes/graphs/application/mysql_innodb_io.inc.php @@ -16,24 +16,24 @@ $rrd_options .= ' DEF:d='.$rrd_filename.':IBIFSc:AVERAGE '; $rrd_options .= 'COMMENT:" Current Average Maximum\n" '; -$rrd_options .= 'LINE1:a#22FF22:"File Reads"\ \ '; +$rrd_options .= 'LINE1:a#22FF22:"File Reads " '; $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 .= 'GPRINT:a:MAX:"%6.2lf %s\\n" '; -$rrd_options .= 'LINE1:b#0022FF:"File Writes"\ \ '; +$rrd_options .= 'LINE1:b#0022FF:"File Writes " '; $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 .= 'GPRINT:b:MAX:"%6.2lf %s\\n" '; -$rrd_options .= 'LINE1:c#FF0000:"Log Writes"\ \ '; +$rrd_options .= 'LINE1:c#FF0000:"Log Writes " '; $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 .= 'GPRINT:c:MAX:"%6.2lf %s\\n" '; -$rrd_options .= 'LINE1:d#00AAAA:"File syncs"\ \ '; +$rrd_options .= 'LINE1:d#00AAAA:"File syncs " '; $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 .= 'GPRINT:d: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 43e995c06..89750845d 100644 --- a/html/includes/graphs/application/mysql_innodb_log.inc.php +++ b/html/includes/graphs/application/mysql_innodb_log.inc.php @@ -13,21 +13,21 @@ $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 .= 'COMMENT:" Current Average Maximum\n" '; -$rrd_options .= 'AREA:a#FAFD9E:"Buffer Size"\ \ '; +$rrd_options .= 'AREA:a#FAFD9E:"Buffer Size " '; $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 .= 'GPRINT:a:MAX:"%6.2lf %s\\n" '; -$rrd_options .= 'LINE1:b#22FF22:"KB Flushed"\ \ '; +$rrd_options .= 'LINE1:b#22FF22:"KB Flushed " '; $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 .= 'GPRINT:b:MAX:"%6.2lf %s\\n" '; -$rrd_options .= 'LINE1:c#0022FF:"KB Written"\ \ '; +$rrd_options .= 'LINE1:c#0022FF:"KB Written " '; $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 .= 'GPRINT:c: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 08835450d..171a2d9b1 100644 --- a/html/includes/graphs/application/mysql_network_traffic.inc.php +++ b/html/includes/graphs/application/mysql_network_traffic.inc.php @@ -9,21 +9,11 @@ if (is_file($mysql_rrd)) $rrd_filename = $mysql_rrd; } -$rrd_options .= ' -b 1024 '; -$rrd_options .= ' DEF:a='.$rrd_filename.':BRd:AVERAGE '; -$rrd_options .= ' DEF:b='.$rrd_filename.':BSt:AVERAGE '; -$rrd_options .= ' CDEF:c=a,-1,* '; +$multiplier = 8; -$rrd_options .= 'COMMENT:" Current Average Maximum\n" '; +$ds_in = "BRd"; +$ds_out = "BSt"; -$rrd_options .= 'LINE2:c#00AA00:"Bytes read"\ \ '; -$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" '; +include("includes/graphs/generic_bits.inc.php"); -$rrd_options .= 'LINE2:b#00AA00:"Bytes sent"\ \ '; -$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 +?>