From: Florian Forster Date: Thu, 7 Jun 2007 07:41:01 +0000 (+0200) Subject: contrib/collection.cgi: Added graphs for gauge, if_errors, ipt_bytes and ipt_packets. X-Git-Tag: collectd-4.0.1~1 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=66e70d7211ec797ced6beb4ff3d7df923c3ed38d;p=collectd.git contrib/collection.cgi: Added graphs for gauge, if_errors, ipt_bytes and ipt_packets. --- diff --git a/contrib/collection.cgi b/contrib/collection.cgi index 155653dd..de42b786 100755 --- a/contrib/collection.cgi +++ b/contrib/collection.cgi @@ -686,10 +686,8 @@ sub load_graph_definitions apache_requests => ['DEF:min={file}:count:MIN', 'DEF:avg={file}:count:AVERAGE', 'DEF:max={file}:count:MAX', - 'CDEF:moving_average=PREV,UN,avg,PREV,IF,0.8,*,avg,0.2,*,+', "AREA:max#$HalfBlue", "AREA:min#$Canvas", - 'LINE1:moving_average#000000', "LINE1:avg#$FullBlue:Requests/s", 'GPRINT:min:MIN:%6.2lf Min,', 'GPRINT:avg:AVERAGE:%6.2lf Avg,', @@ -1039,6 +1037,18 @@ sub load_graph_definitions 'GPRINT:ppm_max:MAX:%5.2lf Max,', 'GPRINT:ppm_avg:LAST:%5.2lf Last' ], + gauge => ['-v', 'Exec value', + 'DEF:temp_avg={file}:value:AVERAGE', + 'DEF:temp_min={file}:value:MIN', + 'DEF:temp_max={file}:value:MAX', + "AREA:temp_max#$HalfBlue", + "AREA:temp_min#$Canvas", + "LINE1:temp_avg#$FullBlue:Exec value", + 'GPRINT:temp_min:MIN:%6.2lf Min,', + 'GPRINT:temp_avg:AVERAGE:%6.2lf Avg,', + 'GPRINT:temp_max:MAX:%6.2lf Max,', + 'GPRINT:temp_avg:LAST:%6.2lf Last\l' + ], hddtemp => [ 'DEF:temp_avg={file}:value:AVERAGE', 'DEF:temp_min={file}:value:MIN', @@ -1051,6 +1061,36 @@ sub load_graph_definitions 'GPRINT:temp_max:MAX:%4.1lf Max,', 'GPRINT:temp_avg:LAST:%4.1lf Last\l' ], + if_errors => ['-v', 'Errors/s', + 'DEF:tx_min={file}:tx:MIN', + 'DEF:tx_avg={file}:tx:AVERAGE', + 'DEF:tx_max={file}:tx:MAX', + 'DEF:rx_min={file}:rx:MIN', + 'DEF:rx_avg={file}:rx:AVERAGE', + 'DEF:rx_max={file}:rx:MAX', + 'CDEF:overlap=tx_avg,rx_avg,GT,rx_avg,tx_avg,IF', + 'CDEF:mytime=tx_avg,TIME,TIME,IF', + 'CDEF:sample_len_raw=mytime,PREV(mytime),-', + 'CDEF:sample_len=sample_len_raw,UN,0,sample_len_raw,IF', + 'CDEF:tx_avg_sample=tx_avg,UN,0,tx_avg,IF,sample_len,*', + 'CDEF:tx_avg_sum=PREV,UN,0,PREV,IF,tx_avg_sample,+', + 'CDEF:rx_avg_sample=rx_avg,UN,0,rx_avg,IF,sample_len,*', + 'CDEF:rx_avg_sum=PREV,UN,0,PREV,IF,rx_avg_sample,+', + "AREA:tx_avg#$HalfGreen", + "AREA:rx_avg#$HalfBlue", + "AREA:overlap#$HalfBlueGreen", + "LINE1:tx_avg#$FullGreen:TX", + 'GPRINT:tx_avg:AVERAGE:%5.1lf%s Avg,', + 'GPRINT:tx_max:MAX:%5.1lf%s Max,', + 'GPRINT:tx_avg:LAST:%5.1lf%s Last', + 'GPRINT:tx_avg_sum:LAST:(ca. %4.0lf%s Total)\l', + "LINE1:rx_avg#$FullBlue:RX", + #'GPRINT:rx_min:MIN:%5.1lf %s Min,', + 'GPRINT:rx_avg:AVERAGE:%5.1lf%s Avg,', + 'GPRINT:rx_max:MAX:%5.1lf%s Max,', + 'GPRINT:rx_avg:LAST:%5.1lf%s Last', + 'GPRINT:rx_avg_sum:LAST:(ca. %4.0lf%s Total)\l' + ], if_packets => ['-v', 'Packets/s', 'DEF:tx_min={file}:tx:MIN', 'DEF:tx_avg={file}:tx:AVERAGE', @@ -1081,6 +1121,42 @@ sub load_graph_definitions 'GPRINT:rx_avg:LAST:%5.1lf%s Last', 'GPRINT:rx_avg_sum:LAST:(ca. %4.0lf%s Total)\l' ], + ipt_bytes => ['-v', 'Bits/s', + 'DEF:min_raw={file}:value:MIN', + 'DEF:avg_raw={file}:value:AVERAGE', + 'DEF:max_raw={file}:value:MAX', + 'CDEF:min=min_raw,8,*', + 'CDEF:avg=avg_raw,8,*', + 'CDEF:max=max_raw,8,*', + 'CDEF:mytime=avg_raw,TIME,TIME,IF', + 'CDEF:sample_len_raw=mytime,PREV(mytime),-', + 'CDEF:sample_len=sample_len_raw,UN,0,sample_len_raw,IF', + 'CDEF:avg_sample=avg_raw,UN,0,avg_raw,IF,sample_len,*', + 'CDEF:avg_sum=PREV,UN,0,PREV,IF,avg_sample,+', + "AREA:max#$HalfBlue", + "AREA:min#$Canvas", + "LINE1:avg#$FullBlue:Bits/s", + #'GPRINT:min:MIN:%5.1lf %s Min,', + 'GPRINT:avg:AVERAGE:%5.1lf%s Avg,', + 'GPRINT:max:MAX:%5.1lf%s Max,', + 'GPRINT:avg:LAST:%5.1lf%s Last', + 'GPRINT:avg_sum:LAST:(ca. %5.1lf%sB Total)\l' + ], + ipt_packets => ['-v', 'Packets/s', + 'DEF:min_raw={file}:value:MIN', + 'DEF:avg_raw={file}:value:AVERAGE', + 'DEF:max_raw={file}:value:MAX', + 'CDEF:min=min_raw,8,*', + 'CDEF:avg=avg_raw,8,*', + 'CDEF:max=max_raw,8,*', + "AREA:max#$HalfBlue", + "AREA:min#$Canvas", + "LINE1:avg#$FullBlue:Packets/s", + 'GPRINT:min:MIN:%5.1lf %s Min,', + 'GPRINT:avg:AVERAGE:%5.1lf%s Avg,', + 'GPRINT:max:MAX:%5.1lf%s Max,', + 'GPRINT:avg:LAST:%5.1lf%s Last\l' + ], irq => ['-v', 'Issues/s', 'DEF:avg={file}:value:AVERAGE', 'DEF:min={file}:value:MIN',