--- xymongraph.cfg	2011-03-08 12:39:39.000000000 +0100
+++ xymongraph.new.cfg	2011-03-11 16:22:45.000000000 +0100
@@ -25,92 +25,93 @@
 # Most of these RRD definitions are from the larrd-grapher.cgi from LARRD 0.43c.
 
 [la]
-	TITLE CPU Load
-	YAXIS Load
+	TITLE , CPU load  
+	YAXIS Load []
+	-l 0
 	DEF:avg=la.rrd:la:AVERAGE
 	CDEF:la=avg,100,/
-	AREA:la#00CC00:CPU Load Average
+	AREA:la#00CC00:CPU_load
 	-u 1.0
-	GPRINT:la:LAST: \: %5.1lf (cur)
-	GPRINT:la:MAX: \: %5.1lf (max)
-	GPRINT:la:MIN: \: %5.1lf (min)
-	GPRINT:la:AVERAGE: \: %5.1lf (avg)\n
+	GPRINT:la:MIN:Min\: %5.3lf
+	GPRINT:la:MAX:Max\: %5.3lf
+	GPRINT:la:AVERAGE:Avg\: %5.3lf
+	GPRINT:la:LAST:Cur\: %5.3lf\n
 
 [la-multi]
-	TITLE Multi-host CPU Load
-	YAXIS Load
-	FNPATTERN ^la.rrd
+	TITLE , Multi-host CPU load  
+	YAXIS Load []
+	FNPATTERN ^la\.rrd$
 	DEF:avg@RRDIDX@=@RRDFN@:la:AVERAGE
 	CDEF:la@RRDIDX@=avg@RRDIDX@,100,/
-	LINE2:la@RRDIDX@#@COLOR@:@RRDPARAM@
+	LINE1:la@RRDIDX@#@COLOR@:@RRDPARAM@
 	-u 1.0
-	GPRINT:la@RRDIDX@:LAST: \: %5.1lf (cur)
-	GPRINT:la@RRDIDX@:MAX: \: %5.1lf (max)
-	GPRINT:la@RRDIDX@:MIN: \: %5.1lf (min)
-	GPRINT:la@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
+	GPRINT:la@RRDIDX@:MIN:Min\: %5.3lf
+	GPRINT:la@RRDIDX@:MAX:Max\: %5.3lf
+	GPRINT:la@RRDIDX@:AVERAGE:Avg\: %5.3lf
+	GPRINT:la@RRDIDX@:LAST:Cur\: %5.3lf\n
 
 [la1]
-	TITLE CPU Utilitization
-	YAXIS % Used
+	TITLE , CPU Utilitization  
+	YAXIS Utilization [%]
 	-u 100
 	-r
 	DEF:cpu_idl=vmstat.rrd:cpu_idl:AVERAGE
 	CDEF:pbusy=100,cpu_idl,-
-	LINE2:pbusy#00CC00:% CPU busy
-	GPRINT:pbusy:LAST: \: %5.1lf (cur)
-	GPRINT:pbusy:MAX: \: %5.1lf (max)
-	GPRINT:pbusy:MIN: \: %5.1lf (min)
-	GPRINT:pbusy:AVERAGE: \: %5.1lf (avg)\n
+	LINE1:pbusy#00CC00:CPU
+	GPRINT:pbusy:MIN:Min\: %5.1lf
+	GPRINT:pbusy:MAX:Max\: %5.1lf
+	GPRINT:pbusy:AVERAGE:Avg\: %5.1lf
+	GPRINT:pbusy:LAST:Cur\: %5.1lf\n
 
 [la1-multi]
 	TITLE Multi-host CPU Utilitization
 	YAXIS % Used
-	FNPATTERN ^vmstat.rrd
+	FNPATTERN ^vmstat\.rrd$
 	-u 100
 	-r
 	DEF:cpu_idl@RRDIDX@=@RRDFN@:cpu_idl:AVERAGE
 	CDEF:pbusy@RRDIDX@=100,cpu_idl@RRDIDX@,-
-	LINE2:pbusy@RRDIDX@#@COLOR@:@RRDPARAM@
-	GPRINT:pbusy@RRDIDX@:LAST: \: %5.1lf (cur)
-	GPRINT:pbusy@RRDIDX@:MAX: \: %5.1lf (max)
-	GPRINT:pbusy@RRDIDX@:MIN: \: %5.1lf (min)
-	GPRINT:pbusy@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
+	LINE1:pbusy@RRDIDX@#@COLOR@:@RRDPARAM@
+	GPRINT:pbusy@RRDIDX@:MIN:Min\: %5.1lf
+	GPRINT:pbusy@RRDIDX@:MAX:Max\: %5.1lf
+	GPRINT:pbusy@RRDIDX@:AVERAGE:Avg\: %5.1lf
+	GPRINT:pbusy@RRDIDX@:LAST:Cur\: %5.1lf\n
 
 [clock]
-	TITLE Clock offset
-	YAXIS Seconds
+	TITLE , Clock offset  
+	YAXIS Offset [s]
 	DEF:offset=clock.rrd:la:AVERAGE
-	LINE2:offset#00CC00:Seconds
-	GPRINT:offset:LAST: \: %5.1lf (cur)
-	GPRINT:offset:MAX: \: %5.1lf (max)
-	GPRINT:offset:MIN: \: %5.1lf (min)
-	GPRINT:offset:AVERAGE: \: %5.1lf (avg)\n
+	LINE1:offset#00CC00:Offset
+	GPRINT:offset:MIN:Min\: %5.1lf %ss
+	GPRINT:offset:MAX:Max\: %5.1lf %ss
+	GPRINT:offset:AVERAGE:Avg\: %5.1lf %ss
+	GPRINT:offset:LAST:Cur\: %5.1lf %ss\n
 
 [disk]
-	FNPATTERN ^disk(.*).rrd
-	TITLE Disk Utilization
-	YAXIS % Full
+	FNPATTERN ^disk(.*)\.rrd$
+	TITLE , Disk utilization  
+	YAXIS Utilization [%]
 	DEF:p@RRDIDX@=@RRDFN@:pct:AVERAGE
-	LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@
+	LINE1:p@RRDIDX@#@COLOR@:@RRDPARAM@
 	-u 100
 	-l 0
-	GPRINT:p@RRDIDX@:LAST: \: %5.1lf (cur)
-	GPRINT:p@RRDIDX@:MAX: \: %5.1lf (max)
-	GPRINT:p@RRDIDX@:MIN: \: %5.1lf (min)
-	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
+	GPRINT:p@RRDIDX@:MIN:Min\: %5.1lf
+	GPRINT:p@RRDIDX@:MAX:Max\: %5.1lf
+	GPRINT:p@RRDIDX@:AVERAGE:Avg\: %5.1lf
+	GPRINT:p@RRDIDX@:LAST:Cur\: %5.1lf\n
 
 [disk1]
-	FNPATTERN ^disk(.*).rrd
-	TITLE Disk Utilization
-	YAXIS Used
+	FNPATTERN ^disk,(.+)\.rrd$
+	TITLE , Disk utilization  
+	YAXIS Used [B]
 	DEF:p@RRDIDX@=@RRDFN@:used:AVERAGE
 	CDEF:p@RRDIDX@t=p@RRDIDX@,1024,*
-	LINE2:p@RRDIDX@t#@COLOR@:@RRDPARAM@
+	LINE1:p@RRDIDX@t#@COLOR@:@RRDPARAM@
 	-l 0
-	GPRINT:p@RRDIDX@:LAST: \: %5.1lf KB (cur)
-	GPRINT:p@RRDIDX@:MAX: \: %5.1lf KB (max)
-	GPRINT:p@RRDIDX@:MIN: \: %5.1lf KB (min)
-	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf KB (avg)\n
+	GPRINT:p@RRDIDX@t:MIN:Min\: %5.1lf %sB
+	GPRINT:p@RRDIDX@t:MAX:Max\: %5.1lf %sB
+	GPRINT:p@RRDIDX@t:AVERAGE:Avg\: %5.1lf %sB
+	GPRINT:p@RRDIDX@t:LAST:Cur\: %5.1lf %sB\n
 
 # The qtree graphs are based on the qtree report from filerstats2bb.pl
 # These handle NetApp storage devices.
