Added MySQL QCache and Threads graphs to `collection.cgi'

diff --git a/contrib/museum/collection.cgi b/contrib/museum/collection.cgi
index 35106e04f98a98f45b53881cca0c0cf691121259..564adf059a0e146c31f458afe08c76b55b254cc8 100755 (executable)
--- a/contrib/museum/collection.cgi
+++ b/contrib/museum/collection.cgi
@@ -290,6 +290,94 @@ our $GraphDefs;
                        'GPRINT:val_max:MAX:%5.2lf Max,',
                        'GPRINT:val_avg:LAST:%5.2lf Last'
                ],
+               mysql_qcache => [
+                       "DEF:hits_min={file}:hits:MIN",
+                       "DEF:hits_avg={file}:hits:AVERAGE",
+                       "DEF:hits_max={file}:hits:MAX",
+                       "DEF:inserts_min={file}:inserts:MIN",
+                       "DEF:inserts_avg={file}:inserts:AVERAGE",
+                       "DEF:inserts_max={file}:inserts:MAX",
+                       "DEF:not_cached_min={file}:not_cached:MIN",
+                       "DEF:not_cached_avg={file}:not_cached:AVERAGE",
+                       "DEF:not_cached_max={file}:not_cached:MAX",
+                       "DEF:lowmem_prunes_min={file}:lowmem_prunes:MIN",
+                       "DEF:lowmem_prunes_avg={file}:lowmem_prunes:AVERAGE",
+                       "DEF:lowmem_prunes_max={file}:lowmem_prunes:MAX",
+                       "DEF:queries_min={file}:queries_in_cache:MIN",
+                       "DEF:queries_avg={file}:queries_in_cache:AVERAGE",
+                       "DEF:queries_max={file}:queries_in_cache:MAX",
+                       "CDEF:unknown=queries_avg,UNKN,+",
+                       "CDEF:not_cached_agg=hits_avg,inserts_avg,+,not_cached_avg,+",
+                       "CDEF:inserts_agg=hits_avg,inserts_avg,+",
+                       "CDEF:hits_agg=hits_avg",
+                       "AREA:not_cached_agg#$HalfYellow",
+                       "AREA:inserts_agg#$HalfBlue",
+                       "AREA:hits_agg#$HalfGreen",
+                       "LINE1:not_cached_agg#$FullYellow:Not Cached      ",
+                       'GPRINT:not_cached_min:MIN:%5.2lf Min,',
+                       'GPRINT:not_cached_avg:AVERAGE:%5.2lf Avg,',
+                       'GPRINT:not_cached_max:MAX:%5.2lf Max,',
+                       'GPRINT:not_cached_avg:LAST:%5.2lf Last\l',
+                       "LINE1:inserts_agg#$FullBlue:Inserts         ",
+                       'GPRINT:inserts_min:MIN:%5.2lf Min,',
+                       'GPRINT:inserts_avg:AVERAGE:%5.2lf Avg,',
+                       'GPRINT:inserts_max:MAX:%5.2lf Max,',
+                       'GPRINT:inserts_avg:LAST:%5.2lf Last\l',
+                       "LINE1:hits_agg#$FullGreen:Hits            ",
+                       'GPRINT:hits_min:MIN:%5.2lf Min,',
+                       'GPRINT:hits_avg:AVERAGE:%5.2lf Avg,',
+                       'GPRINT:hits_max:MAX:%5.2lf Max,',
+                       'GPRINT:hits_avg:LAST:%5.2lf Last\l',
+                       "LINE1:lowmem_prunes_avg#$FullRed:Lowmem Prunes   ",
+                       'GPRINT:lowmem_prunes_min:MIN:%5.2lf Min,',
+                       'GPRINT:lowmem_prunes_avg:AVERAGE:%5.2lf Avg,',
+                       'GPRINT:lowmem_prunes_max:MAX:%5.2lf Max,',
+                       'GPRINT:lowmem_prunes_avg:LAST:%5.2lf Last\l',
+                       "LINE1:unknown#$Canvas:Queries in cache",
+                       'GPRINT:queries_min:MIN:%5.0lf Min,',
+                       'GPRINT:queries_avg:AVERAGE:%5.0lf Avg,',
+                       'GPRINT:queries_max:MAX:%5.0lf Max,',
+                       'GPRINT:queries_avg:LAST:%5.0lf Last\l'
+               ],
+               mysql_threads => [
+                       "DEF:running_min={file}:running:MIN",
+                       "DEF:running_avg={file}:running:AVERAGE",
+                       "DEF:running_max={file}:running:MAX",
+                       "DEF:connected_min={file}:connected:MIN",
+                       "DEF:connected_avg={file}:connected:AVERAGE",
+                       "DEF:connected_max={file}:connected:MAX",
+                       "DEF:cached_min={file}:cached:MIN",
+                       "DEF:cached_avg={file}:cached:AVERAGE",
+                       "DEF:cached_max={file}:cached:MAX",
+                       "DEF:created_min={file}:created:MIN",
+                       "DEF:created_avg={file}:created:AVERAGE",
+                       "DEF:created_max={file}:created:MAX",
+                       "CDEF:unknown=created_avg,UNKN,+",
+                       "CDEF:cached_agg=connected_avg,cached_avg,+",
+                       "AREA:cached_agg#$HalfGreen",
+                       "AREA:connected_avg#$HalfBlue",
+                       "AREA:running_avg#$HalfRed",
+                       "LINE1:cached_agg#$FullGreen:Cached   ",
+                       'GPRINT:cached_min:MIN:%5.1lf Min,',
+                       'GPRINT:cached_avg:AVERAGE:%5.1lf Avg,',
+                       'GPRINT:cached_max:MAX:%5.1lf Max,',
+                       'GPRINT:cached_avg:LAST:%5.1lf Last\l',
+                       "LINE1:connected_avg#$FullBlue:Connected",
+                       'GPRINT:connected_min:MIN:%5.1lf Min,',
+                       'GPRINT:connected_avg:AVERAGE:%5.1lf Avg,',
+                       'GPRINT:connected_max:MAX:%5.1lf Max,',
+                       'GPRINT:connected_avg:LAST:%5.1lf Last\l',
+                       "LINE1:running_avg#$FullRed:Running  ",
+                       'GPRINT:running_min:MIN:%5.1lf Min,',
+                       'GPRINT:running_avg:AVERAGE:%5.1lf Avg,',
+                       'GPRINT:running_max:MAX:%5.1lf Max,',
+                       'GPRINT:running_avg:LAST:%5.1lf Last\l',
+                       "LINE1:unknown#$Canvas:Created  ",
+                       'GPRINT:created_min:MIN:%5.0lf Min,',
+                       'GPRINT:created_avg:AVERAGE:%5.0lf Avg,',
+                       'GPRINT:created_max:MAX:%5.0lf Max,',
+                       'GPRINT:created_avg:LAST:%5.0lf Last\l'
+               ],
                nfs3_procedures => [
                        "DEF:null_avg={file}:null:AVERAGE",
                        "DEF:getattr_avg={file}:getattr:AVERAGE",