From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 10 Jul 2006 21:10:19 +0000 (+0200)
Subject: collection.cgi: The new processes RRD files have been added.
X-Git-Tag: collectd-3.11.0~76^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=99c778e7555fc522ca6bd7ed6f96cd80a774a7fa;p=collectd.git

collection.cgi: The new processes RRD files have been added.

The new files are:
* ps_rss
* ps_cputime
* ps_count
* ps_pagefaults
---

diff --git a/contrib/collection.cgi b/contrib/collection.cgi
index 098c702d..68ae00ed 100755
--- a/contrib/collection.cgi
+++ b/contrib/collection.cgi
@@ -712,6 +712,85 @@ 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'
+		],
 		swap => [
 			'DEF:used_avg={file}:used:AVERAGE',
 			'DEF:used_min={file}:used:MIN',
@@ -984,6 +1063,10 @@ our $GraphArgs =
 	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'],
 	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'],