@@ -145,17 +146,16 @@
 	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
 
 [memory]
-	FNPATTERN ^memory.(.+).rrd
-	TITLE Memory Utilization
-	YAXIS % Used
+	FNPATTERN ^memory\.(.+)\.rrd$
+	TITLE , Memory utilization  
+	YAXIS Utilization [%]
 	DEF:p@RRDIDX@=@RRDFN@:realmempct:AVERAGE
-	LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@
+	LINE1:p@RRDIDX@#@COLOR@:@RRDPARAM@
 	-u 100
-	-b 1024
-	GPRINT:p@RRDIDX@:LAST: \: %5.1lf (cur)
-	GPRINT:p@RRDIDX@:MAX: \: %5.1lf (max)
-	GPRINT:p@RRDIDX@:MIN: \: %5.1lf (min)
-	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
+	GPRINT:p@RRDIDX@:MIN:Min\: %5.1lf
+	GPRINT:p@RRDIDX@:MAX:Max\: %5.1lf
+	GPRINT:p@RRDIDX@:AVERAGE:Avg\: %5.1lf
+	GPRINT:p@RRDIDX@:LAST:Cur\: %5.1lf\n
 
 [ram]
 	TITLE RAM Utilization
@@ -171,7 +171,7 @@
 
 [ram-multi]
 	TITLE Multi-host RAM Utilization
-	FNPATTERN ^memory.real.rrd
+	FNPATTERN ^memory\.real\.rrd$
 	YAXIS % Used
 	DEF:p@RRDIDX@=@RRDFN@:realmempct:AVERAGE
 	LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@
@@ -196,7 +196,7 @@
 
 [swap-multi]
 	TITLE Multi-host Swap Utilization
-	FNPATTERN ^memory.swap.rrd
+	FNPATTERN ^memory\.swap\.rrd$
 	YAXIS % Used
 	DEF:p@RRDIDX@=@RRDFN@:realmempct:AVERAGE
 	LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@
@@ -221,7 +221,7 @@
 
 [mem-multi]
 	TITLE Multi-host Actual Memory Utilization
-	FNPATTERN ^memory.actual.rrd
+	FNPATTERN ^memory\.actual\.rrd$
 	YAXIS % Used
 	DEF:p@RRDIDX@=@RRDFN@:realmempct:AVERAGE
 	LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@
@@ -233,25 +233,24 @@
 	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
 
 [users]
-	TITLE Users and Processes
-	YAXIS #
+	TITLE , Users and processes  
+	YAXIS Count []
 	DEF:p=procs.rrd:la:AVERAGE
 	DEF:u=users.rrd:la:AVERAGE
 	AREA:p#00CC00:Processes
+	GPRINT:p:MIN:Min\: %5.1lf %s
+	GPRINT:p:MAX:Max\: %5.1lf %s
+	GPRINT:p:AVERAGE:Avg\: %5.1lf %s
+	GPRINT:p:LAST:Cur\: %5.1lf %s\n
 	LINE1:u#000099:Users
-	COMMENT:\n
-	GPRINT:p:LAST:Processes   \: %5.1lf%s (cur)
-	GPRINT:p:MAX: \: %5.1lf%s (max)
-	GPRINT:p:MIN: \: %5.1lf%s (min)
-	GPRINT:p:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:u:LAST:Users       \: %5.1lf%s (cur)
-	GPRINT:u:MAX: \: %5.1lf%s (max)
-	GPRINT:u:MIN: \: %5.1lf%s (min)
-	GPRINT:u:AVERAGE: \: %5.1lf%s (avg)\n
+	GPRINT:u:MIN:    Min\: %5.1lf %s
+	GPRINT:u:MAX:Max\: %5.1lf %s
+	GPRINT:u:AVERAGE:Avg\: %5.1lf %s
+	GPRINT:u:LAST:Cur\: %5.1lf %s\n
 
 [users-multi]
 	TITLE Multi-host users
-	FNPATTERN ^users.rrd
+	FNPATTERN ^users\.rrd$
 	YAXIS #
 	DEF:u@RRDIDX@=@RRDFN@:la:AVERAGE
 	LINE2:u@RRDIDX@#@COLOR@:@RRDPARAM@
@@ -261,41 +260,43 @@
 	GPRINT:u@RRDIDX@:MIN: \: %5.1lf%s (min)
 	GPRINT:u@RRDIDX@:AVERAGE: \: %5.1lf%s (avg)\n
 
+# TCP tests - include all, except the HTTP tests as they tend to have
+# much longer response times than the normal tcp tests.
+#
 [tcp]
-	# TCP tests - include all, except the HTTP tests as they tend to have
-	# much longer response times than the normal tcp tests.
-	FNPATTERN ^tcp.(.+).rrd
-	EXFNPATTERN ^tcp.http.(.+).rrd
-	TITLE TCP Connection Times
-	YAXIS Seconds
+	FNPATTERN ^tcp\.(.+)\.rrd$
+	EXFNPATTERN ^tcp\.http\..+\.rrd$
+	TITLE , TCP connection time  
+	YAXIS Time [s]
+	-l 0
 	DEF:p@RRDIDX@=@RRDFN@:sec:AVERAGE
-	LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@
-	GPRINT:p@RRDIDX@:LAST: \: %5.1lf%s (cur)
-	GPRINT:p@RRDIDX@:MAX: \: %5.1lf%s (max)
-	GPRINT:p@RRDIDX@:MIN: \: %5.1lf%s (min)
-	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf%s (avg)\n
+	LINE1:p@RRDIDX@#@COLOR@:@RRDPARAM@
+	GPRINT:p@RRDIDX@:MIN:Min\: %5.1lf %ss
+	GPRINT:p@RRDIDX@:MAX:Max\: %5.1lf %ss
+	GPRINT:p@RRDIDX@:AVERAGE:Avg\: %5.1lf %ss
+	GPRINT:p@RRDIDX@:LAST:Cur\: %5.1lf %ss\n
 
 [http]
-	FNPATTERN ^tcp.http.(.+).rrd
-	TITLE HTTP Response Times
-	YAXIS Seconds
+	FNPATTERN ^tcp\.http\.(.+)\.rrd$
+	TITLE , HTTP response time  
+	YAXIS Time [s]
 	DEF:p@RRDIDX@=@RRDFN@:sec:AVERAGE
-	LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@
-	GPRINT:p@RRDIDX@:LAST: \: %5.1lf%s (cur)
-	GPRINT:p@RRDIDX@:MAX: \: %5.1lf%s (max)
-	GPRINT:p@RRDIDX@:MIN: \: %5.1lf%s (min)
-	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf%s (avg)\n
+	LINE1:p@RRDIDX@#@COLOR@:@RRDPARAM@
+	GPRINT:p@RRDIDX@:MIN:Min\: %5.1lf %ss
+	GPRINT:p@RRDIDX@:MAX:Max\: %5.1lf %ss
+	GPRINT:p@RRDIDX@:AVERAGE:Avg\: %5.1lf %ss
+	GPRINT:p@RRDIDX@:LAST:Cur\: %5.1lf %ss\n
 
 [conn-multi]
-	FNPATTERN ^tcp.conn.rrd
+	FNPATTERN ^tcp\.conn\.rrd$
 	TITLE PING Round-trip time
-	YAXIS Seconds
+	YAXIS Time [s]
 	DEF:p@RRDIDX@=@RRDFN@:sec:AVERAGE
-	LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@
-	GPRINT:p@RRDIDX@:LAST: \: %5.1lf%s (cur)
-	GPRINT:p@RRDIDX@:MAX: \: %5.1lf%s (max)
-	GPRINT:p@RRDIDX@:MIN: \: %5.1lf%s (min)
-	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf%s (avg)\n
+	LINE1:p@RRDIDX@#@COLOR@:@RRDPARAM@
+	GPRINT:p@RRDIDX@:MIN:Min \: %5.1lf %ss
+	GPRINT:p@RRDIDX@:MAX:Max \: %5.1lf %ss
+	GPRINT:p@RRDIDX@:AVERAGE:Avg \: %5.1lf %ss
+	GPRINT:p@RRDIDX@:LAST:Cur \: %5.1lf %ss\n
 
 [ntpstat]
 	TITLE NTP accuracy
