X-Git-Url: http://scm.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=cmd%2Fmrtg.pl;h=2542edf5a3f0114c8977e09229222d97e4723416;hb=85ea68ecce028876ab0d60d622c1d92c95bb8747;hp=d1e3582bced0d90202cc2981c1f3c4d8046585e9;hpb=918f121e1b436b97a8e8f85fe7c8c1f62fe0e533;p=spider.git
diff --git a/cmd/mrtg.pl b/cmd/mrtg.pl
index d1e3582b..2542edf5 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
@@ -47,7 +48,7 @@ unless ($want{agw}) {
}
$mc->cfgprint('msg', [], 64000,
- "Data in and out of $main::mycall",
+ "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};
@@ -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();