X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fmrtg.pl;h=ce1d1020652cd4cab88a99089177989293b91fea;hb=refs%2Fheads%2Fnewusers;hp=b0757ecfa1407796bcd15cf2772e04ec5968350a;hpb=5e61d31d9f317fcef97a66e1ac1944cb17b42eec;p=spider.git
diff --git a/cmd/mrtg.pl b/cmd/mrtg.pl
index b0757ecf..ce1d1020 100644
--- a/cmd/mrtg.pl
+++ b/cmd/mrtg.pl
@@ -29,142 +29,146 @@
#
#
-my ($self, $line) = @_;
-
-# create the arg list
-my %want;
-for (split /\s+/, $line) { $want{lc $_} = 1};
-$want{nomrtg} = 1 if $want{cfgonly} || $want{test};
-
-return (1, "MRTG not installed") unless $want{nomrtg} || -e '/usr/bin/mrtg' || -e '/usr/local/bin/mrtg';
-
-my $mc = new Mrtg or return (1, "cannot initialise Mrtg $!");
-
-# do Data in / out totals
-my $din = $Msg::total_in;
-my $dout = $Msg::total_out;
-unless ($want{agw}) {
- $din += $AGWMsg::total_in;
- $dout += $AGWMsg::total_out;
+sub handle
+{
+ my ($self, $line) = @_;
+
+ $DB::single = 1;
+
+ # create the arg list
+ my %want;
+ for (split /\s+/, $line) { $want{lc $_} = 1};
+ $want{nomrtg} = 1 if $want{cfgonly} || $want{test};
+
+ return (1, "MRTG not installed") unless $want{nomrtg} || -e '/usr/bin/mrtg' || -e '/usr/local/bin/mrtg';
+ return (1, "MRTG requires top to be installed") unless $want{nomrtg} || -e '/usr/bin/top' || -e '/usr/local/bin/top';
+
+ my @out = do_it(%want);
+
+ return (1, @out);
}
-$mc->cfgprint('msg', [], 64000,
- "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",
- '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};
-}
+sub do_it
+{
+ my %want = @_;
+
+ my $mc = new Mrtg or return (1, "cannot initialise Mrtg $!");
-if (!$main::is_win && ($want{proc} || $want{all})) {
- $ENV{COLUMNS} = 250;
- my $secs;
- my $f = new IO::File "ps ax -ocputime,args |";
-# 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 ($d, $h, $m, $s) = $f[0] =~ /(?:(\d+)-)?(\d+):(\d\d):(\d\d)$/;
- $d ||= 0;
- $secs = ($d * 86400) + ($h * 3600) + ($m * 60) + $s;
- last;
- }
- $f->close;
+ # do Data in / out totals
+ my $din = $Msg::total_in;
+ my $dout = $Msg::total_out;
+
+ $mc->cfgprint('msg', [ qw(integer) ], 64000,
+ "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};
+ dbg("mrtg: din: $din dout: $dout") if isdbg("mrtg");
+
+ # do AGW stats if they apply
+ if ($want{agw}) {
+ $mc->cfgprint('agw', [], 64000,
+ "AGW Data in and out of $main::mycall",
+ '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};
+ dbg("mrtg: agwin: $AGWMsg::total_in agwout: $AGWMsg::total_out") if isdbg("mrtg");
}
- 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};
+
+ if (!$main::is_win && ($want{proc} || $want{all})) {
+ my $secs = $main::clssecs + $main::cldsecs;
+
+ dbg "mrtg: proc: cluster=$main::clssecs children=$main::cldsecs clock=$secs" if isdbg('mrtg');
+
+ $mc->cfgprint('proc', [qw(unknaszero withzeroes perminute)], 600,
+ "CPU Usage of node and its children in seconds",
+ 'CPU Secs/min', 'Node Secs 10ths', 'Child Secs 10ths', 0.1) unless $want{dataonly};
+ $mc->data('proc', int($main::clssecs*10+0.5), int($main::cldsecs*10+0.5), "Processor Usage") unless $want{cfgonly};
}
-}
-# do the users and nodes
-my $users = DXChannel::get_all_users();
-my $nodes = DXChannel::get_all_nodes();
-
-$mc->cfgprint('users', [qw(unknaszero gauge)], 500,
- "Users and Nodes on $main::mycall",
- 'Users / Nodes', 'Users', 'Nodes') unless $want{dataonly};
-$mc->data('users', $users, $nodes, 'Users / Nodes') unless $want{cfgonly};
-
-# do the total users and nodes
-if ($want{totalusers} || $want{all}) {
- $nodes = Route::Node::count();
- $users = Route::User::count();
- $mc->cfgprint('totalusers', [qw(unknaszero gauge)], 10000,
- 'Total Users and Nodes in the Visible Cluster Network',
- 'Users / Nodes', 'Users', 'Nodes') unless $want{dataonly};
- $mc->data('totalusers', $users, $nodes, 'Total Users and Nodes in the Visible Cluster Network') unless $want{cfgonly};
-}
+ # do the users and nodes
+ my $users = DXChannel::get_all_users();
+ my $nodes = DXChannel::get_all_nodes();
+
+ $mc->cfgprint('users', [qw(unknaszero gauge integer)], 500,
+ "Users and Nodes on $main::mycall",
+ 'Users / Nodes', 'Users', 'Nodes') unless $want{dataonly};
+ $mc->data('users', $users, $nodes, 'Users / Nodes') unless $want{cfgonly};
+ dbg("mrtg: din: $din dout: $dout") if isdbg("mrtg");
+
+ # do the total users and nodes
+ if ($want{totalusers} || $want{all}) {
+ $nodes = Route::Node::count();
+ $users = Route::User::count();
+ $mc->cfgprint('totalusers', [qw(integer unknaszero gauge)], 10000,
+ 'Total Users and Nodes in the Visible Cluster Network',
+ 'Users / Nodes', 'Users', 'Nodes') unless $want{dataonly};
+ $mc->data('totalusers', $users, $nodes, 'Total Users and Nodes in the Visible Cluster Network') unless $want{cfgonly};
+ dbg("mrtg: users: $users nodes: $nodes") if isdbg("mrtg");
+ }
-# do the total spots
-if ($want{totalspots} || $want{all}) {
- $mc->cfgprint('totalspots', [qw(unknaszero gauge noi)], 1000, 'Total Spots',
- 'Spots / min', 'Spots', 'Spots') unless $want{dataonly};
- $mc->data('totalspots', int ($Spot::totalspots/5+0.5), int($Spot::totalspots/5+0.5), 'Total Spots') unless $want{cfgonly};
- $Spot::totalspots = 0;
-}
+ # do the total spots
+ if ($want{totalspots} || $want{all}) {
+ $mc->cfgprint('totalspots', [qw(integer withzeroes unknaszero noi perminute)], 1000, 'Total Spots',
+ 'Spots / min', 'Spots', 'Spots') unless $want{dataonly};
+ $mc->data('totalspots', $Spot::totalspots, $Spot::totalspots, 'Total Spots') unless $want{cfgonly};
+ dbg("mrtg: total spots: $Spot::totalspots") if isdbg("mrtg");
+ #$Spot::totalspots = 0;
+ }
-# do the HF and VHF spots
-if ($want{hfvhf} || $want{all}) {
- $mc->cfgprint('hfspots', [qw(unknaszero gauge)], 1000, 'HF and VHF+ Spots',
- 'Spots / min', 'HF', 'VHF') unless $want{dataonly};
- $mc->data('hfspots', int($Spot::hfspots/5+0.5), int($Spot::vhfspots/5+0.5), 'HF and VHF+ Spots') unless $want{cfgonly};
- $Spot::hfspots = $Spot::vhfspots = 0;
-}
+ # do the HF and VHF spots
+ if ($want{hfvhf} || $want{all}) {
+ $mc->cfgprint('hfspots', [qw(integer withzeroes unknaszero perminute)], 1000, 'HF and VHF+ Spots',
+ 'Spots / min', 'HF', 'VHF') unless $want{dataonly};
+ $mc->data('hfspots', $Spot::hfspots, $Spot::vhfspots, 'HF and VHF+ Spots') unless $want{cfgonly};
+ dbg("mrtg: hfspots: $Spot::hfspots vhfspots: $Spot::vhfspots") if isdbg("mrtg");
+ #$Spot::hfspots = $Spot::vhfspots = 0;
+ }
-# 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::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};
-}
+ # wwv stuff
+ if ($want{wwv} || $want{all}) {
+ $mc->cfgprint('wwvsfi', [qw(integer gauge)], 1000, 'WWV SFI and R', 'SFI / R', 'SFI', 'R') unless $want{dataonly};
+ $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};
+ dbg("mrtg: WWV A: $Geomag::a K: $Geomag::k") if isdbg("mrtg");
+ }
-# WCY stuff
-if ($want{wcy} || $want{all}) {
- $mc->cfgprint('wcyka', [qw(gauge)], 1000, 'WCY A and K',
- 'A / K', 'A', 'K') unless $want{dataonly};
- $mc->data('wcyka', $WCY::a, $WCY::k, 'WCY A and K') unless $want{cfgonly};
-}
+ # WCY stuff
+ if ($want{wcy} || $want{all}) {
+ $mc->cfgprint('wcyka', [qw(integer gauge)], 1000, 'WCY A and K',
+ 'A / K', 'A', 'K') unless $want{dataonly};
+ $mc->data('wcyka', $WCY::a, $WCY::k, 'WCY A and K') unless $want{cfgonly};
+ dbg("mrtg: WCY A: $WCY::a K: $WCY::k") if isdbg("mrtg");
+ }
-if ($want{pc92} || $want{all}) {
+ if ($want{pc92} || $want{all}) {
- $mc->cfgprint('pc92ck', [], 1024000,
- "PC92 C and K records into $main::mycall",
- 'Bytes / Sec', 'C', 'K') unless $want{dataonly};
- $mc->data('pc92ck', $DXProt::pc92Cin, $DXProt::pc92Kin, "PC92 C and K into $main::mycall") unless $want{cfgonly};
-# $DXProt::pc92Cin = $DXProt::pc92Kin = 0;
+ $mc->cfgprint('pc92ck', [qw(integer)], 1024000,
+ "PC92 C and K records into $main::mycall",
+ 'Bytes / Sec', 'C', 'K') unless $want{dataonly};
+ $mc->data('pc92ck', $DXProt::pc92Cin, $DXProt::pc92Kin, "PC92 C and K into $main::mycall") unless $want{cfgonly};
+ # $DXProt::pc92Cin = $DXProt::pc92Kin = 0;
- $mc->cfgprint('pc92ad', [], 1024000,
- "PC92 A and D records into $main::mycall",
- 'Bytes / Sec', 'A', 'D') unless $want{dataonly};
- $mc->data('pc92ad', $DXProt::pc92Ain, $DXProt::pc92Din, "PC92 A and D into $main::mycall") unless $want{cfgonly};
-# $DXProt::pc92Ain = $DXProt::pc92Din = 0;
+ $mc->cfgprint('pc92ad', [qw(integer)], 1024000,
+ "PC92 A and D records into $main::mycall",
+ 'Bytes / Sec', 'A', 'D') unless $want{dataonly};
+ $mc->data('pc92ad', $DXProt::pc92Ain, $DXProt::pc92Din, "PC92 A and D into $main::mycall") unless $want{cfgonly};
+ # $DXProt::pc92Ain = $DXProt::pc92Din = 0;
+ dbg("mrtg: PC92 C: $DXProt::pc92Cin K: $DXProt::pc92Kin A: $DXProt::pc92Ain D: $DXProt::pc92Din") if isdbg("mrtg");
+ }
-}
+ #
+ # do the mrtg thing
+ #
-#
-# do the mrtg thing
-#
+ my @out;
+ {
+ local %ENV;
+ $ENV{LANG} = 'C';
+ @out = $mc->run unless $want{nomrtg};
+ }
-my @out;
-{
-local %ENV;
-$ENV{LANG} = 'C';
-@out = $mc->run unless $want{nomrtg};
+ return @out;
}
-return (1, @out);
+