@@ -309,29 +310,35 @@
 	GPRINT:u:AVERAGE: \: %5.2lf ms (avg)\n
 
 [vmstat]
-	TITLE CPU Utilization
-	YAXIS % Load
+	TITLE , CPU utilization  
+	YAXIS Utilization [%]
 	-u 100
 	-r
 	DEF:cpu_idl=vmstat.rrd:cpu_idl:AVERAGE
 	DEF:cpu_usr=vmstat.rrd:cpu_usr:AVERAGE
 	DEF:cpu_sys=vmstat.rrd:cpu_sys:AVERAGE
-	AREA:cpu_sys#FF0000:System
-	STACK:cpu_usr#FFFF00:User
-	STACK:cpu_idl#00FF00:Idle
-	COMMENT:\n
-	GPRINT:cpu_sys:LAST:System  \: %5.1lf (cur)
-	GPRINT:cpu_sys:MAX: \: %5.1lf (max)
-	GPRINT:cpu_sys:MIN: \: %5.1lf (min)
-	GPRINT:cpu_sys:AVERAGE: \: %5.1lf (avg)\n
-	GPRINT:cpu_usr:LAST:User    \: %5.1lf (cur)
-	GPRINT:cpu_usr:MAX: \: %5.1lf (max)
-	GPRINT:cpu_usr:MIN: \: %5.1lf (min)
-	GPRINT:cpu_usr:AVERAGE: \: %5.1lf (avg)\n
-	GPRINT:cpu_idl:LAST:Idle    \: %5.1lf (cur)
-	GPRINT:cpu_idl:MAX: \: %5.1lf (max)
-	GPRINT:cpu_idl:MIN: \: %5.1lf (min)
-	GPRINT:cpu_idl:AVERAGE: \: %5.1lf (avg)\n
+	DEF:cpu_wait=vmstat.rrd:cpu_wait:AVERAGE
+	AREA:cpu_sys#FF0000:System:STACK
+	AREA:cpu_wait#774400:I/O wait:STACK
+	AREA:cpu_usr#FFFF00:User:STACK
+	AREA:cpu_idl#00FF00:Idle:STACK
+	COMMENT:\n
+	GPRINT:cpu_sys:MIN:System  \:  Min\: %5.1lf
+	GPRINT:cpu_sys:MAX:Max\: %5.1lf
+	GPRINT:cpu_sys:AVERAGE:Avg\: %5.1lf
+	GPRINT:cpu_sys:LAST:Cur\: %5.1lf\n
+	GPRINT:cpu_wait:MIN:I/O wait\:  Min\: %5.1lf
+	GPRINT:cpu_wait:MAX:Max\: %5.1lf
+	GPRINT:cpu_wait:AVERAGE:Avg\: %5.1lf
+	GPRINT:cpu_wait:LAST:Cur\: %5.1lf\n
+	GPRINT:cpu_usr:MIN:User    \:  Min\: %5.1lf
+	GPRINT:cpu_usr:MAX:Max\: %5.1lf
+	GPRINT:cpu_usr:AVERAGE:Avg\: %5.1lf
+	GPRINT:cpu_usr:LAST:Cur\: %5.1lf\n
+	GPRINT:cpu_idl:MIN:Idle    \:  Min\: %5.1lf
+	GPRINT:cpu_idl:MAX:Max\: %5.1lf
+	GPRINT:cpu_idl:AVERAGE:Avg\: %5.1lf
+	GPRINT:cpu_idl:LAST:Cur\: %5.1lf\n
 
 [vmstat1]
 	TITLE CPU Utilization
@@ -341,25 +348,18 @@
 	DEF:cpu_idl=vmstat.rrd:cpu_idl:AVERAGE
 	DEF:cpu_usr=vmstat.rrd:cpu_usr:AVERAGE
 	DEF:cpu_sys=vmstat.rrd:cpu_sys:AVERAGE
-	DEF:cpu_wait=vmstat.rrd:cpu_wait:AVERAGE
 	AREA:cpu_sys#FF0000:System
-	STACK:cpu_wait#774400:I/O wait
-	STACK:cpu_usr#FFFF00:User
-	STACK:cpu_idl#00FF00:Idle
-	COMMENT:\n
-	GPRINT:cpu_sys:LAST:System  \: %5.1lf (cur)
+	GPRINT:cpu_sys:LAST:  \: %5.1lf (cur)
 	GPRINT:cpu_sys:MAX: \: %5.1lf (max)
 	GPRINT:cpu_sys:MIN: \: %5.1lf (min)
 	GPRINT:cpu_sys:AVERAGE: \: %5.1lf (avg)\n
-	GPRINT:cpu_wait:LAST:I/O Wait\: %5.1lf (cur)
-	GPRINT:cpu_wait:MAX: \: %5.1lf (max)
-	GPRINT:cpu_wait:MIN: \: %5.1lf (min)
-	GPRINT:cpu_wait:AVERAGE: \: %5.1lf (avg)\n
-	GPRINT:cpu_usr:LAST:User    \: %5.1lf (cur)
+	STACK:cpu_usr#FFFF00:User
+	GPRINT:cpu_usr:LAST:    \: %5.1lf (cur)
 	GPRINT:cpu_usr:MAX: \: %5.1lf (max)
 	GPRINT:cpu_usr:MIN: \: %5.1lf (min)
 	GPRINT:cpu_usr:AVERAGE: \: %5.1lf (avg)\n
-	GPRINT:cpu_idl:LAST:Idle    \: %5.1lf (cur)
+	STACK:cpu_idl#00FF00:Idle
+	GPRINT:cpu_idl:LAST:    \: %5.1lf (cur)
 	GPRINT:cpu_idl:MAX: \: %5.1lf (max)
 	GPRINT:cpu_idl:MIN: \: %5.1lf (min)
 	GPRINT:cpu_idl:AVERAGE: \: %5.1lf (avg)\n
@@ -438,8 +438,8 @@
 	YAXIS Average blocks/s
 	DEF:bi=vmstat.rrd:dsk_bi:AVERAGE
 	DEF:bo=vmstat.rrd:dsk_bo:AVERAGE
-	LINE2:bi#0000FF:Blocks sent to a block device
-	LINE2:bo#00FF00:Blocks received from a block device
+	LINE1:bi#0000FF:Blocks sent to a block device
+	LINE1:bo#00FF00:Blocks received from a block device
 	COMMENT:\n
 	GPRINT:bi:LAST:Blocks sent to a block device        \: %5.1lf (cur)
 	GPRINT:bi:MAX: \: %5.1lf (max)
@@ -450,8 +450,8 @@
 	GPRINT:bo:MIN: \: %5.1lf (min)
 	GPRINT:bo:AVERAGE: \: %5.1lf (avg)\n
 
+# This graph only works on some OS'es (Solaris)
 [vmstat6]
-	# This graph only works on some OS'es (Solaris)
 	TITLE Memory Utilization
 	YAXIS Size kB
 	-b 1024
@@ -471,8 +471,8 @@
 	GPRINT:sw:MIN: \: %5.1lf%s (min)
 	GPRINT:sw:AVERAGE: \: %5.1lf%s (avg)\n
 
+# This graph only works on some OS'es (Solaris)
 [vmstat7]
-	# This graph only works on some OS'es (Solaris)
 	TITLE Memory Utilization
 	YAXIS Events/s
 	DEF:re=vmstat.rrd:mem_re:AVERAGE
@@ -489,8 +489,8 @@
 	GPRINT:mf:MIN: \: %5.1lf%s (min)
 	GPRINT:mf:AVERAGE: \: %5.1lf%s (avg)\n
 
+# This graph only works on some OS'es (Solaris)
 [vmstat8]
-	# This graph only works on some OS'es (Solaris)
 	TITLE Paging Activity
 	YAXIS kB/s
 	-b 1024
@@ -510,8 +510,8 @@
 	GPRINT:po:MIN: \: %5.1lf%s (min)
 	GPRINT:po:AVERAGE: \: %5.1lf%s (avg)\n
 
+# This graph only works on some OS'es (Solaris)
 [vmstat9]
-	# This graph only works on some OS'es (Solaris)
 	TITLE RAM Scan Rate
 	YAXIS Pages scanned/s
 	DEF:sr=vmstat.rrd:sr:AVERAGE
