changed R and SFI around in mrtg.pl

[spider.git] / cmd / mrtg.pl

diff --git a/cmd/mrtg.pl b/cmd/mrtg.pl
index d1e3582bced0d90202cc2981c1f3c4d8046585e9..b2f45af4be0c85631d3ce999e881486478d8df95 100644 (file)
--- a/cmd/mrtg.pl
+++ b/cmd/mrtg.pl
@@ -6,7 +6,8 @@
 #
 # The arguments (keywords) to the mrtg command are these
 #
-# a) content          (you always get the node users and nodes)
+# a) content          (you always get the node users and nodes and data in/out)
+#    proc             - get the processor usage
 #    agw              - include the AGW stats separately 
 #    totalspots       - all spots
 #    hfvhf            - all spots split into HF and VHF
@@ -47,7 +48,7 @@ unless ($want{agw}) {
 }
 
 $mc->cfgprint('msg', [], 64000, 
-                "Data <font color=#00cc00>in</font> and <font color=#0000ff>out</font> of $main::mycall",
+                "Cluster Data <font color=#00cc00>in</font> and <font color=#0000ff>out</font> of $main::mycall",
                 'Bytes / Sec', 'Bytes In', 'Bytes Out') unless $want{dataonly};
 $mc->data('msg', $din, $dout, "Data in and out of $main::mycall") unless $want{cfgonly};
 
@@ -58,7 +59,35 @@ if ($want{agw}) {
                                  'Bytes / Sec', 'Bytes In', 'Bytes Out') unless $want{dataonly};
        $mc->data('agw', $AGWMsg::total_in, $AGWMsg::total_out, "AGW Data in and out of $main::mycall") unless $want{cfgonly};
 }
-                        
+
+if (!$main::is_win && ($want{proc} || $want{all})) {
+       $ENV{COLUMNS} = 250;
+       my $secs;
+       my $f = new IO::File "ps aux |";
+#      dbg("$f");
+       if ($f) {
+               while (<$f>) {
+                       chomp;
+                       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];
+                       $secs = ($m * 60) + $s;
+                       last;
+               }
+               $f->close;
+       }
+       if ($secs) {
+               $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};
+       }
+}
+
 # do the users and nodes
 my $users = DXChannel::get_all_users();
 my $nodes = DXChannel::get_all_nodes();
@@ -97,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};