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

diff --git a/cmd/mrtg.pl b/cmd/mrtg.pl
index 1cf1b617..b2f45af4 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};
 	}
 }
@@ -124,7 +126,7 @@ if ($want{hfvhf} || $want{all}) {
 # wwv stuff
 if ($want{wwv} || $want{all}) {
 	$mc->cfgprint('wwvsfi', [qw(gauge)], 1000, 'WWV <font color=#00cc00>SFI</font> and <font color=#0000ff>R</font>', 'SFI / R', 'SFI', 'R') unless $want{dataonly};
-	$mc->data('wwvsfi', ($Geomag::r || $WCY::r), ($Geomag::sfi || $WCY::sfi), 'WWV SFI and R') unless $want{cfgonly};
+	$mc->data('wwvsfi', ($Geomag::sfi || $WCY::sfi), ($Geomag::r || $WCY::r), 'WWV SFI and R') unless $want{cfgonly};
 	$mc->cfgprint('wwvka', [qw(gauge)], 1000, 'WWV <font color=#00cc00>A</font> and <font color=#0000ff>K</font>',
 			 'A / K', 'A', 'K') unless $want{dataonly};
 	$mc->data('wwvka', $Geomag::a, $Geomag::k, 'WWV A and K') unless $want{cfgonly};