@@ -522,8 +522,8 @@
 	GPRINT:sr:MIN: \: %5.1lf%s (min)
 	GPRINT:sr:AVERAGE: \: %5.1lf%s (avg)\n
 
+# This graph only works on some OS'es (Solaris)
 [vmstat0]
-	# This graph only works on some OS'es (Solaris)
 	TITLE System Calls
 	YAXIS System Calls/s
 	DEF:cpu_syc=vmstat.rrd:cpu_syc:AVERAGE
@@ -533,8 +533,8 @@
 	GPRINT:cpu_syc:MIN: \: %5.1lf%s (min)
 	GPRINT:cpu_syc:AVERAGE: \: %5.1lf%s (avg)\n
 
+# This one is available on AIX POWER5 systems
 [vmstat-ec]
-	# This one is available on AIX POWER5 systems
 	TITLE Used Entitled CPU Capacity
 	YAXIS ec %
 	DEF:ec=vmstat.rrd:cpu_ec:AVERAGE
@@ -545,8 +545,8 @@
 	GPRINT:ecpct:MIN: \: %5.1lf%s%% (min)
 	GPRINT:ecpct:AVERAGE: \: %5.1lf%s%% (avg)\n
 
+# This one is available on AIX POWER5 systems
 [vmstat-pc]
-	# This one is available on AIX POWER5 systems
 	TITLE Used Physical CPU
 	YAXIS pc (100 = 1 CPU)
 	DEF:pc=vmstat.rrd:cpu_pc:AVERAGE
@@ -558,27 +558,26 @@
 	GPRINT:pcpct:AVERAGE: \: %5.1lf%s (avg)\n
 
 [netstat]
-	TITLE TCP/IP statistics
-	YAXIS Packets/second
+	TITLE , TCP/IP statistics  
+	YAXIS Throughput [p/s]
 	DEF:tcpInInorderPackets=netstat.rrd:tcpInInorderPackets:AVERAGE
 	DEF:tcpOutDataPackets=netstat.rrd:tcpOutDataPackets:AVERAGE
 	DEF:tcpRetransPackets=netstat.rrd:tcpRetransPackets:AVERAGE
-	LINE3:tcpInInorderPackets#00FF00:In 
-	LINE1:tcpOutDataPackets#0000FF:Out 
-	LINE2:tcpRetransPackets#FF0000:Retrans 
-	COMMENT:\n
-	GPRINT:tcpInInorderPackets:LAST:In       \: %5.1lf%s (cur)
-	GPRINT:tcpInInorderPackets:MAX: \: %5.1lf%s (max)
-	GPRINT:tcpInInorderPackets:MIN: \: %5.1lf%s (min)
-	GPRINT:tcpInInorderPackets:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:tcpOutDataPackets:LAST:Out      \: %5.1lf%s (cur)
-	GPRINT:tcpOutDataPackets:MAX: \: %5.1lf%s (max)
-	GPRINT:tcpOutDataPackets:MIN: \: %5.1lf%s (min)
-	GPRINT:tcpOutDataPackets:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:tcpRetransPackets:LAST:Retrans  \: %5.1lf%s (cur)
-	GPRINT:tcpRetransPackets:MAX: \: %5.1lf%s (max)
-	GPRINT:tcpRetransPackets:MIN: \: %5.1lf%s (min)
-	GPRINT:tcpRetransPackets:AVERAGE: \: %5.1lf%s (avg)\n
+	LINE1:tcpInInorderPackets#00FF00:In
+	GPRINT:tcpInInorderPackets:MIN:     Min\: %5.1lf %sp/s
+	GPRINT:tcpInInorderPackets:MAX:Max\: %5.1lf %sp/s
+	GPRINT:tcpInInorderPackets:AVERAGE:Avg\: %5.1lf %sp/s
+	GPRINT:tcpInInorderPackets:LAST:Cur\: %5.1lf %sp/s\n
+	LINE1:tcpOutDataPackets#0000FF:Out
+	GPRINT:tcpOutDataPackets:MIN:    Min\: %5.1lf %sp/s
+	GPRINT:tcpOutDataPackets:MAX:Max\: %5.1lf %sp/s
+	GPRINT:tcpOutDataPackets:AVERAGE:Avg\: %5.1lf %sp/s
+	GPRINT:tcpOutDataPackets:LAST:Cur\: %5.1lf %sp/s\n
+	LINE1:tcpRetransPackets#FF0000:Retrans
+	GPRINT:tcpRetransPackets:MIN:Min\: %5.1lf %sp/s
+	GPRINT:tcpRetransPackets:MAX:Max\: %5.1lf %sp/s
+	GPRINT:tcpRetransPackets:AVERAGE:Avg\: %5.1lf %sp/s
+	GPRINT:tcpRetransPackets:LAST:Cur\: %5.1lf %sp/s\n
 
 [netstat0]
 	TITLE TCP/IP statistics
@@ -589,9 +588,9 @@
 	CDEF:tcpInInorderBits=tcpInInorderBytes,8,*
 	CDEF:tcpOutDataBits=tcpOutDataBytes,8,*
 	CDEF:tcpRetransBits=tcpRetransBytes,8,*
-	LINE3:tcpInInorderBits#00FF00:In 
-	LINE1:tcpOutDataBits#0000FF:Out 
-	LINE2:tcpRetransBits#FF0000:Retrans 
+	LINE3:tcpInInorderBits#00FF00:In
+	LINE1:tcpOutDataBits#0000FF:Out
+	LINE2:tcpRetransBits#FF0000:Retrans
 	COMMENT:\n
 	GPRINT:tcpInInorderBits:LAST:In       \: %5.1lf%s (cur)
 	GPRINT:tcpInInorderBits:MAX: \: %5.1lf%s (max)
@@ -672,7 +671,7 @@
 [netstat3-multi]
 	TITLE Multi-host TCP Connections
 	YAXIS # Connections
-	FNPATTERN ^netstat.rrd
+	FNPATTERN ^netstat\.rrd$
 	DEF:tcpCurrEstab@RRDIDX@=@RRDFN@:tcpCurrEstab:AVERAGE
 	LINE2:tcpCurrEstab@RRDIDX@#@COLOR@:@RRDPARAM@
 	GPRINT:tcpCurrEstab@RRDIDX@:LAST:# Est. \: %5.1lf%s (cur)
@@ -682,18 +681,23 @@
 
 [iostat]
 	TITLE I/O Utilization
-	YAXIS % time 
-	FNPATTERN ^iostat.(.+).rrd
+	YAXIS Stats
+	FNPATTERN ^iostat\.(.+)\.rrd$
 	DEF:p@RRDIDX@B=@RRDFN@:b:AVERAGE
-	DEF:p@RRDIDX@W=@RRDFN@:w:AVERAGE
-	LINE1:p@RRDIDX@B#@COLOR@:@RRDPARAM@ busy
-	LINE1:p@RRDIDX@B#@COLOR@:@RRDPARAM@ wait
+	DEF:p@RRDIDX@A=@RRDFN@:asvc_t:AVERAGE
+	DEF:p@RRDIDX@W=@RRDFN@:wsvc_t:AVERAGE
+	CDEF:p@RRDIDX@t=p@RRDIDX@B,5,GT,p@RRDIDX@B,UNKN,IF
+	LINE1:p@RRDIDX@t#@COLOR@:@RRDPARAM@
 	COMMENT:\n
-	GPRINT:p@RRDIDX@B:LAST:Busy    \: %5.1lf (cur)
+	GPRINT:p@RRDIDX@B:LAST:B       \: %5.1lf (cur)
 	GPRINT:p@RRDIDX@B:MAX: \: %5.1lf (max)
 	GPRINT:p@RRDIDX@B:MIN: \: %5.1lf (min)
 	GPRINT:p@RRDIDX@B:AVERAGE: \: %5.1lf (avg)\n
