mirrors
/
Monitorix
mirror of https://github.com/mikaku/Monitorix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added 'show_gaps' support to the 'proc' graph

This commit is contained in:
Jordi Sanfeliu 2013-07-01 17:26:14 +02:00
parent f6b130a489
commit e1b94956b6
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/proc.pm
View File

@ -240,6 +240,7 @@ sub proc_cgi {
my @PNGz; my @PNGz;
my @tmp; my @tmp;
my @tmpz; my @tmpz;
my @CDEF;
my $vlabel; my $vlabel;
my $ncpu; my $ncpu;
my $n; my $n;
@ -366,6 +367,7 @@ sub proc_cgi {
} }
undef(@tmp); undef(@tmp);
undef(@tmpz); undef(@tmpz);
undef(@CDEF);
if(lc($kern->{graph_mode}) eq "r") { if(lc($kern->{graph_mode}) eq "r") {
$vlabel = "Percent (%)"; $vlabel = "Percent (%)";
if(lc($kern->{list}->{user}) eq "y") { if(lc($kern->{list}->{user}) eq "y") {
@ -577,6 +579,12 @@ sub proc_cgi {
push(@tmp, "LINE1:user#0000EE"); push(@tmp, "LINE1:user#0000EE");
push(@tmpz, "LINE1:user#0000EE"); push(@tmpz, "LINE1:user#0000EE");
} }
if(lc($config->{show_gaps}) eq "y") {
push(@tmp, "AREA:wrongdata#$colors->{gap}:");
push(@tmpz, "AREA:wrongdata#$colors->{gap}:");
push(@CDEF, "CDEF:wrongdata=allvalues,UN,INF,UNKN,IF");
}
($width, $height) = split('x', $config->{graph_size}->{$proc->{size}}); ($width, $height) = split('x', $config->{graph_size}->{$proc->{size}});
RRDs::graph("$PNG_DIR" . "$PNG[$n]", RRDs::graph("$PNG_DIR" . "$PNG[$n]",
"--title=$config->{graphs}->{_proc} $n ($tf->{nwhen}$tf->{twhen})", "--title=$config->{graphs}->{_proc} $n ($tf->{nwhen}$tf->{twhen})",
@ -598,6 +606,8 @@ sub proc_cgi {
"DEF:sirq=$rrd:proc" . $n . "_sirq:AVERAGE", "DEF:sirq=$rrd:proc" . $n . "_sirq:AVERAGE",
"DEF:steal=$rrd:proc" . $n . "_steal:AVERAGE", "DEF:steal=$rrd:proc" . $n . "_steal:AVERAGE",
"DEF:guest=$rrd:proc" . $n . "_guest:AVERAGE", "DEF:guest=$rrd:proc" . $n . "_guest:AVERAGE",
"CDEF:allvalues=user,nice,sys,iow,irq,sirq,steal,guest,+,+,+,+,+,+,+",
@CDEF,
@tmp); @tmp);
$err = RRDs::error; $err = RRDs::error;
print("ERROR: while graphing $PNG_DIR" . "$PNG[$n]: $err\n") if $err; print("ERROR: while graphing $PNG_DIR" . "$PNG[$n]: $err\n") if $err;
@ -623,6 +633,8 @@ sub proc_cgi {
"DEF:sirq=$rrd:proc" . $n . "_sirq:AVERAGE", "DEF:sirq=$rrd:proc" . $n . "_sirq:AVERAGE",
"DEF:steal=$rrd:proc" . $n . "_steal:AVERAGE", "DEF:steal=$rrd:proc" . $n . "_steal:AVERAGE",
"DEF:guest=$rrd:proc" . $n . "_guest:AVERAGE", "DEF:guest=$rrd:proc" . $n . "_guest:AVERAGE",
"CDEF:allvalues=user,nice,sys,iow,irq,sirq,steal,guest,+,+,+,+,+,+,+",
@CDEF,
@tmpz); @tmpz);
$err = RRDs::error; $err = RRDs::error;
print("ERROR: while graphing $PNG_DIR" . "$PNGz[$n]: $err\n") if $err; print("ERROR: while graphing $PNG_DIR" . "$PNGz[$n]: $err\n") if $err;