X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=contrib%2Fcollection.cgi;h=31f1b9179b5ae4823436c781eecb3870648c6865;hb=034a237b11bf1a8809751f103b01ff1c3859ec2b;hp=fbfd22991da33d13d19db4240bfeceb2dbaed831;hpb=4eb4e3fd530d29bd48f05166b00767f4c2698acc;p=collectd.git diff --git a/contrib/collection.cgi b/contrib/collection.cgi index fbfd2299..31f1b917 100755 --- a/contrib/collection.cgi +++ b/contrib/collection.cgi @@ -106,6 +106,18 @@ our $GraphDefs; 'GPRINT:max:MAX:%5.1lf%sAh Max,', 'GPRINT:avg:LAST:%5.1lf%sAh Last\l' ], + charge_percent => [ + 'DEF:avg={file}:percent:AVERAGE', + 'DEF:min={file}:percent:MIN', + 'DEF:max={file}:percent:MAX', + "AREA:max#$HalfBlue", + "AREA:min#$Canvas", + "LINE1:avg#$FullBlue:Charge", + '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' + ], cpu => ['DEF:user_avg={file}:user:AVERAGE', 'DEF:user_min={file}:user:MIN', 'DEF:user_max={file}:user:MAX', @@ -235,30 +247,164 @@ our $GraphDefs; 'GPRINT:total_max_ms:MAX:%5.1lf%s Max,', 'GPRINT:total_avg_ms:LAST:%5.1lf%s Last' ], + dns_traffic => ['DEF:rsp_min_raw={file}:responses:MIN', + 'DEF:rsp_avg_raw={file}:responses:AVERAGE', + 'DEF:rsp_max_raw={file}:responses:MAX', + 'DEF:qry_min_raw={file}:queries:MIN', + 'DEF:qry_avg_raw={file}:queries:AVERAGE', + 'DEF:qry_max_raw={file}:queries:MAX', + 'CDEF:rsp_min=rsp_min_raw,8,*', + 'CDEF:rsp_avg=rsp_avg_raw,8,*', + 'CDEF:rsp_max=rsp_max_raw,8,*', + 'CDEF:qry_min=qry_min_raw,8,*', + 'CDEF:qry_avg=qry_avg_raw,8,*', + 'CDEF:qry_max=qry_max_raw,8,*', + 'CDEF:overlap=rsp_avg,qry_avg,GT,qry_avg,rsp_avg,IF', + 'CDEF:mytime=rsp_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:rsp_avg_sample=rsp_avg_raw,UN,0,rsp_avg_raw,IF,sample_len,*', + 'CDEF:rsp_avg_sum=PREV,UN,0,PREV,IF,rsp_avg_sample,+', + 'CDEF:qry_avg_sample=qry_avg_raw,UN,0,qry_avg_raw,IF,sample_len,*', + 'CDEF:qry_avg_sum=PREV,UN,0,PREV,IF,qry_avg_sample,+', + "AREA:rsp_avg#$HalfGreen", + "AREA:qry_avg#$HalfBlue", + "AREA:overlap#$HalfBlueGreen", + "LINE1:rsp_avg#$FullGreen:Responses", + 'GPRINT:rsp_avg:AVERAGE:%5.1lf%s Avg,', + 'GPRINT:rsp_max:MAX:%5.1lf%s Max,', + 'GPRINT:rsp_avg:LAST:%5.1lf%s Last', + 'GPRINT:rsp_avg_sum:LAST:(ca. %5.1lf%sB Total)\l', + "LINE1:qry_avg#$FullBlue:Queries ", + #'GPRINT:qry_min:MIN:%5.1lf %s Min,', + 'GPRINT:qry_avg:AVERAGE:%5.1lf%s Avg,', + 'GPRINT:qry_max:MAX:%5.1lf%s Max,', + 'GPRINT:qry_avg:LAST:%5.1lf%s Last', + 'GPRINT:qry_avg_sum:LAST:(ca. %5.1lf%sB Total)\l' + ], + email => [ + 'DEF:avg={file}:count:AVERAGE', + 'DEF:min={file}:count:MIN', + 'DEF:max={file}:count:MAX', + "AREA:max#$HalfMagenta", + "AREA:min#$Canvas", + "LINE1:avg#$FullMagenta:Count ", + 'GPRINT:min:MIN:%4.1lf Min,', + 'GPRINT:avg:AVERAGE:%4.1lf Avg,', + 'GPRINT:max:MAX:%4.1lf Max,', + 'GPRINT:avg:LAST:%4.1lf Last\l' + ], + email_size => [ + 'DEF:avg={file}:size:AVERAGE', + 'DEF:min={file}:size:MIN', + 'DEF:max={file}:size:MAX', + "AREA:max#$HalfMagenta", + "AREA:min#$Canvas", + "LINE1:avg#$FullMagenta:Count ", + 'GPRINT:min:MIN:%4.1lf Min,', + 'GPRINT:avg:AVERAGE:%4.1lf Avg,', + 'GPRINT:max:MAX:%4.1lf Max,', + 'GPRINT:avg:LAST:%4.1lf Last\l' + ], + spam_score => [ + 'DEF:avg={file}:score:AVERAGE', + 'DEF:min={file}:score:MIN', + 'DEF:max={file}:score:MAX', + "AREA:max#$HalfMagenta", + "AREA:min#$Canvas", + "LINE1:avg#$FullMagenta:Count ", + 'GPRINT:min:MIN:%4.1lf Min,', + 'GPRINT:avg:AVERAGE:%4.1lf Avg,', + 'GPRINT:max:MAX:%4.1lf Max,', + 'GPRINT:avg:LAST:%4.1lf Last\l' + ], + spam_check => [ + 'DEF:avg={file}:hits:AVERAGE', + 'DEF:min={file}:hits:MIN', + 'DEF:max={file}:hits:MAX', + "AREA:max#$HalfMagenta", + "AREA:min#$Canvas", + "LINE1:avg#$FullMagenta:Count ", + 'GPRINT:min:MIN:%4.1lf Min,', + 'GPRINT:avg:AVERAGE:%4.1lf Avg,', + 'GPRINT:max:MAX:%4.1lf Max,', + 'GPRINT:avg:LAST:%4.1lf Last\l' + ], fanspeed => [ 'DEF:temp_avg={file}:value:AVERAGE', 'DEF:temp_min={file}:value:MIN', 'DEF:temp_max={file}:value:MAX', - "AREA:temp_max#$HalfBlue", + "AREA:temp_max#$HalfMagenta", "AREA:temp_min#$Canvas", - "LINE1:temp_avg#$FullBlue:RPM", + "LINE1:temp_avg#$FullMagenta:RPM", 'GPRINT:temp_min:MIN:%4.1lf Min,', 'GPRINT:temp_avg:AVERAGE:%4.1lf Avg,', 'GPRINT:temp_max:MAX:%4.1lf Max,', 'GPRINT:temp_avg:LAST:%4.1lf Last\l' ], + frequency_offset => [ # NTPd + 'DEF:ppm_avg={file}:ppm:AVERAGE', + 'DEF:ppm_min={file}:ppm:MIN', + 'DEF:ppm_max={file}:ppm:MAX', + "AREA:ppm_max#$HalfBlue", + "AREA:ppm_min#$Canvas", + "LINE1:ppm_avg#$FullBlue:{inst}", + 'GPRINT:ppm_min:MIN:%5.2lf Min,', + 'GPRINT:ppm_avg:AVERAGE:%5.2lf Avg,', + 'GPRINT:ppm_max:MAX:%5.2lf Max,', + 'GPRINT:ppm_avg:LAST:%5.2lf Last' + ], hddtemp => [ 'DEF:temp_avg={file}:value:AVERAGE', 'DEF:temp_min={file}:value:MIN', 'DEF:temp_max={file}:value:MAX', - "AREA:temp_max#$HalfBlue", + "AREA:temp_max#$HalfRed", "AREA:temp_min#$Canvas", - "LINE1:temp_avg#$FullBlue:Temperature", + "LINE1:temp_avg#$FullRed:Temperature", 'GPRINT:temp_min:MIN:%4.1lf Min,', 'GPRINT:temp_avg:AVERAGE:%4.1lf Avg,', 'GPRINT:temp_max:MAX:%4.1lf Max,', 'GPRINT:temp_avg:LAST:%4.1lf Last\l' ], + irq => ['DEF:irq_avg={file}:irq:AVERAGE', + 'DEF:irq_min={file}:irq:MIN', + 'DEF:irq_max={file}:irq:MAX', + "AREA:irq_max#$HalfBlue", + "AREA:irq_min#$Canvas", + "LINE1:irq_avg#$FullBlue:Interrupts", + 'GPRINT:irq_min:MIN:%5.1lf Min,', + 'GPRINT:irq_avg:AVERAGE:%5.1lf Avg,', + 'GPRINT:irq_max:MAX:%5.1lf Max,', + 'GPRINT:irq_avg:LAST:%5.1lf Last'], + if_packets => ['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' + ], load => ['DEF:s_avg={file}:shortterm:AVERAGE', 'DEF:s_min={file}:shortterm:MIN', 'DEF:s_max={file}:shortterm:MAX', @@ -286,6 +432,18 @@ our $GraphDefs; 'GPRINT:l_max:MAX:%4.2lf Max,', 'GPRINT:l_avg:LAST:%4.2lf Last' ], + load_percent => [ + 'DEF:avg={file}:percent:AVERAGE', + 'DEF:min={file}:percent:MIN', + 'DEF:max={file}:percent:MAX', + "AREA:max#$HalfBlue", + "AREA:min#$Canvas", + "LINE1:avg#$FullBlue:Load", + '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' + ], mails => ['DEF:rawgood={file}:good:AVERAGE', 'DEF:rawspam={file}:spam:AVERAGE', 'CDEF:good=rawgood,UN,0,rawgood,IF', @@ -553,6 +711,18 @@ our $GraphDefs; 'GPRINT:read_avg:AVERAGE:%5.1lf Avg,', 'GPRINT:read_avg:LAST:%5.1lf Last\l' ], + opcode => [ + 'DEF:avg={file}:value:AVERAGE', + 'DEF:min={file}:value:MIN', + 'DEF:max={file}:value:MAX', + "AREA:max#$HalfBlue", + "AREA:min#$Canvas", + "LINE1:avg#$FullBlue:Queries/s", + 'GPRINT:min:MIN:%9.3lf Min,', + 'GPRINT:avg:AVERAGE:%9.3lf Average,', + 'GPRINT:max:MAX:%9.3lf Max,', + 'GPRINT:avg:LAST:%9.3lf Last\l' + ], partition => [ "DEF:rbyte_avg={file}:rbytes:AVERAGE", "DEF:rbyte_min={file}:rbytes:MIN", @@ -647,6 +817,109 @@ our $GraphDefs; 'GPRINT:sleeping_max:MAX:%5.1lf Max,', 'GPRINT:sleeping_avg:LAST:%5.1lf Last\l' ], + ps_rss => [ + 'DEF:avg={file}:byte:AVERAGE', + 'DEF:min={file}:byte:MIN', + 'DEF:max={file}:byte:MAX', + "AREA:avg#$HalfBlue", + "LINE1:avg#$FullBlue:RSS", + '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' + ], + ps_cputime => [ + 'DEF:user_avg_raw={file}:user:AVERAGE', + 'DEF:user_min_raw={file}:user:MIN', + 'DEF:user_max_raw={file}:user:MAX', + 'DEF:syst_avg_raw={file}:syst:AVERAGE', + 'DEF:syst_min_raw={file}:syst:MIN', + 'DEF:syst_max_raw={file}:syst:MAX', + 'CDEF:user_avg=user_avg_raw,1000000,/', + 'CDEF:user_min=user_min_raw,1000000,/', + 'CDEF:user_max=user_max_raw,1000000,/', + 'CDEF:syst_avg=syst_avg_raw,1000000,/', + 'CDEF:syst_min=syst_min_raw,1000000,/', + 'CDEF:syst_max=syst_max_raw,1000000,/', + 'CDEF:user_syst=syst_avg,UN,0,syst_avg,IF,user_avg,+', + "AREA:user_syst#$HalfBlue", + "AREA:syst_avg#$HalfRed", + "LINE1:user_syst#$FullBlue:User ", + 'GPRINT:user_min:MIN:%5.1lf%s Min,', + 'GPRINT:user_avg:AVERAGE:%5.1lf%s Avg,', + 'GPRINT:user_max:MAX:%5.1lf%s Max,', + 'GPRINT:user_avg:LAST:%5.1lf%s Last\l', + "LINE1:syst_avg#$FullRed:System", + 'GPRINT:syst_min:MIN:%5.1lf%s Min,', + 'GPRINT:syst_avg:AVERAGE:%5.1lf%s Avg,', + 'GPRINT:syst_max:MAX:%5.1lf%s Max,', + 'GPRINT:syst_avg:LAST:%5.1lf%s Last\l' + ], + ps_count => [ + 'DEF:procs_avg={file}:processes:AVERAGE', + 'DEF:procs_min={file}:processes:MIN', + 'DEF:procs_max={file}:processes:MAX', + 'DEF:thrds_avg={file}:threads:AVERAGE', + 'DEF:thrds_min={file}:threads:MIN', + 'DEF:thrds_max={file}:threads:MAX', + "AREA:thrds_avg#$HalfBlue", + "AREA:procs_avg#$HalfRed", + "LINE1:thrds_avg#$FullBlue:Threads ", + 'GPRINT:thrds_min:MIN:%5.1lf Min,', + 'GPRINT:thrds_avg:AVERAGE:%5.1lf Avg,', + 'GPRINT:thrds_max:MAX:%5.1lf Max,', + 'GPRINT:thrds_avg:LAST:%5.1lf Last\l', + "LINE1:procs_avg#$FullRed:Processes", + 'GPRINT:procs_min:MIN:%5.1lf Min,', + 'GPRINT:procs_avg:AVERAGE:%5.1lf Avg,', + 'GPRINT:procs_max:MAX:%5.1lf Max,', + 'GPRINT:procs_avg:LAST:%5.1lf Last\l' + ], + ps_pagefaults => [ + 'DEF:minor_avg={file}:minflt:AVERAGE', + 'DEF:minor_min={file}:minflt:MIN', + 'DEF:minor_max={file}:minflt:MAX', + 'DEF:major_avg={file}:majflt:AVERAGE', + 'DEF:major_min={file}:majflt:MIN', + 'DEF:major_max={file}:majflt:MAX', + 'CDEF:minor_major=major_avg,UN,0,major_avg,IF,minor_avg,+', + "AREA:minor_major#$HalfBlue", + "AREA:major_avg#$HalfRed", + "LINE1:minor_major#$FullBlue:Minor", + 'GPRINT:minor_min:MIN:%5.1lf%s Min,', + 'GPRINT:minor_avg:AVERAGE:%5.1lf%s Avg,', + 'GPRINT:minor_max:MAX:%5.1lf%s Max,', + 'GPRINT:minor_avg:LAST:%5.1lf%s Last\l', + "LINE1:major_avg#$FullRed:Major", + 'GPRINT:major_min:MIN:%5.1lf%s Min,', + 'GPRINT:major_avg:AVERAGE:%5.1lf%s Avg,', + 'GPRINT:major_max:MAX:%5.1lf%s Max,', + 'GPRINT:major_avg:LAST:%5.1lf%s Last\l' + ], + qtype => [ + 'DEF:avg={file}:value:AVERAGE', + 'DEF:min={file}:value:MIN', + 'DEF:max={file}:value:MAX', + "AREA:max#$HalfBlue", + "AREA:min#$Canvas", + "LINE1:avg#$FullBlue:Queries/s", + 'GPRINT:min:MIN:%9.3lf Min,', + 'GPRINT:avg:AVERAGE:%9.3lf Average,', + 'GPRINT:max:MAX:%9.3lf Max,', + 'GPRINT:avg:LAST:%9.3lf Last\l' + ], + rcode => [ + 'DEF:avg={file}:value:AVERAGE', + 'DEF:min={file}:value:MIN', + 'DEF:max={file}:value:MAX', + "AREA:max#$HalfBlue", + "AREA:min#$Canvas", + "LINE1:avg#$FullBlue:Queries/s", + 'GPRINT:min:MIN:%9.3lf Min,', + 'GPRINT:avg:AVERAGE:%9.3lf Average,', + 'GPRINT:max:MAX:%9.3lf Max,', + 'GPRINT:avg:LAST:%9.3lf Last\l' + ], swap => [ 'DEF:used_avg={file}:used:AVERAGE', 'DEF:used_min={file}:used:MIN', @@ -695,14 +968,38 @@ our $GraphDefs; 'DEF:temp_avg={file}:value:AVERAGE', 'DEF:temp_min={file}:value:MIN', 'DEF:temp_max={file}:value:MAX', - "AREA:temp_max#$HalfBlue", + "AREA:temp_max#$HalfRed", "AREA:temp_min#$Canvas", - "LINE1:temp_avg#$FullBlue:Value", + "LINE1:temp_avg#$FullRed:Temperature", 'GPRINT:temp_min:MIN:%4.1lf Min,', 'GPRINT:temp_avg:AVERAGE:%4.1lf Avg,', 'GPRINT:temp_max:MAX:%4.1lf Max,', 'GPRINT:temp_avg:LAST:%4.1lf Last\l' ], + timeleft => [ + 'DEF:avg={file}:timeleft:AVERAGE', + 'DEF:min={file}:timeleft:MIN', + 'DEF:max={file}:timeleft:MAX', + "AREA:max#$HalfBlue", + "AREA:min#$Canvas", + "LINE1:avg#$FullBlue:Time left [min]", + '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' + ], + time_offset => [ # NTPd + 'DEF:s_avg={file}:seconds:AVERAGE', + 'DEF:s_min={file}:seconds:MIN', + 'DEF:s_max={file}:seconds:MAX', + "AREA:s_max#$HalfBlue", + "AREA:s_min#$Canvas", + "LINE1:s_avg#$FullBlue:{inst}", + 'GPRINT:s_min:MIN:%7.3lf%s Min,', + 'GPRINT:s_avg:AVERAGE:%7.3lf%s Avg,', + 'GPRINT:s_max:MAX:%7.3lf%s Max,', + 'GPRINT:s_avg:LAST:%7.3lf%s Last' + ], traffic => ['DEF:out_min_raw={file}:outgoing:MIN', 'DEF:out_avg_raw={file}:outgoing:AVERAGE', 'DEF:out_max_raw={file}:outgoing:MAX', @@ -750,6 +1047,18 @@ our $GraphDefs; 'GPRINT:cpufreq_max:MAX:%5.1lf%s Max,', 'GPRINT:cpufreq_avg:LAST:%5.1lf%s Last\l' ], + multimeter => [ + 'DEF:multimeter_avg={file}:value:AVERAGE', + 'DEF:multimeter_min={file}:value:MIN', + 'DEF:multimeter_max={file}:value:MAX', + "AREA:multimeter_max#$HalfBlue", + "AREA:multimeter_min#$Canvas", + "LINE1:multimeter_avg#$FullBlue:Multimeter", + 'GPRINT:multimeter_min:MIN:%4.1lf Min,', + 'GPRINT:multimeter_avg:AVERAGE:%4.1lf Average,', + 'GPRINT:multimeter_max:MAX:%4.1lf Max,', + 'GPRINT:multimeter_avg:LAST:%4.1lf Last\l' + ], users => [ 'DEF:users_avg={file}:users:AVERAGE', 'DEF:users_min={file}:users:MIN', @@ -774,7 +1083,7 @@ our $GraphDefs; 'GPRINT:max:MAX:%5.1lf%sV Max,', 'GPRINT:avg:LAST:%5.1lf%sV Last\l' ], - threads => [ + vs_threads => [ "DEF:total_avg={file}:total:AVERAGE", "DEF:total_min={file}:total:MIN", "DEF:total_max={file}:total:MAX", @@ -856,8 +1165,12 @@ our $GraphDefs; ], }; $GraphDefs->{'disk'} = $GraphDefs->{'partition'}; + $GraphDefs->{'if_errors'} = $GraphDefs->{'if_packets'}; $GraphDefs->{'meminfo'} = $GraphDefs->{'memory'}; $GraphDefs->{'sensors'} = $GraphDefs->{'temperature'}; + + $GraphDefs->{'delay'} = $GraphDefs->{'time_offset'}; + $GraphDefs->{'time_dispersion'} = $GraphDefs->{'time_offset'}; } our $GraphArgs = @@ -866,15 +1179,27 @@ our $GraphArgs = apache_requests => ['-t', 'apache requests', '-v', 'Requests/s'], apache_scoreboard => ['-t', 'apache scoreboard {inst}', '-v', 'Processes'], charge => ['-t', '{host} charge', '-v', 'Ampere hours'], + charge_percent => ['-t', '{host} charge', '-v', 'Percent'], cpu => ['-t', '{host} cpu{inst} usage', '-v', 'Percent', '-l', '0'], cpufreq => ['-t', '{host} cpu{inst} usage', '-v', 'Mhz'], current => ['-t', '{host} current', '-v', 'Ampere'], #disk => ['-t', '{host} disk {inst} IO wait', '-v', 'Seconds'], + delay => ['-t', 'NTPd peer delay ({inst})', '-v', 'Seconds'], df => ['-t', '{host}:{inst} usage', '-v', 'Percent', '-l', '0'], disk => ['-t', '{host} disk {inst} usage', '-v', 'Byte/s'], - fanspeed => ['-t', '{host} fanspeed {inst}', '-v', 'rpm'], + dns_traffic => ['-t', '{host} DNS traffic', '-v', 'Bit/s'], + email => ['-t', '{host} E-Mail {inst} count', '-v', 'E-Mails'], + email_size => ['-t', '{host} E-Mail {inst} size', '-v', 'Bytes'], + spam_score => ['-t', '{host} spam score', '-v', 'score'], + spam_check => ['-t', '{host} spam checks {inst}', '-v', 'hits'], + fanspeed => ['-t', '{host} fanspeed {inst}', '-v', 'RPM'], + frequency_offset => ['-t', 'NTPd frequency offset ({inst})', '-v', 'Parts per million'], hddtemp => ['-t', '{host} hdd temperature {inst}', '-v', '°Celsius'], + irq => ['-t', '{host} Interrupts {inst}', '-v', 'Ints/s'], + if_errors => ['-t', '{host} {inst} errors', '-v', 'Errors/s'], + if_packets => ['-t', '{host} {inst} packets', '-v', 'Packets/s'], load => ['-t', '{host} load average', '-v', 'System load', '-X', '0'], + load_percent => ['-t', '{host} load', '-v', 'Percent'], mails => ['-t', '{host} mail count', '-v', 'Amount', '-X', '0'], memory => ['-t', '{host} memory usage', '-v', 'Bytes', '-b', '1024', '-l', '0'], mysql_commands => ['-t', 'mysql command {inst}', '-v', 'Issues/s' ], @@ -882,16 +1207,27 @@ our $GraphArgs = mysql_qcache => ['-t', 'mysql query cache', '-v', 'Queries/s' ], mysql_threads => ['-t', 'mysql threads', '-v', 'Threads' ], nfs3_procedures => ['-t', '{host} NFSv3 {inst} procedures', '-v', 'Procedures/s' ], + opcode => ['-t', 'OpCode {inst}', '-v', 'Queries/s'], partition => ['-t', '{host} partition {inst} usage', '-v', 'Byte/s'], ping => ['-t', '{host} ping to {inst}', '-v', 'ms'], processes => ['-t', '{host} processes', '-v', 'Processes'], + ps_rss => ['-t', '{host} process {inst} RSS', '-v', 'Bytes', '-b', '1024'], + ps_cputime => ['-t', '{host} process {inst} CPU usage', '-v', 'Seconds'], + ps_count => ['-t', '{host} process {inst} count', '-v', 'Threads/Processes'], + ps_pagefaults => ['-t', '{host} process {inst} pagefaults', '-v', 'Pagefaults/s'], + qtype => ['-t', 'QType {inst}', '-v', 'Queries/s'], + rcode => ['-t', 'RCode {inst}', '-v', 'Queries/s'], sensors => ['-t', '{host} sensor {inst}', '-v', '°Celsius'], swap => ['-t', '{host} swap usage', '-v', 'Bytes', '-b', '1024', '-l', '0'], temperature => ['-t', '{host} temperature {inst}', '-v', '°Celsius'], + timeleft => ['-t', '{host} UPS time left', '-v', 'Time [min]'], + time_offset => ['-t', 'NTPd time offset ({inst})', '-v', 'Seconds'], + time_dispersion => ['-t', 'NTPd time dispersion ({inst})', '-v', 'Seconds'], traffic => ['-t', '{host} {inst} traffic', '-v', 'Bit/s'], users => ['-t', '{host} users', '-v', 'Users'], - voltage => ['-t', '{host} voltage', '-v', 'Volts'], - threads => ['-t', '{host} threads', '-v', 'Threads'], + multimeter => ['-t', '{host} multimeter', '-v', 'Value'], + voltage => ['-t', '{host} voltage {inst}', '-v', 'Volts'], + vs_threads => ['-t', '{host} threads', '-v', 'Threads'], vs_memory => ['-t', '{host} memory usage', '-v', 'Bytes'], vs_processes => ['-t', '{host} processes', '-v', 'Processes'], }; @@ -902,6 +1238,11 @@ our $GraphMulti = cpu => \&output_graph_cpu, cpufreq => 1, disk => 1, + email => \&output_graph_email_count, + email_size => \&output_graph_email_size, + irq => \&output_graph_irq, + spam_score => 1, + spam_check => \&output_graph_spam_check, load => 0, mails => 0, memory => 0, @@ -909,9 +1250,12 @@ our $GraphMulti = mysql_handler => \&output_graph_mysql_handler, partition => 1, ping => \&output_graph_ping, + qtype => \&output_graph_named_qtype, + rcode => \&output_graph_named_rcode, sensors => 1, traffic => 1, - users => 1 + users => 1, + multimeter => 1 }; our @Info; @@ -1087,6 +1431,157 @@ sub output_graph_ping return (@ret); } +sub output_graph_irq +{ + my @inst = sort { $a <=> $b } @_; + my @ret = (); + + die if (@inst < 2); + + my @colors = get_n_colors (scalar (@inst)); + + for (my $i = 0; $i < scalar (@inst); $i++) + { + my $inst = $inst[$i]; + push (@ret, + "DEF:avg_$i=$AbsDir/irq-$inst.rrd:irq:AVERAGE", + "DEF:min_$i=$AbsDir/irq-$inst.rrd:irq:MIN", + "DEF:max_$i=$AbsDir/irq-$inst.rrd:irq:MAX"); + } + + for (my $i = 0; $i < scalar (@inst); $i++) + { + my $inst = $inst[$i]; + my $color = $colors[$i]; + + if (length ($inst) > 15) + { + $inst = substr ($inst, 0, 12) . '...'; + } + else + { + $inst = sprintf ('%-15s', $inst); + } + + push (@ret, + "LINE1:avg_$i#$color:$inst", + "GPRINT:min_$i:MIN:%5.1lf Min,", + "GPRINT:avg_$i:AVERAGE:%5.1lf Avg,", + "GPRINT:max_$i:MAX:%5.1lf Max,", + "GPRINT:avg_$i:LAST:%5.1lf Last\\l"); + } + + return (@ret); +} + +sub output_graph_email_count +{ + my @inst = @_; + my @ret = (); + + my $c = scalar @inst; + + my @colors = get_n_colors ($c); + + for (my $i = 0; $i < $c; ++$i) { + push @ret, + "DEF:min_$i=$AbsDir/email-$inst[$i].rrd:count:MIN", + "DEF:avg_$i=$AbsDir/email-$inst[$i].rrd:count:AVERAGE", + "DEF:max_$i=$AbsDir/email-$inst[$i].rrd:count:MAX"; + } + + for (my $i = 0; $i < $c; ++$i) { + my $s = ""; + + if (length $inst[$i] > 10) { + $s = substr ($inst[$i], 0, 7) . '...'; + } + else { + $s = sprintf '%-10s', $inst[$i]; + } + + push @ret, + "LINE1:avg_$i#$colors[$i]:$s", + "GPRINT:min_$i:MIN:%4.1lf Min,", + "GPRINT:avg_$i:AVERAGE:%4.1lf Avg,", + "GPRINT:max_$i:MAX:%4.1lf Max,", + "GPRINT:avg_$i:LAST:%4.1lf Last\\l"; + } + return @ret; +} + +sub output_graph_email_size +{ + my @inst = @_; + my @ret = (); + + my $c = scalar @inst; + + my @colors = get_n_colors ($c); + + for (my $i = 0; $i < $c; ++$i) { + push @ret, + "DEF:min_$i=$AbsDir/email_size-$inst[$i].rrd:size:MIN", + "DEF:avg_$i=$AbsDir/email_size-$inst[$i].rrd:size:AVERAGE", + "DEF:max_$i=$AbsDir/email_size-$inst[$i].rrd:size:MAX"; + } + + for (my $i = 0; $i < $c; ++$i) { + my $s = ""; + + if (length $inst[$i] > 10) { + $s = substr ($inst[$i], 0, 7) . '...'; + } + else { + $s = sprintf '%-10s', $inst[$i]; + } + + push @ret, + "LINE1:avg_$i#$colors[$i]:$s", + "GPRINT:min_$i:MIN:%4.1lf Min,", + "GPRINT:avg_$i:AVERAGE:%4.1lf Avg,", + "GPRINT:max_$i:MAX:%4.1lf Max,", + "GPRINT:avg_$i:LAST:%4.1lf Last\\l"; + } + return @ret; +} + +sub output_graph_spam_check +{ + my @inst = sort @_; + my @ret = (); + + my $c = scalar @inst; + + my @colors = get_n_colors ($c); + + for (my $i = 0; $i < $c; ++$i) { + push @ret, + "DEF:min_$i=$AbsDir/spam_check-$inst[$i].rrd:hits:MIN", + "DEF:avg_$i=$AbsDir/spam_check-$inst[$i].rrd:hits:AVERAGE", + "DEF:max_$i=$AbsDir/spam_check-$inst[$i].rrd:hits:MAX"; + } + + for (my $i = 0; $i < $c; ++$i) { + my $s = ""; + + if (length $inst[$i] > 25) { + $s = substr ($inst[$i], 0, 22) . '...'; + } + else { + $s = sprintf '%-25s', $inst[$i]; + } + + push @ret, + "LINE1:avg_$i#$colors[$i]:$s", + "GPRINT:min_$i:MIN:%4.1lf Min,", + "GPRINT:avg_$i:AVERAGE:%4.1lf Avg,", + "GPRINT:max_$i:MAX:%4.1lf Max,", + "GPRINT:avg_$i:LAST:%4.1lf Last\\l"; + } + return @ret; +} + sub output_graph_mysql_commands { my @inst = @_; @@ -1173,6 +1668,93 @@ sub output_graph_mysql_handler return (@ret); } +sub output_graph_named_qtype +{ + my @inst = @_; + my @ret = (); + + die if (@inst < 2); + + my @colors = get_n_colors (scalar (@inst)); + + for (my $i = 0; $i < scalar (@inst); $i++) + { + my $inst = $inst[$i]; + push (@ret, + "DEF:avg_$i=$AbsDir/qtype-$inst.rrd:value:AVERAGE", + "DEF:min_$i=$AbsDir/qtype-$inst.rrd:value:MIN", + "DEF:max_$i=$AbsDir/qtype-$inst.rrd:value:MAX"); + } + + for (my $i = 0; $i < scalar (@inst); $i++) + { + my $inst = $inst[$i]; + my $color = $colors[$i]; + my $type = ($i == 0) ? 'AREA' : 'STACK'; + + if (length ($inst) > 5) + { + $inst = substr ($inst, 0, 5); + } + else + { + $inst = sprintf ('%-5s', $inst); + } + + push (@ret, + "$type:avg_$i#$color:$inst", + "GPRINT:min_$i:MIN:%9.3lf Min,", + "GPRINT:avg_$i:AVERAGE:%9.3lf Avg,", + "GPRINT:max_$i:MAX:%9.3lf Max,", + "GPRINT:avg_$i:LAST:%9.3lf Last\\l"); + } + + return (@ret); +} + +sub output_graph_named_rcode +{ + my @inst = @_; + my @ret = (); + + die if (@inst < 2); + + my @colors = get_n_colors (scalar (@inst)); + + for (my $i = 0; $i < scalar (@inst); $i++) + { + my $inst = $inst[$i]; + push (@ret, + "DEF:avg_$i=$AbsDir/rcode-$inst.rrd:value:AVERAGE", + "DEF:min_$i=$AbsDir/rcode-$inst.rrd:value:MIN", + "DEF:max_$i=$AbsDir/rcode-$inst.rrd:value:MAX"); + } + + for (my $i = 0; $i < scalar (@inst); $i++) + { + my $inst = $inst[$i]; + my $color = $colors[$i]; + my $type = ($i == 0) ? 'AREA' : 'STACK'; + + if (length ($inst) > 8) + { + $inst = substr ($inst, 0, 6) . '..'; + } + else + { + $inst = sprintf ('%-8s', $inst); + } + + push (@ret, + "$type:avg_$i#$color:$inst", + "GPRINT:min_$i:MIN:%9.3lf Min,", + "GPRINT:avg_$i:AVERAGE:%9.3lf Avg,", + "GPRINT:max_$i:MAX:%9.3lf Max,", + "GPRINT:avg_$i:LAST:%9.3lf Last\\l"); + } + + return (@ret); +} sub output_graph { die unless (defined ($GraphDefs->{$Type})); @@ -1292,6 +1874,83 @@ Cache-Control: no-cache + HEADER my $MySelf = defined ($ENV{'GATEWAY_INTERFACE'}) ? $ENV{'SCRIPT_NAME'} : $0; @@ -1301,7 +1960,7 @@ HEADER print qq(\t\t
Go up
\n); print "\t\t

Hourly

-
+

Daily

-
+

Weekly

-
+

Monthly

-
+

Yearly

-
+
HTML } elsif (length ($Type) != 0) @@ -1335,15 +1994,15 @@ HTML print <Hourly -
+

Daily

-
+

Weekly

-
+

Monthly

-
+

Yearly

-
+
HTML } else @@ -1371,7 +2030,7 @@ HTML if (ref ($GraphMulti->{$type}) eq 'CODE') { print qq(\t\t), - qq(\n); + qq(\n); next; } @@ -1382,12 +2041,12 @@ HTML if (length ($inst)) { print qq(\t\t), - qq(\n); + qq(\n); } else { print qq(\t\t), - qq(\n); + qq(\n); } } } @@ -1474,7 +2133,7 @@ sub parse_pathinfo $AbsDir = $Config->{'Directory'}; $RelDir = ''; - while (@info and -d $AbsDir . '/' . $Info[0]) + while (@info and -d $AbsDir . '/' . $info[0]) { my $new = shift (@info); next if ($new =~ m/^\./);