-	GPRINT:p@RRDIDX@W:LAST:Queued  \: %5.1lf (cur)
+	GPRINT:p@RRDIDX@A:LAST:asvc_t  \: %5.1lf (cur)
+	GPRINT:p@RRDIDX@A:MAX: \: %5.1lf (max)
+	GPRINT:p@RRDIDX@A:MIN: \: %5.1lf (min)
+	GPRINT:p@RRDIDX@A:AVERAGE: \: %5.1lf (avg)\n
+	GPRINT:p@RRDIDX@W:LAST:wsvc_t  \: %5.1lf (cur)
 	GPRINT:p@RRDIDX@W:MAX: \: %5.1lf (max)
 	GPRINT:p@RRDIDX@W:MIN: \: %5.1lf (min)
 	GPRINT:p@RRDIDX@W:AVERAGE: \: %5.1lf (avg)\n
@@ -757,26 +761,25 @@
 	GPRINT:TKB1:AVERAGE: \: %5.1lf%s (avg)\n
 
 [apache1]
-	TITLE Apache Workers
-	YAXIS # Worker Threads/Processes
-	#DEF:BS=apache.rrd:BS:AVERAGE
-	#DEF:IS=apache.rrd:IS:AVERAGE
+	TITLE , Apache Workers  
+	YAXIS Count []
 	DEF:BW=apache.rrd:BW:AVERAGE
 	DEF:IW=apache.rrd:IW:AVERAGE
-	#LINE2:BS#00CC00:BS
-	#LINE2:IS#FF00FF:IS
-	LINE2:BW#555555:BW Busy Workers
-	LINE2:IW#880000:IW Idle Workers
-	COMMENT:\n
-	GPRINT:BW:LAST:BW   \: %5.1lf%s (cur)
-	GPRINT:BW:MAX: \: %5.1lf%s (max)
-	GPRINT:BW:MIN: \: %5.1lf%s (min)
-	GPRINT:BW:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:IW:LAST:IW   \: %5.1lf%s (cur)
-	GPRINT:IW:MAX: \: %5.1lf%s (max)
-	GPRINT:IW:MIN: \: %5.1lf%s (min)
-	GPRINT:IW:AVERAGE: \: %5.1lf%s (avg)\n
-
+	LINE1:BW#555555:Busy Workers
+	GPRINT:BW:MIN:Min\: %5.1lf%s
+	GPRINT:BW:MAX:Max\: %5.1lf%s
+	GPRINT:BW:AVERAGE:Avg\: %5.1lf%s
+	GPRINT:BW:LAST:Cur\: %5.1lf%s\n
+	LINE1:IW#880000:Idle Workers
+	GPRINT:IW:MIN:Min\: %5.1lf%s
+	GPRINT:IW:MAX:Max\: %5.1lf%s
+	GPRINT:IW:AVERAGE:Avg\: %5.1lf%s
+	GPRINT:IW:LAST:Cur\: %5.1lf%s\n
+
+#DEF:BS=apache.rrd:BS:AVERAGE
+#DEF:IS=apache.rrd:IS:AVERAGE
+#LINE2:BS#00CC00:BS
+#LINE2:IS#FF00FF:IS
 [apache2]
 	TITLE Apache CPU Utilization
 	YAXIS CPU Load
@@ -789,21 +792,19 @@
 	GPRINT:CPU:AVERAGE: \: %5.1lf (avg)\n
 
 [apache3]
-	TITLE Apache Requests/Second
-	YAXIS # Requests
+	TITLE , Apache Request rate  
+	YAXIS Rate [p/s]
 	DEF:RPS=apache.rrd:REQPERSEC:AVERAGE
-	LINE2:RPS#000088:RPS
-	COMMENT:\n
-	GPRINT:RPS:LAST:Requests per Second   \: %5.1lf (cur)
-	GPRINT:RPS:MAX: \: %5.1lf (max)
-	GPRINT:RPS:MIN: \: %5.1lf (min)
-	GPRINT:RPS:AVERAGE: \: %5.1lf (avg)\n
+	LINE1:RPS#000088:Request rate
+	GPRINT:RPS:MIN:Min\: %5.1lf %sp/s
+	GPRINT:RPS:MAX:Max\: %5.1lf %sp/s
+	GPRINT:RPS:AVERAGE:Avg\: %5.1lf %sp/s
+	GPRINT:RPS:LAST:Cur\: %5.1lf %sp/s\n
 
 [apache3-multi]
 	TITLE Multi-Host Apache Requests/Second
 	FNPATTERN ^apache.rrd
 	YAXIS # Requests / seconds
-	# --slope-mode
 	DEF:RPS@RRDIDX@=@RRDFN@:REQPERSEC:AVERAGE
 	LINE2:RPS@RRDIDX@#@COLOR@:@RRDPARAM@
 	COMMENT:\n
@@ -812,6 +813,7 @@
 	GPRINT:RPS@RRDIDX@:MIN: \: %5.1lf (min)
 	GPRINT:RPS@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
 
+# --slope-mode
 [bea]
 	FNPATTERN ^bea.memory.(.+).rrd
 	TITLE BEA/Weblogic % Heap Free
@@ -905,37 +907,37 @@
 	LINE2:PTR1#880000:PTR
 	LINE2:SOA1#000088:SOA
 	COMMENT:\n
-	GPRINT:A1:LAST:A     \: %5.1lf (cur) 
-	GPRINT:A1:MAX:A    \: %5.1lf (max) 
-	GPRINT:A1:MIN:A     \: %5.1lf (min) 
+	GPRINT:A1:LAST:A     \: %5.1lf (cur)
+	GPRINT:A1:MAX:A    \: %5.1lf (max)
+	GPRINT:A1:MIN:A     \: %5.1lf (min)
 	GPRINT:A1:AVERAGE:A     \: %5.1lf (avg)\n
-	GPRINT:ANY1:LAST:ANY   \: %5.1lf (cur) 
-	GPRINT:ANY1:MAX:ANY  \: %5.1lf (max) 
-	GPRINT:ANY1:MIN:ANY   \: %5.1lf (min) 
+	GPRINT:ANY1:LAST:ANY   \: %5.1lf (cur)
+	GPRINT:ANY1:MAX:ANY  \: %5.1lf (max)
+	GPRINT:ANY1:MIN:ANY   \: %5.1lf (min)
 	GPRINT:ANY1:AVERAGE:ANY   \: %5.1lf (avg)\n
-	GPRINT:AXFR1:LAST:AXFR  \: %5.1lf (cur) 
-	GPRINT:AXFR1:MAX:AXFR \: %5.1lf (max) 
-	GPRINT:AXFR1:MIN:AXFR  \: %5.1lf (min) 
+	GPRINT:AXFR1:LAST:AXFR  \: %5.1lf (cur)
+	GPRINT:AXFR1:MAX:AXFR \: %5.1lf (max)
+	GPRINT:AXFR1:MIN:AXFR  \: %5.1lf (min)
 	GPRINT:AXFR1:AVERAGE:AXFR  \: %5.1lf (avg)\n
-	GPRINT:MX1:LAST:MX    \: %5.1lf (cur) 
-	GPRINT:MX1:MAX:MX   \: %5.1lf (max) 
-	GPRINT:MX1:MIN:MX    \: %5.1lf (min) 
+	GPRINT:MX1:LAST:MX    \: %5.1lf (cur)
+	GPRINT:MX1:MAX:MX   \: %5.1lf (max)
+	GPRINT:MX1:MIN:MX    \: %5.1lf (min)
 	GPRINT:MX1:AVERAGE:MX    \: %5.1lf (avg)\n
-	GPRINT:O1:LAST:O     \: %5.1lf (cur) 
-	GPRINT:O1:MAX:O    \: %5.1lf (max) 
-	GPRINT:O1:MIN:O     \: %5.1lf (min) 
+	GPRINT:O1:LAST:O     \: %5.1lf (cur)
+	GPRINT:O1:MAX:O    \: %5.1lf (max)
+	GPRINT:O1:MIN:O     \: %5.1lf (min)
 	GPRINT:O1:AVERAGE:O     \: %5.1lf (avg)\n
-	GPRINT:PTR1:LAST:PTR   \: %5.1lf (cur) 
-	GPRINT:PTR1:MAX:PTR  \: %5.1lf (max) 
-	GPRINT:PTR1:MIN:PTR   \: %5.1lf (min) 
+	GPRINT:PTR1:LAST:PTR   \: %5.1lf (cur)
+	GPRINT:PTR1:MAX:PTR  \: %5.1lf (max)
+	GPRINT:PTR1:MIN:PTR   \: %5.1lf (min)
 	GPRINT:PTR1:AVERAGE:PTR   \: %5.1lf (avg)\n
