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

Merge pull request #443 from bachandi/process_updates 

Process updates
This commit is contained in:
Jordi Sanfeliu 2022-10-20 10:23:00 +02:00 committed by GitHub
parent 2661006edc 8549551dda
commit 378261bc0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/process.pm
View File

@ -1281,10 +1281,10 @@ sub process_cgi {
push(@tmpz, "LINE2:n_ics" . $n . $LC[$n]); push(@tmpz, "LINE2:n_ics" . $n . $LC[$n]);
$str = sprintf("%-20s", substr($str, 0, 20)); $str = sprintf("%-20s", substr($str, 0, 20));
push(@tmp, "LINE2:vcs" . $n . $LC[$n] . ":$str"); push(@tmp, "LINE2:vcs" . $n . $LC[$n] . ":$str");
push(@tmp, "GPRINT:tcs" . $n . ":LAST:Cur\\: %4.0lf"); push(@tmp, "GPRINT:tcs" . $n . ":LAST:Cur\\:%7.1lf");
push(@tmp, "GPRINT:tcs" . $n . ":MIN: Min\\: %4.0lf"); push(@tmp, "GPRINT:tcs" . $n . ":MIN:Min\\:%7.1lf");
push(@tmp, "GPRINT:tcs" . $n . ":MAX: Max\\: %4.0lf\\n"); push(@tmp, "GPRINT:tcs" . $n . ":MAX:Max\\:%7.1lf\\n");
push(@tmp, "LINE2:n_ics" . $n . $LC[$n]); push(@tmp, "LINE1:n_ics" . $n . $LC[$n]);
} }
} }
if($title) { if($title) {
@ -1309,7 +1309,8 @@ sub process_cgi {
"--title=$config->{graphs}->{_process7} ($tf->{nwhen}$tf->{twhen})", "--title=$config->{graphs}->{_process7} ($tf->{nwhen}$tf->{twhen})",
"--start=-$tf->{nwhen}$tf->{twhen}", "--start=-$tf->{nwhen}$tf->{twhen}",
"--imgformat=$imgfmt_uc", "--imgformat=$imgfmt_uc",
"--vertical-label=Nonvoluntary + voluntary/s", "--vertical-label=Voluntary/s",
"--right-axis-label=-1 x Involuntary/s",
"--width=$width", "--width=$width",
"--height=$height", "--height=$height",
@extra, @extra,
@ -1569,15 +1570,15 @@ sub process_cgi {
if(lc(($process->{time_unit} || "") eq "minute")) { if(lc(($process->{time_unit} || "") eq "minute")) {
$ytitle = "Minutes"; $ytitle = "Minutes";
$unit = 60; $unit = 60;
$format = "%5.0lf"; $format = "%7.0lf";
} elsif(lc(($process->{time_unit} || "") eq "hour")) { } elsif(lc(($process->{time_unit} || "") eq "hour")) {
$ytitle = "Hours"; $ytitle = "Hours";
$unit = 3600; $unit = 3600;
$format = "%4.0lf"; $format = "%7.0lf";
} else { } else {
$ytitle = "Days"; $ytitle = "Days";
$unit = 86400; $unit = 86400;
$format = "%4.1lf"; $format = "%7.1lf";
} }
for($n = 0; $n < 10; $n++) { for($n = 0; $n < 10; $n++) {
my $p = trim($lp[$n] || ""); my $p = trim($lp[$n] || "");
@ -1588,9 +1589,9 @@ sub process_cgi {
push(@tmpz, "LINE2:uptd" . $n . $LC[$n] . ":$str"); push(@tmpz, "LINE2:uptd" . $n . $LC[$n] . ":$str");
$str = sprintf("%-20s", substr($str, 0, 20)); $str = sprintf("%-20s", substr($str, 0, 20));
push(@tmp, "LINE2:uptd" . $n . $LC[$n] . ":$str"); push(@tmp, "LINE2:uptd" . $n . $LC[$n] . ":$str");
push(@tmp, "GPRINT:uptd" . $n . ":LAST:Cur\\: $format"); push(@tmp, "GPRINT:uptd" . $n . ":LAST:Cur\\:$format");
push(@tmp, "GPRINT:uptd" . $n . ":MIN: Min\\: $format"); push(@tmp, "GPRINT:uptd" . $n . ":MIN:Min\\:$format");
push(@tmp, "GPRINT:uptd" . $n . ":MAX: Max\\: $format\\n"); push(@tmp, "GPRINT:uptd" . $n . ":MAX:Max\\:$format\\n");
} }
} }
if($title) { if($title) {