X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fmrtg.pl;h=aeaab2e70e48245f2af473115c2e1604a4250762;hb=7b8a8931b9fe531868777d5168b9a35baf37f0d9;hp=466d61134602e58e2f0602415b94d7825e8114f2;hpb=f002e5a1e69f1909a50adfe2a8abcbf89af5d74e;p=spider.git
diff --git a/cmd/mrtg.pl b/cmd/mrtg.pl
index 466d6113..aeaab2e7 100644
--- a/cmd/mrtg.pl
+++ b/cmd/mrtg.pl
@@ -41,6 +41,7 @@ sub handle
$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);
@@ -57,15 +58,12 @@ sub do_it
# 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;
- }
- $mc->cfgprint('msg', [], 64000,
+ $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}) {
@@ -73,33 +71,33 @@ sub do_it
"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 (!$main::is_win && ($want{proc} || $want{all})) {
$ENV{COLUMNS} = 250;
my $secs;
- my $f = new IO::File "ps ax -ocputime,args |";
+ my $f = new IO::File "top -b -o TIME+ -n 1 -c |";
# dbg("$f");
if ($f) {
while (<$f>) {
chomp;
my $l = $_;
- # dbg($l);
+ dbg("mrtg: $l") if isdbg("mrtg");
next unless $l =~ m{cluster\.pl$};
- next if $l =~ m{bash\s+\-c};
+ next if $l =~ m{\d\s+su\s+};
+ next if $l =~ m{\d\s+bash\s+};
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;
+ my ($m, $s) = $f[10] =~ /\b(\d+):(\d\d\.\d\d)\b/;
+ $secs = ($m * 60) + $s;
+ dbg("mrtg: proc: $f[10] m: $m s: $s secs: $secs") if isdbg("mrtg");
last;
}
$f->close;
- }
- if ($secs) {
- $mc->cfgprint('proc', [qw(noo perminute)], 5*60,
+
+ $mc->cfgprint('proc', [qw(noi unknaszero withzeroes perminute)], 5*60,
"Processor Usage",
- 'Proc Secs / min', 'Proc Secs', 'Proc Secs') unless $want{dataonly};
+ 'Proc Secs/Min', 'Proc Secs', 'Proc Secs') unless $want{dataonly};
$mc->data('proc', $secs, $secs, "Processor Usage") unless $want{cfgonly};
}
}
@@ -108,67 +106,73 @@ sub do_it
my $users = DXChannel::get_all_users();
my $nodes = DXChannel::get_all_nodes();
- $mc->cfgprint('users', [qw(unknaszero gauge)], 500,
+ $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(unknaszero gauge)], 10000,
+ $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',
+ $mc->cfgprint('totalspots', [qw(integer withzeroes unknaszero noi perminute)], 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;
+ $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',
+ $mc->cfgprint('hfspots', [qw(integer withzeroes unknaszero perminute)], 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;
+ $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->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',
+ $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}) {
- $mc->cfgprint('pc92ck', [], 1024000,
+ $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,
+ $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");
}
#