-	GPRINT:SOA1:LAST:SOA   \: %5.1lf (cur) 
-	GPRINT:SOA1:MAX:SOA  \: %5.1lf (max) 
-	GPRINT:SOA1:MIN:SOA   \: %5.1lf (min) 
+	GPRINT:SOA1:LAST:SOA   \: %5.1lf (cur)
+	GPRINT:SOA1:MAX:SOA  \: %5.1lf (max)
+	GPRINT:SOA1:MIN:SOA   \: %5.1lf (min)
 	GPRINT:SOA1:AVERAGE:SOA   \: %5.1lf (avg)\n
 
 [sendmail]
-	FNPATTERN ^sendmail.(.+).rrd
+	FNPATTERN ^sendmail\.(.+)\.rrd$
 	TITLE Sendmail Activity
 	YAXIS Messages
 	DEF:p@RRDIDX@IN=@RRDFN@:msgsfr:AVERAGE
@@ -957,7 +959,7 @@
 	COMMENT:\n
 
 [sendmail1]
-	FNPATTERN ^sendmail.(.+).rrd
+	FNPATTERN ^sendmail\.(.+)\.rrd$
 	TITLE Sendmail Reject/Discards
 	YAXIS Messages
 	DEF:p@RRDIDX@IN=@RRDFN@:msgsrej:AVERAGE
@@ -979,25 +981,20 @@
 	COMMENT:\n
 
 [mailq]
-	# This handles "mailq.rrd", "mailqin.rrd" and "mailqout.rrd"
-	FNPATTERN ^mailq(.+).rrd
-	TITLE Mail Queue Length
-	YAXIS Queue Length
-	DEF:mailq@RRDIDX@=@RRDFN@:mailq:AVERAGE
-	LINE2:mailq@RRDIDX@#@COLOR@:Queue Length @RRDPARAM@
-	COMMENT:\n
-	GPRINT:mailq@RRDIDX@:LAST: \: %5.1lf (cur)
-	GPRINT:mailq@RRDIDX@:MAX: \: %5.1lf (max)
-	GPRINT:mailq@RRDIDX@:MIN: \: %5.1lf (min)
-	GPRINT:mailq@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
-
+	TITLE , Mail queue length  
+	YAXIS Queue length []
+	DEF:mailq=mailq.rrd:mailq:AVERAGE
+	LINE1:mailq#000CCC:Queue length
+	GPRINT:mailq:MIN:Min \: %5.1lf %s
+	GPRINT:mailq:MAX:Max \: %5.1lf %s
+	GPRINT:mailq:AVERAGE:Avg \: %5.1lf %s
+	GPRINT:mailq:LAST:Cur \: %5.1lf %s\n
 
+# Based on the "IIShealth.zip" tool from deadcat
 [iishealth]
-	# Based on the "IIShealth.zip" tool from deadcat
 	FNPATTERN ^iishealth.(.+).rrd
 	TITLE IIS Utilization
 	YAXIS #
-	# Yes, they really do call it "realmempct". Cut'n'paste programming.
 	DEF:p@RRDIDX@=@RRDFN@:realmempct:AVERAGE
 	LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@
 	-u 100
@@ -1007,22 +1004,22 @@
 	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
 
 [temperature]
-	FNPATTERN ^temperature.(.+).rrd
-	TITLE Temperature
-	YAXIS Celsius
+	FNPATTERN ^temperature\.(.+)\.rrd$
+	TITLE , temperature  
+	YAXIS Temperature [C]
 	DEF:p@RRDIDX@=@RRDFN@:temperature:AVERAGE
-	LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@
-	GPRINT:p@RRDIDX@:LAST: \: %5.1lf (cur)
-	GPRINT:p@RRDIDX@:MAX: \: %5.1lf (max)
-	GPRINT:p@RRDIDX@:MIN: \: %5.1lf (min)
-	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
+	LINE1:p@RRDIDX@#@COLOR@:@RRDPARAM@
+	GPRINT:p@RRDIDX@:MIN:Min \: %5.1lf
+	GPRINT:p@RRDIDX@:MAX:Max \: %5.1lf
+	GPRINT:p@RRDIDX@:AVERAGE:Avg \: %5.1lf
+	GPRINT:p@RRDIDX@:LAST:Cur \: %5.1lf\n
 
 # If you want your temperature graphs in Fahrenheit,
-# comment out the [temperature] section above, and 
+# comment out the [temperature] section above, and
 # uncomment this definition.
 #
 #[temperature]
-#	FNPATTERN ^temperature.(.+).rrd
+#	FNPATTERN ^temperature\.(.+)\.rrd$
 #	TITLE Temperature
 #	YAXIS Fahrenheit
 #	DEF:p@RRDIDX@=@RRDFN@:temperature:AVERAGE
@@ -1032,7 +1029,6 @@
 #	GPRINT:tempf@RRDIDX@:MAX: \: %5.1lf (max)
 #	GPRINT:tempf@RRDIDX@:MIN: \: %5.1lf (min)
 #	GPRINT:tempf@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
-
 [citrix]
 	TITLE Citrix Users
 	YAXIS # Users
@@ -1045,26 +1041,25 @@
 	GPRINT:u:AVERAGE: \: %5.1lf (avg)\n
 
 [bbgen]
-	TITLE bbgen Runtime
-	YAXIS Seconds
+	TITLE , bbgen runtime  
+	YAXIS Time [s]
 	DEF:rt=bbgen.rrd:runtime:AVERAGE
 	AREA:rt#00CCCC:Run Time
-	COMMENT:\n
-	GPRINT:rt:LAST: \: %5.1lf (cur)
-	GPRINT:rt:MAX: \: %5.1lf (max)
-	GPRINT:rt:MIN: \: %5.1lf (min)
-	GPRINT:rt:AVERAGE: \: %5.1lf (avg)\n
+	GPRINT:rt:MIN:Min\: %5.1lf %ss
+	GPRINT:rt:MAX:Max\: %5.1lf %ss
+	GPRINT:rt:AVERAGE:Avg\: %5.1lf %ss
+	GPRINT:rt:LAST:Cur\: %5.1lf %ss\n
 
 [bbtest]
-	TITLE bbtest Run Time
-	YAXIS Seconds
+	TITLE , bbtest runtime
+	YAXIS Time [s]
+	-l 0
 	DEF:rt=bbtest.rrd:runtime:AVERAGE
 	AREA:rt#00CCCC:Run Time
-	COMMENT:\n
-	GPRINT:rt:LAST: \: %5.1lf (cur)
-	GPRINT:rt:MAX: \: %5.1lf (max)
-	GPRINT:rt:MIN: \: %5.1lf (min)
-	GPRINT:rt:AVERAGE: \: %5.1lf (avg)\n
+	GPRINT:rt:MIN:Min\: %5.1lf %ss
+	GPRINT:rt:MAX:Max\: %5.1lf %ss
+	GPRINT:rt:AVERAGE:Avg\: %5.1lf %ss
+	GPRINT:rt:LAST:Cur\: %5.1lf %ss\n
 
 [bbproxy]
 	TITLE bbproxy Average Queue Time
@@ -1078,26 +1073,25 @@
 	GPRINT:rt:AVERAGE: \: %5.1lf (avg)\n
 
 [hobbitd]
-	TITLE hobbitd Incoming Messages
-	YAXIS Messages
+	TITLE , hobbitd incoming message rate  
+	YAXIS Rate [message/s]
 	DEF:in=hobbitd.rrd:inmessages:AVERAGE
-	LINE2:in#00CCCC:Incoming messages
-	COMMENT:\n
-	GPRINT:in:LAST: \: %5.1lf (cur)
-	GPRINT:in:MAX: \: %5.1lf (max)
-	GPRINT:in:MIN: \: %5.1lf (min)
-	GPRINT:in:AVERAGE: \: %5.1lf (avg)\n
+	LINE1:in#00CCCC:Incoming messages
+	GPRINT:in:MIN:Min\: %5.1lf %sm/s
+	GPRINT:in:MAX:Max\: %5.1lf %sm/s
+	GPRINT:in:AVERAGE:Avg\: %5.1lf %sm/s
+	GPRINT:in:LAST:Cur\: %5.1lf %sm/s\n
 
 [hobbit]
