From: octo <octo>
Date: Wed, 10 May 2006 20:06:08 +0000 (+0000)
Subject: octo@leeloo:~/collectd $ svn merge -r630:631 trunk branches/collectd-3.8
X-Git-Tag: collectd-3.8.6^2~4
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=887a0f58ccfb21a6a2cfdd66c006a10712be5c41

octo@leeloo:~/collectd $ svn merge -r630:631 trunk branches/collectd-3.8
octo@leeloo:~/collectd $ svn merge -r630:631 trunk branches/collectd-3.9
---

diff --git a/contrib/collection.cgi b/contrib/collection.cgi
index 95102b53..54cde20b 100755
--- a/contrib/collection.cgi
+++ b/contrib/collection.cgi
@@ -235,18 +235,6 @@ our $GraphDefs;
 			'GPRINT:total_max_ms:MAX:%5.1lf%s Max,',
 			'GPRINT:total_avg_ms:LAST:%5.1lf%s Last'
 		],
-		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_min#$Canvas",
-			"LINE1:temp_avg#$FullBlue: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'
-		],
 		hddtemp => [
 			'DEF:temp_avg={file}:value:AVERAGE',
 			'DEF:temp_min={file}:value:MIN',
@@ -647,6 +635,18 @@ our $GraphDefs;
 			'GPRINT:sleeping_max:MAX:%5.1lf Max,',
 			'GPRINT:sleeping_avg:LAST:%5.1lf Last\l'
 		],
+		sensors => [
+			'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:Value",
+			'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'
+		],
 		swap => [
 			'DEF:used_avg={file}:used:AVERAGE',
 			'DEF:used_min={file}:used:MIN',
@@ -691,18 +691,6 @@ our $GraphDefs;
 			'GPRINT:used_max:MAX:%5.1lf%s Max,',
 			'GPRINT:used_avg:LAST:%5.1lf%s Last\l'
 		],
-		temperature => [
-			'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:Value",
-			'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'
-		],
 		traffic => ['DEF:out_min_raw={file}:outgoing:MIN',
 			'DEF:out_avg_raw={file}:outgoing:AVERAGE',
 			'DEF:out_max_raw={file}:outgoing:MAX',
@@ -857,7 +845,6 @@ our $GraphDefs;
 	};
 	$GraphDefs->{'disk'} = $GraphDefs->{'partition'};
 	$GraphDefs->{'meminfo'} = $GraphDefs->{'memory'};
-	$GraphDefs->{'sensors'} = $GraphDefs->{'temperature'};
 }
 
 our $GraphArgs =
@@ -872,7 +859,6 @@ our $GraphArgs =
 	#disk => ['-t', '{host} disk {inst} IO wait', '-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'],
 	hddtemp => ['-t', '{host} hdd temperature {inst}', '-v', '°Celsius'],
 	load => ['-t', '{host} load average', '-v', 'System load', '-X', '0'],
 	mails   => ['-t', '{host} mail count', '-v', 'Amount', '-X', '0'],
@@ -887,7 +873,6 @@ our $GraphArgs =
 	processes => ['-t', '{host} processes', '-v', 'Processes'],
 	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'],
 	traffic => ['-t', '{host} {inst} traffic', '-v', 'Bit/s'],
 	users => ['-t', '{host} users', '-v', 'Users'],
 	voltage => ['-t', '{host} voltage', '-v', 'Volts'],