changed R and SFI around in mrtg.pl

[spider.git] / cmd / mrtg.pl

diff --git a/cmd/mrtg.pl b/cmd/mrtg.pl
index a2fd6c446ea1c743e4d0b988d42e10b66c8d0425..b2f45af4be0c85631d3ce999e881486478d8df95 100644 (file)
--- a/cmd/mrtg.pl
+++ b/cmd/mrtg.pl
@@ -71,6 +71,7 @@ if (!$main::is_win && ($want{proc} || $want{all})) {
                        my $l = $_;
 #                      dbg($l);
                        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,7 +81,7 @@ if (!$main::is_win && ($want{proc} || $want{all})) {
                $f->close;
        }
        if ($secs) {
-               $mc->cfgprint('proc', [qw(noi perminute)], 5*60, 
+               $mc->cfgprint('proc', [qw(noo perminute)], 5*60, 
                                          "Processor Usage",
                                          '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};