Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd

[collectd.git] / contrib / collection.cgi

diff --git a/contrib/collection.cgi b/contrib/collection.cgi
index 2c76941..7494202 100755 (executable)
--- a/contrib/collection.cgi
+++ b/contrib/collection.cgi
@@ -286,9 +286,9 @@ 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#$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,',
@@ -310,9 +310,9 @@ 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: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,',
@@ -653,6 +653,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",
@@ -898,9 +910,9 @@ 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,',
@@ -1118,7 +1130,7 @@ our $GraphArgs =
        df => ['-t', '{host}:{inst} usage', '-v', 'Percent', '-l', '0'],
        disk => ['-t', '{host} disk {inst} usage', '-v', 'Byte/s'],
        dns_traffic => ['-t', '{host} DNS traffic', '-v', 'Bit/s'],
-       fanspeed => ['-t', '{host} fanspeed {inst}', '-v', 'rpm'],
+       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'],
        if_errors => ['-t', '{host} {inst} errors', '-v', 'Errors/s'],
@@ -1132,6 +1144,7 @@ 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'],
@@ -1150,7 +1163,7 @@ our $GraphArgs =
        traffic => ['-t', '{host} {inst} traffic', '-v', 'Bit/s'],
        users => ['-t', '{host} users', '-v', 'Users'],
        multimeter => ['-t', '{host} multimeter', '-v', 'Value'],
-       voltage => ['-t', '{host} voltage', '-v', 'Volts'],
+       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'],