-	TITLE Host count
-	YAXIS #
+	TITLE , Host count  
+	YAXIS Count []
+	-l 0
 	DEF:count=hobbit.rrd:hostcount:AVERAGE
-	LINE2:count#00CCCC:Hosts
-	COMMENT:\n
-	GPRINT:count:LAST: \: %5.1lf (cur)
-	GPRINT:count:MAX: \: %5.1lf (max)
-	GPRINT:count:MIN: \: %5.1lf (min)
-	GPRINT:count:AVERAGE: \: %5.1lf (avg)\n
+	LINE1:count#00CCCC:Hosts
+	GPRINT:count:MIN:Min\: %5.0lf
+	GPRINT:count:MAX:Max\: %5.0lf
+	GPRINT:count:AVERAGE:Avg\: %5.0lf
+	GPRINT:count:LAST:Cur\: %5.0lf\n
 
 [hobbit1]
 	TITLE Status count
@@ -1111,8 +1105,9 @@
 	GPRINT:count:AVERAGE: \: %5.1lf (avg)\n
 
 [hobbit2]
-	TITLE Non-green status breakdown
-	YAXIS %
+	TITLE , Non-green status breakdown 
+	YAXIS Fraction []
+	-l 0
 	DEF:red=hobbit2.rrd:redpct:AVERAGE
 	DEF:rednp=hobbit2.rrd:rednoproppct:AVERAGE
 	DEF:yel=hobbit2.rrd:yellowpct:AVERAGE
@@ -1121,59 +1116,60 @@
 	DEF:pur=hobbit2.rrd:purplepct:AVERAGE
 	DEF:blu=hobbit2.rrd:bluepct:AVERAGE
 	AREA:blu#0000FF:Blue           \:
-	GPRINT:blu:LAST: %5.2lf (cur)
-	GPRINT:blu:MAX: \: %5.2lf (max)
-	GPRINT:blu:MIN: \: %5.2lf (min)
-	GPRINT:blu:AVERAGE: \: %5.2lf (avg)\n
+	GPRINT:blu:MIN:Min\: %5.2lf
+	GPRINT:blu:MAX:Max\: %5.2lf
+	GPRINT:blu:AVERAGE:Avg\: %5.2lf
+	GPRINT:blu:LAST:Cur\: %5.2lf\n
 	STACK:clr#808080:Clear          \:
-	GPRINT:clr:LAST: %5.2lf (cur)
-	GPRINT:clr:MAX: \: %5.2lf (max)
-	GPRINT:clr:MIN: \: %5.2lf (min)
-	GPRINT:clr:AVERAGE: \: %5.2lf (avg)\n
+	GPRINT:clr:MIN:Min\: %5.2lf
+	GPRINT:clr:MAX:Max\: %5.2lf
+	GPRINT:clr:AVERAGE:Avg\: %5.2lf
+	GPRINT:clr:LAST:Cur\: %5.2lf\n
 	STACK:pur#E900FF:Purple         \:
-	GPRINT:pur:LAST: %5.2lf (cur)
-	GPRINT:pur:MAX: \: %5.2lf (max)
-	GPRINT:pur:MIN: \: %5.2lf (min)
-	GPRINT:pur:AVERAGE: \: %5.2lf (avg)\n
+	GPRINT:pur:MIN:Min\: %5.2lf
+	GPRINT:pur:MAX:Max\: %5.2lf
+	GPRINT:pur:AVERAGE:Avg\: %5.2lf
+	GPRINT:pur:LAST:Cur\: %5.2lf\n
 	STACK:yelnp#FF9900:Yellow (NP)    \:
-	GPRINT:yelnp:LAST: %5.2lf (cur)
-	GPRINT:yelnp:MAX: \: %5.2lf (max)
-	GPRINT:yelnp:MIN: \: %5.2lf (min)
-	GPRINT:yelnp:AVERAGE: \: %5.2lf (avg)\n
+	GPRINT:yelnp:MIN:Min\: %5.2lf
+	GPRINT:yelnp:MAX:Max\: %5.2lf
+	GPRINT:yelnp:AVERAGE:Avg\: %5.2lf
+	GPRINT:yelnp:LAST:Cur\: %5.2lf\n
 	STACK:yel#FBFB61:Yellow         \:
-	GPRINT:yel:LAST: %5.2lf (cur)
-	GPRINT:yel:MAX: \: %5.2lf (max)
-	GPRINT:yel:MIN: \: %5.2lf (min)
-	GPRINT:yel:AVERAGE: \: %5.2lf (avg)\n
+	GPRINT:yel:MIN:Min\: %5.2lf
+	GPRINT:yel:MAX:Max\: %5.2lf
+	GPRINT:yel:AVERAGE:Avg\: %5.2lf
+	GPRINT:yel:LAST:Cur\: %5.2lf\n
 	STACK:rednp#FFC0C0:Red (NP)       \:
-	GPRINT:rednp:LAST: %5.2lf (cur)
-	GPRINT:rednp:MAX: \: %5.2lf (max)
-	GPRINT:rednp:MIN: \: %5.2lf (min)
-	GPRINT:rednp:AVERAGE: \: %5.2lf (avg)\n
+	GPRINT:rednp:MIN:Min\: %5.2lf
+	GPRINT:rednp:MAX:Max\: %5.2lf
+	GPRINT:rednp:AVERAGE:Avg\: %5.2lf
+	GPRINT:rednp:LAST:Cur\: %5.2lf\n
 	STACK:red#FF0000:Red            \:
-	GPRINT:red:LAST: %5.2lf (cur)
-	GPRINT:red:MAX: \: %5.2lf (max)
-	GPRINT:red:MIN: \: %5.2lf (min)
-	GPRINT:red:AVERAGE: \: %5.2lf (avg)\n
+	GPRINT:red:MIN:Min\: %5.2lf
+	GPRINT:red:MAX:Max\: %5.2lf
+	GPRINT:red:AVERAGE:Avg\: %5.2lf
+	GPRINT:red:LAST:Cur\: %5.2lf\n
 
 [mrtg]
-	FNPATTERN ^mrtg.*\.(.+).rrd
-	TITLE Network Traffic (MRTG)
-	YAXIS Bits/second
+	FNPATTERN ^mrtg\..+\.(.+)\.rrd$
+	TITLE , Network Traffic (MRTG)  
+	YAXIS Throughput [b/s]
+	-l 0
 	DEF:inbytes@RRDIDX@=@RRDFN@:ds0:AVERAGE
 	CDEF:in@RRDIDX@=inbytes@RRDIDX@,8,*
 	DEF:outbytes@RRDIDX@=@RRDFN@:ds1:AVERAGE
 	CDEF:out@RRDIDX@=outbytes@RRDIDX@,8,*
-	LINE2:in@RRDIDX@#@COLOR@:@RRDPARAM@  inbound
-	GPRINT:in@RRDIDX@:LAST: \: %10.1lf (cur)
-	GPRINT:in@RRDIDX@:MAX: \: %10.1lf (max)
-	GPRINT:in@RRDIDX@:MIN: \: %10.1lf (min)
-	GPRINT:in@RRDIDX@:AVERAGE: \: %10.1lf (avg)\n
-	LINE2:out@RRDIDX@#@COLOR@:@RRDPARAM@ outbound
-	GPRINT:out@RRDIDX@:LAST: \: %10.1lf (cur)
-	GPRINT:out@RRDIDX@:MAX: \: %10.1lf (max)
-	GPRINT:out@RRDIDX@:MIN: \: %10.1lf (min)
-	GPRINT:out@RRDIDX@:AVERAGE: \: %10.1lf (avg)\n
+	LINE1:in@RRDIDX@#@COLOR@:@RRDPARAM@  inbound
+	GPRINT:in@RRDIDX@:MIN:Min\: %5.1lf %sb/s
+	GPRINT:in@RRDIDX@:MAX:Max\: %5.1lf %sb/s
+	GPRINT:in@RRDIDX@:AVERAGE:Avg\: %5.1lf %sb/s
+	GPRINT:in@RRDIDX@:LAST:Cur\: %5.1lf %sb/s\n
+	LINE1:out@RRDIDX@#@COLOR@:@RRDPARAM@ outbound
+	GPRINT:out@RRDIDX@:MIN:Min\: %5.1lf %sb/s
+	GPRINT:out@RRDIDX@:MAX:Max\: %5.1lf %sb/s
+	GPRINT:out@RRDIDX@:AVERAGE:Avg\: %5.1lf %sb/s
+	GPRINT:out@RRDIDX@:LAST:Cur\: %5.1lf %sb/s\n
 
 [mysqlslow]
 	DEF:slow=mysql.rrd:Slowqueries:AVERAGE
