X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fmrtg.pl;h=b2f45af4be0c85631d3ce999e881486478d8df95;hb=4a9c1e3fabd9931b914307ee4f79e7259b8cdfd6;hp=6ee9d0b786dff32c596dc86e5a601bc899b86490;hpb=b8f5ec9dc0f8bf9b31e4d606c36a2939e032c00a;p=spider.git

diff --git a/cmd/mrtg.pl b/cmd/mrtg.pl
index 6ee9d0b7..b2f45af4 100644
--- a/cmd/mrtg.pl
+++ b/cmd/mrtg.pl
@@ -70,7 +70,8 @@ if (!$main::is_win && ($want{proc} || $want{all})) {
 			chomp;
 			my $l = $_;
 #			dbg($l);
-			next unless $l =~ m{/spider/perl/cluster\.pl$};
+			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];
@@ -80,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};
 	}
 }
@@ -125,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};