From: Sebastian Harl Date: Fri, 18 Apr 2008 12:53:50 +0000 (+0200) Subject: collection.cgi: Updated "vserver" graph definitions to version 4. X-Git-Tag: collectd-4.2.7~3 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=33bff149ad50a39f2d21fa116cd2d44179097a0b;p=collectd.git collection.cgi: Updated "vserver" graph definitions to version 4. Signed-off-by: Sebastian Harl Signed-off-by: Florian Forster --- diff --git a/contrib/collection.cgi b/contrib/collection.cgi index e82388b0..b8a08130 100755 --- a/contrib/collection.cgi +++ b/contrib/collection.cgi @@ -2344,84 +2344,40 @@ sub load_graph_definitions 'GPRINT:avg:LAST:%5.1lf%sV Last\l' ], vs_threads => [ - "DEF:total_avg={file}:total:AVERAGE", - "DEF:total_min={file}:total:MIN", - "DEF:total_max={file}:total:MAX", - "DEF:running_avg={file}:running:AVERAGE", - "DEF:running_min={file}:running:MIN", - "DEF:running_max={file}:running:MAX", - "DEF:uninterruptible_avg={file}:uninterruptible:AVERAGE", - "DEF:uninterruptible_min={file}:uninterruptible:MIN", - "DEF:uninterruptible_max={file}:uninterruptible:MAX", - "DEF:onhold_avg={file}:onhold:AVERAGE", - "DEF:onhold_min={file}:onhold:MIN", - "DEF:onhold_max={file}:onhold:MAX", - "LINE1:total_avg#$FullYellow:Total ", - 'GPRINT:total_min:MIN:%5.1lf Min,', - 'GPRINT:total_avg:AVERAGE:%5.1lf Avg.,', - 'GPRINT:total_max:MAX:%5.1lf Max,', - 'GPRINT:total_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:uninterruptible_avg#$FullGreen:Unintr ", - 'GPRINT:uninterruptible_min:MIN:%5.1lf Min,', - 'GPRINT:uninterruptible_avg:AVERAGE:%5.1lf Avg.,', - 'GPRINT:uninterruptible_max:MAX:%5.1lf Max,', - 'GPRINT:uninterruptible_avg:LAST:%5.1lf Last\l', - "LINE1:onhold_avg#$FullBlue:Onhold ", - 'GPRINT:onhold_min:MIN:%5.1lf Min,', - 'GPRINT:onhold_avg:AVERAGE:%5.1lf Avg.,', - 'GPRINT:onhold_max:MAX:%5.1lf Max,', - 'GPRINT:onhold_avg:LAST:%5.1lf Last\l' - ], - vs_memory => [ - 'DEF:vm_avg={file}:vm:AVERAGE', - 'DEF:vm_min={file}:vm:MIN', - 'DEF:vm_max={file}:vm:MAX', - 'DEF:vml_avg={file}:vml:AVERAGE', - 'DEF:vml_min={file}:vml:MIN', - 'DEF:vml_max={file}:vml:MAX', - 'DEF:rss_avg={file}:rss:AVERAGE', - 'DEF:rss_min={file}:rss:MIN', - 'DEF:rss_max={file}:rss:MAX', - 'DEF:anon_avg={file}:anon:AVERAGE', - 'DEF:anon_min={file}:anon:MIN', - 'DEF:anon_max={file}:anon:MAX', - "LINE1:vm_avg#$FullYellow:VM ", - 'GPRINT:vm_min:MIN:%5.1lf%s Min,', - 'GPRINT:vm_avg:AVERAGE:%5.1lf%s Avg.,', - 'GPRINT:vm_max:MAX:%5.1lf%s Avg.,', - 'GPRINT:vm_avg:LAST:%5.1lf%s Last\l', - "LINE1:vml_avg#$FullRed:Locked ", - 'GPRINT:vml_min:MIN:%5.1lf%s Min,', - 'GPRINT:vml_avg:AVERAGE:%5.1lf%s Avg.,', - 'GPRINT:vml_max:MAX:%5.1lf%s Avg.,', - 'GPRINT:vml_avg:LAST:%5.1lf%s Last\l', - "LINE1:rss_avg#$FullGreen:RSS ", - 'GPRINT:rss_min:MIN:%5.1lf%s Min,', - 'GPRINT:rss_avg:AVERAGE:%5.1lf%s Avg.,', - 'GPRINT:rss_max:MAX:%5.1lf%s Avg.,', - 'GPRINT:rss_avg:LAST:%5.1lf%s Last\l', - "LINE1:anon_avg#$FullBlue:Anon. ", - 'GPRINT:anon_min:MIN:%5.1lf%s Min,', - 'GPRINT:anon_avg:AVERAGE:%5.1lf%s Avg.,', - 'GPRINT:anon_max:MAX:%5.1lf%s Avg.,', - 'GPRINT:anon_avg:LAST:%5.1lf%s Last\l', + "DEF:avg={file}:value:AVERAGE", + "DEF:min={file}:value:MIN", + "DEF:max={file}:value:MAX", + "AREA:max#$HalfBlue", + "AREA:min#$Canvas", + "LINE1:avg#$FullBlue:Threads", + 'GPRINT:min:MIN:%5.1lf Min,', + 'GPRINT:avg:AVERAGE:%5.1lf Avg.,', + 'GPRINT:max:MAX:%5.1lf Max,', + 'GPRINT:avg:LAST:%5.1lf Last\l', + ], + vs_memory => ['-b', '1024', '-v', 'Bytes', + "DEF:avg={file}:value:AVERAGE", + "DEF:min={file}:value:MIN", + "DEF:max={file}:value:MAX", + "AREA:max#$HalfBlue", + "AREA:min#$Canvas", + "LINE1:avg#$FullBlue:", + 'GPRINT:min:MIN:%5.1lf%sbytes Min,', + 'GPRINT:avg:AVERAGE:%5.1lf%sbytes Avg.,', + 'GPRINT:max:MAX:%5.1lf%sbytes Max,', + 'GPRINT:avg:LAST:%5.1lf%sbytes Last\l', ], vs_processes => [ - 'DEF:proc_avg={file}:total:AVERAGE', - 'DEF:proc_min={file}:total:MIN', - 'DEF:proc_max={file}:total:MAX', - "AREA:proc_max#$HalfBlue", - "AREA:proc_min#$Canvas", - "LINE1:proc_avg#$FullBlue:Processes", - 'GPRINT:proc_min:MIN:%4.1lf Min,', - 'GPRINT:proc_avg:AVERAGE:%4.1lf Avg.,', - 'GPRINT:proc_max:MAX:%4.1lf Max,', - 'GPRINT:proc_avg:LAST:%4.1lf Last\l' + "DEF:avg={file}:value:AVERAGE", + "DEF:min={file}:value:MIN", + "DEF:max={file}:value:MAX", + "AREA:max#$HalfBlue", + "AREA:min#$Canvas", + "LINE1:avg#$FullBlue:Processes", + 'GPRINT:min:MIN:%5.1lf Min,', + 'GPRINT:avg:AVERAGE:%5.1lf Avg.,', + 'GPRINT:max:MAX:%5.1lf Max,', + 'GPRINT:avg:LAST:%5.1lf Last\l', ], }; $GraphDefs->{'if_multicast'} = $GraphDefs->{'ipt_packets'};