@@ -1198,26 +1194,26 @@
 	GPRINT:threads:AVERAGE: \: %5.1lf (avg)\n
 
 [ifstat]
-	FNPATTERN ^ifstat.(.+).rrd
-	TITLE Network Traffic
-	YAXIS Bits/second
+	FNPATTERN ^ifstat\.(.+)\.rrd$
+	TITLE , Network traffic  
+	YAXIS Throughput [b/s]
 	DEF:inbytes@RRDIDX@=@RRDFN@:bytesReceived:AVERAGE
 	CDEF:in@RRDIDX@=inbytes@RRDIDX@,8,*
 	DEF:outbytes@RRDIDX@=@RRDFN@:bytesSent:AVERAGE
 	CDEF:out@RRDIDX@=outbytes@RRDIDX@,8,*
-	LINE2:in@RRDIDX@#@COLOR@:@RRDPARAM@  inbound
-	GPRINT:in@RRDIDX@:LAST: \: %10.1lf (cur)
-	GPRINT:in@RRDIDX@:MAX: \: %10.1lf (max)
-	GPRINT:in@RRDIDX@:MIN: \: %10.1lf (min)
-	GPRINT:in@RRDIDX@:AVERAGE: \: %10.1lf (avg)\n
-	LINE2:out@RRDIDX@#@COLOR@:@RRDPARAM@ outbound
-	GPRINT:out@RRDIDX@:LAST: \: %10.1lf (cur)
-	GPRINT:out@RRDIDX@:MAX: \: %10.1lf (max)
-	GPRINT:out@RRDIDX@:MIN: \: %10.1lf (min)
-	GPRINT:out@RRDIDX@:AVERAGE: \: %10.1lf (avg)\n
+	LINE1:in@RRDIDX@#@COLOR@:@RRDPARAM@  inbound
+	GPRINT:in@RRDIDX@:MIN:Min\: %5.1lf %sb/s
+	GPRINT:in@RRDIDX@:MAX:Max\: %5.1lf %sb/s
+	GPRINT:in@RRDIDX@:AVERAGE:Avg\: %5.1lf %sb/s
+	GPRINT:in@RRDIDX@:LAST:Cur\: %5.1lf %sb/s\n
+	LINE1:out@RRDIDX@#@COLOR@:@RRDPARAM@ outbound
+	GPRINT:out@RRDIDX@:MIN:Min\: %5.1lf %sb/s
+	GPRINT:out@RRDIDX@:MAX:Max\: %5.1lf %sb/s
+	GPRINT:out@RRDIDX@:AVERAGE:Avg\: %5.1lf %sb/s
+	GPRINT:out@RRDIDX@:LAST:Cur\: %5.1lf %sb/s\n
 
 [files]
-	FNPATTERN ^filesizes.(.+).rrd
+	FNPATTERN ^filesizes\.(.+)\.rrd$
 	TITLE File/Directory sizes
 	YAXIS KB
 	DEF:sz@RRDIDX@=@RRDFN@:size:AVERAGE
@@ -1228,26 +1224,26 @@
 	GPRINT:sz@RRDIDX@:AVERAGE: \: %10.1lf (avg)\n
 
 [processes]
-	FNPATTERN ^processes.(.+).rrd
-	TITLE Process counts
-	YAXIS #
+	FNPATTERN ^processes\.(.+)\.rrd$
+	TITLE , Process counts  
+	YAXIS Count []
 	DEF:cnt@RRDIDX@=@RRDFN@:count:AVERAGE
-	LINE2:cnt@RRDIDX@#@COLOR@:@RRDPARAM@
-	GPRINT:cnt@RRDIDX@:LAST: \: %10.1lf (cur)
-	GPRINT:cnt@RRDIDX@:MAX: \: %10.1lf (max)
-	GPRINT:cnt@RRDIDX@:MIN: \: %10.1lf (min)
-	GPRINT:cnt@RRDIDX@:AVERAGE: \: %10.1lf (avg)\n
+	AREA:cnt@RRDIDX@#@COLOR@:@RRDPARAM@:STACK
+	GPRINT:cnt@RRDIDX@:MIN:Min\: %5.1lf %s
+	GPRINT:cnt@RRDIDX@:MAX:Max\: %5.1lf %s
+	GPRINT:cnt@RRDIDX@:AVERAGE:Avg\: %5.1lf %s
+	GPRINT:cnt@RRDIDX@:LAST:Cur\: %5.1lf %s\n
 
 [ports]
-	FNPATTERN ^ports.(.+).rrd
-	TITLE Network port counts
-	YAXIS #
+	FNPATTERN ^ports\.(.+)\.rrd$
+	TITLE , Active network sessions  
+	YAXIS Count []
 	DEF:cnt@RRDIDX@=@RRDFN@:count:AVERAGE
-	LINE2:cnt@RRDIDX@#@COLOR@:@RRDPARAM@
-	GPRINT:cnt@RRDIDX@:LAST: \: %10.1lf (cur)
-	GPRINT:cnt@RRDIDX@:MAX: \: %10.1lf (max)
-	GPRINT:cnt@RRDIDX@:MIN: \: %10.1lf (min)
-	GPRINT:cnt@RRDIDX@:AVERAGE: \: %10.1lf (avg)\n
+	LINE1:cnt@RRDIDX@#@COLOR@:@RRDPARAM@
+	GPRINT:cnt@RRDIDX@:MIN:Min \: %5.1lf %s
+	GPRINT:cnt@RRDIDX@:MAX:Max \: %5.1lf %s
+	GPRINT:cnt@RRDIDX@:AVERAGE:Avg \: %5.1lf %s
+	GPRINT:cnt@RRDIDX@:LAST:Cur \: %5.1lf %s\n
 
 [lines]
 	FNPATTERN ^lines.(.+).rrd
@@ -1274,7 +1270,7 @@
 
 # Interface MIB data graphs
 [ifmib]
-	FNPATTERN ^ifmib.(.+).rrd
+	FNPATTERN ^ifmib\.(.+)\.rrd$
 	TITLE Traffic
 	YAXIS Bits/second
 	DEF:bytesin@RRDIDX@=@RRDFN@:InOctets:AVERAGE
@@ -1295,7 +1291,7 @@
 	GPRINT:mbitsout@RRDIDX@:AVERAGE: %6.1lfM (avg)\n
 
 [ifmib1]
-	FNPATTERN ^ifmib.(.+).rrd
+	FNPATTERN ^ifmib\.(.+)\.rrd$
 	TITLE Traffic
 	YAXIS Packets/second
 	DEF:pktsin@RRDIDX@=@RRDFN@:InUcastPkts:AVERAGE
@@ -1314,7 +1310,7 @@
 	GPRINT:mpktsout@RRDIDX@:AVERAGE: %6.1lfM (avg)\n
 
 [ifmib2]
-	FNPATTERN ^ifmib.(.+).rrd
+	FNPATTERN ^ifmib\.(.+)\.rrd$
 	TITLE Errors
 	YAXIS Errors/second
 	DEF:pktsin@RRDIDX@=@RRDFN@:ifInErrors:AVERAGE
@@ -1337,7 +1333,7 @@
 	GPRINT:pktsdisc@RRDIDX@:AVERAGE: %6.1lf (avg)\n
 
 [ifmib3]
-	FNPATTERN ^ifmib.(.+).rrd
+	FNPATTERN ^ifmib\.(.+)\.rrd$
 	TITLE Output queue
 	YAXIS Packets
 	DEF:qlen@RRDIDX@=@RRDFN@:ifOutQLen:AVERAGE
@@ -1440,4 +1436,3 @@
 	GPRINT:pct:MAX: \: %3.1lf (max)
 	GPRINT:pct:MIN: \: %3.1lf (min)
 	GPRINT:pct:AVERAGE: \: %3.1lf (avg)\n
-