Merge branch 'master' into ls/sensors

[collectd.git] / contrib / collection.cgi

diff --git a/contrib/collection.cgi b/contrib/collection.cgi
index a0fc4fc..a7f63fd 100755 (executable)
--- a/contrib/collection.cgi
+++ b/contrib/collection.cgi
@@ -251,9 +251,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,',
@@ -275,9 +275,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,',
@@ -839,9 +839,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,',
@@ -1058,7 +1058,7 @@ our $GraphArgs =
        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'],
+       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'],
@@ -1088,7 +1088,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'],