X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fmrtg.pl;h=2542edf5a3f0114c8977e09229222d97e4723416;hb=a9f28e80e3936421f830bba0eacffd3bb509a9cb;hp=1cf1b6173e3d237c3751459025f5ba1f436579b1;hpb=c284db95120b0930059be9af46cf80afcee935ff;p=spider.git

diff --git a/cmd/mrtg.pl b/cmd/mrtg.pl
index 1cf1b617..2542edf5 100644
--- a/cmd/mrtg.pl
+++ b/cmd/mrtg.pl
@@ -61,6 +61,7 @@ if ($want{agw}) {
 }
 
 if (!$main::is_win && ($want{proc} || $want{all})) {
+	$ENV{COLUMNS} = 250;
 	my $secs;
 	my $f = new IO::File "ps aux |";
 #	dbg("$f");
@@ -69,7 +70,8 @@ if (!$main::is_win && ($want{proc} || $want{all})) {
 			chomp;
 			my $l = $_;
 #			dbg($l);
-			next unless $l =~ /cluster\.p/;
+			next unless $l =~ m{cluster\.pl$};
+			next if $l =~ m{bash\s+\-c};
 			my @f = split /\s+/, $l;
 #			dbg("$f[9]");
 			my ($m, $s) = split /:/, $f[9];
@@ -79,9 +81,9 @@ if (!$main::is_win && ($want{proc} || $want{all})) {
 		$f->close;
 	}
 	if ($secs) {
-		$mc->cfgprint('proc', [qw(noi)], 64000, 
+		$mc->cfgprint('proc', [qw(noo perminute)], 5*60, 
 					  "Processor Usage",
-					  'Secs', 'Secs', 'Secs') unless $want{dataonly};
+					  'Proc Secs / min', 'Proc Secs', 'Proc Secs') unless $want{dataonly};
 		$mc->data('proc', $secs, $secs, "Processor Usage") unless $want{cfgonly};
 	}
 }