X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fmrtg.pl;h=b2f45af4be0c85631d3ce999e881486478d8df95;hb=1b32fc130b298c8ce803a340d8efdf86b4e475f8;hp=1bcb5dd928257b38e18737f1ca4e4b110a2c0d2f;hpb=4dd2578188cde396a6fa76be1087164539bbfdfe;p=spider.git
diff --git a/cmd/mrtg.pl b/cmd/mrtg.pl
index 1bcb5dd9..b2f45af4 100644
--- 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
@@ -40,25 +41,53 @@ my $mc = new Mrtg or return (1, "cannot initialise Mrtg $!");
# do Data in / out totals
my $din = $Msg::total_in;
-my $dout = $Msg::total_in;
+my $dout = $Msg::total_out;
unless ($want{agw}) {
$din += $AGWMsg::total_in;
$dout += $AGWMsg::total_out;
}
$mc->cfgprint('msg', [], 64000,
- "Data in and out of $main::mycall",
- 'Bits / Sec', 'Bytes In', 'Bytes Out') unless $want{dataonly};
+ "Cluster Data in and out 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};
# do AGW stats if they apply
if ($want{agw}) {
$mc->cfgprint('agw', [], 64000,
"AGW Data in and out of $main::mycall",
- 'Bits / Sec', 'Bytes In', 'Bytes Out') unless $want{dataonly};
+ '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();
@@ -81,7 +110,7 @@ if ($want{totalusers} || $want{all}) {
# do the total spots
if ($want{totalspots} || $want{all}) {
$mc->cfgprint('totalspots', [qw(unknaszero gauge noi)], 1000, 'Total Spots',
- 'Spots', 'Spots', 'Spots') unless $want{dataonly};
+ 'Spots / min', 'Spots', 'Spots') unless $want{dataonly};
$mc->data('totalspots', $Spot::totalspots, $Spot::totalspots, 'Total Spots') unless $want{cfgonly};
$Spot::totalspots = 0;
}
@@ -89,7 +118,7 @@ if ($want{totalspots} || $want{all}) {
# do the HF and VHF spots
if ($want{hfvhf} || $want{all}) {
$mc->cfgprint('hfspots', [qw(unknaszero gauge)], 1000, 'HF and VHF+ Spots',
- 'Spots', 'HF', 'VHF') unless $want{dataonly};
+ 'Spots / min', 'HF', 'VHF') unless $want{dataonly};
$mc->data('hfspots', $Spot::hfspots, $Spot::vhfspots, 'HF and VHF+ Spots') unless $want{cfgonly};
$Spot::hfspots = $Spot::vhfspots = 0;
}
@@ -97,7 +126,7 @@ if ($want{hfvhf} || $want{all}) {
# wwv stuff
if ($want{wwv} || $want{all}) {
$mc->cfgprint('wwvsfi', [qw(gauge)], 1000, 'WWV SFI and R', '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 A and K',
'A / K', 'A', 'K') unless $want{dataonly};
$mc->data('wwvka', $Geomag::a, $Geomag::k, 'WWV A and K') unless $want{cfgonly};