X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=contrib%2Fcollection.cgi;h=0d65a767c05ee2d23d9325ced8166d5ba2718bdb;hb=49cd2468501a2a492fa9de5cd1819be821a77c5a;hp=a39828618c7fc1e1b13c76c234b11bacaba66ec5;hpb=e24bfedcc0e262d3be078b1f01fb55fde9012361;p=collectd.git

diff --git a/contrib/collection.cgi b/contrib/collection.cgi
index a3982861..0d65a767 100755
--- a/contrib/collection.cgi
+++ b/contrib/collection.cgi
@@ -774,6 +774,93 @@ our $GraphDefs;
 			'GPRINT:max:MAX:%5.1lf%sV Max,',
 			'GPRINT:avg:LAST:%5.1lf%sV Last\l'
 		],
+		apcups_volt => [
+			'DEF:line_avg={file}:linev:AVERAGE',
+			'DEF:line_min={file}:linev:MIN',
+			'DEF:line_max={file}:linev:MAX',
+			'DEF:out_avg={file}:outputv:AVERAGE',
+			'DEF:out_min={file}:outputv:MIN',
+			'DEF:out_max={file}:outputv:MAX',
+			#"AREA:line_max#$HalfBlue",
+			#"AREA:line_min#$Canvas",
+			#"AREA:out_avg#$HalfGreen",
+			"LINE1:line_avg#$FullBlue:Line Volt",
+			'GPRINT:line_min:MIN:%5.1lf%sV Min,',
+			'GPRINT:line_avg:AVERAGE:%5.1lf%sV Avg,',
+			'GPRINT:line_max:MAX:%5.1lf%sV Max,',
+			'GPRINT:line_avg:LAST:%5.1lf%sV Last\l',
+			"LINE2:out_avg#$FullGreen:Out  Volt",
+			'GPRINT:out_min:MIN:%5.1lf%sV Min,',
+			'GPRINT:out_avg:AVERAGE:%5.1lf%sV Avg,',
+			'GPRINT:out_max:MAX:%5.1lf%sV Max,',
+			'GPRINT:out_avg:LAST:%5.1lf%sV Last\l'
+		],
+		apcups_bvolt => [
+			'DEF:bvolt_avg={file}:battv:AVERAGE',
+			'DEF:bvolt_min={file}:battv:MIN',
+			'DEF:bvolt_max={file}:battv:MAX',
+			"AREA:bvolt_max#$HalfBlue",
+			"LINE1:bvolt_avg#$FullBlue:Batt Volt",
+			'GPRINT:bvolt_min:MIN:%5.1lf%sV Min,',
+			'GPRINT:bvolt_avg:AVERAGE:%5.1lf%sV Avg,',
+			'GPRINT:bvolt_max:MAX:%5.1lf%sV Max,',
+			'GPRINT:bvolt_avg:LAST:%5.1lf%sV Last\l',
+		],
+		apcups_load => [
+			'DEF:load_avg={file}:loadpct:AVERAGE',
+			'DEF:load_min={file}:loadpct:MIN',
+			'DEF:load_max={file}:loadpct:MAX',
+			"AREA:load_max#$HalfBlue",
+			"LINE1:load_avg#$FullBlue:Batt load",
+			'GPRINT:load_min:MIN:%5.1lf%s%% Min,',
+			'GPRINT:load_avg:AVERAGE:%5.1lf%s%% Avg,',
+			'GPRINT:load_max:MAX:%5.1lf%s%% Max,',
+			'GPRINT:load_avg:LAST:%5.1lf%s%% Last\l',
+		],
+		apcups_charge => [
+			'DEF:charge_avg={file}:bcharge:AVERAGE',
+			'DEF:charge_min={file}:bcharge:MIN',
+			'DEF:charge_max={file}:bcharge:MAX',
+			"AREA:charge_max#$HalfBlue",
+			"LINE1:charge_avg#$FullBlue:Batt Charge",
+			'GPRINT:charge_min:MIN:%5.1lf%s%% Min,',
+			'GPRINT:charge_avg:AVERAGE:%5.1lf%s%% Avg,',
+			'GPRINT:charge_max:MAX:%5.1lf%s%% Max,',
+			'GPRINT:charge_avg:LAST:%5.1lf%s%% Last\l',
+		],
+		apcups_time => [
+			'DEF:time_avg={file}:timeleft:AVERAGE',
+			'DEF:time_min={file}:timeleft:MIN',
+			'DEF:time_max={file}:timeleft:MAX',
+			"AREA:time_max#$HalfBlue",
+			"LINE1:time_avg#$FullBlue:Time Avail",
+			'GPRINT:time_min:MIN:%5.1lf%smin Min,',
+			'GPRINT:time_avg:AVERAGE:%5.1lf%smin Avg,',
+			'GPRINT:time_max:MAX:%5.1lf%smin Max,',
+			'GPRINT:time_avg:LAST:%5.1lf%smin Last\l',
+		],
+		apcups_temp => [
+			'DEF:temp_avg={file}:itemp:AVERAGE',
+			'DEF:temp_min={file}:itemp:MIN',
+			'DEF:temp_max={file}:itemp:MAX',
+			"AREA:temp_max#$HalfBlue",
+			"LINE1:temp_avg#$FullBlue:Temp Avail",
+			'GPRINT:temp_min:MIN:%5.1lf%s° Min,',
+			'GPRINT:temp_avg:AVERAGE:%5.1lf%s° Avg,',
+			'GPRINT:temp_max:MAX:%5.1lf%s° Max,',
+			'GPRINT:temp_avg:LAST:%5.1lf%s° Last\l',
+		],
+		apcups_freq => [
+			'DEF:freq_avg={file}:linefreq:AVERAGE',
+			'DEF:freq_min={file}:linefreq:MIN',
+			'DEF:freq_max={file}:linefreq:MAX',
+			"AREA:freq_max#$HalfBlue",
+			"LINE1:freq_avg#$FullBlue:Line Freq",
+			'GPRINT:freq_min:MIN:%5.1lf%sHz Min,',
+			'GPRINT:freq_avg:AVERAGE:%5.1lf%sHz Avg,',
+			'GPRINT:freq_max:MAX:%5.1lf%sHz Max,',
+			'GPRINT:freq_avg:LAST:%5.1lf%sHz Last\l',
+		],
 		vs_threads => [
 			"DEF:total_avg={file}:total:AVERAGE",
 			"DEF:total_min={file}:total:MIN",
@@ -891,6 +978,13 @@ our $GraphArgs =
 	traffic => ['-t', '{host} {inst} traffic', '-v', 'Bit/s'],
 	users => ['-t', '{host} users', '-v', 'Users'],
 	voltage => ['-t', '{host} voltage', '-v', 'Volts'],
+	apcups_volt => ['-t', '{host} APC voltage {inst}', '-v', 'Volts AC'],
+	apcups_bvolt => ['-t', '{host} APC Batt voltage {inst}', '-v', 'Volts DC'],
+	apcups_load => ['-t', '{host} APC Load {inst}', '-v', 'Percent'],
+	apcups_charge => ['-t', '{host} APC Batt Charge {inst}', '-v', 'Percent'],
+	apcups_time => ['-t', '{host} APC Time Left {inst}', '-v', 'Minutes'],
+	apcups_temp => ['-t', '{host} APC Internal Temp {inst}', '-v', '°Celsius'],
+	apcups_freq => ['-t', '{host} APC Line Freq {inst}', '-v', 'Hz'],
 	vs_threads => ['-t', '{host} threads', '-v', 'Threads'],
 	vs_memory => ['-t', '{host} memory usage', '-v', 'Bytes'],
 	vs_processes => ['-t', '{host} processes', '-v', 'Processes'],
@@ -902,6 +996,13 @@ our $GraphMulti =
 	cpu	=> \&output_graph_cpu,
 	cpufreq => 1,
 	disk	=> 1,
+	apcups_volt => 1,
+	apcups_bvolt => 1,
+	apcups_load => 1,
+	apcups_charge => 1,
+	apcups_time => 1,
+	apcups_temp => 1,
+	apcups_freq => 1,
 	load	=> 0,
 	mails	=> 0,
 	memory	=> 0,