X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fmrtg.pl;h=1bcb5dd928257b38e18737f1ca4e4b110a2c0d2f;hb=4dd2578188cde396a6fa76be1087164539bbfdfe;hp=6e279985c4cb2beed419726b7f60fa309af6cc7e;hpb=3f58f5ebe86a749d9e1ab37f25b3e7c7255a1906;p=spider.git
diff --git a/cmd/mrtg.pl b/cmd/mrtg.pl
index 6e279985..1bcb5dd9 100644
--- a/cmd/mrtg.pl
+++ b/cmd/mrtg.pl
@@ -7,6 +7,7 @@
# The arguments (keywords) to the mrtg command are these
#
# a) content (you always get the node users and nodes)
+# agw - include the AGW stats separately
# totalspots - all spots
# hfvhf - all spots split into HF and VHF
# wwv - two graphs of WWV, one SFI and R other A and K
@@ -36,13 +37,34 @@ $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_in;
+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};
+$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};
+ $mc->data('agw', $AGWMsg::total_in, $AGWMsg::total_out, "AGW Data in and out of $main::mycall") unless $want{cfgonly};
+}
# do the users and nodes
my $users = DXChannel::get_all_users();
my $nodes = DXChannel::get_all_nodes();
-$mc->cfgprint('users', [qw(gauge)], 500,
- "Users and Nodes on $main::mycall",
+$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};
@@ -50,8 +72,8 @@ $mc->data('users', $users, $nodes, 'Users / Nodes') unless $want{cfgonly};
if ($want{totalusers} || $want{all}) {
$nodes = Route::Node::count();
$users = Route::User::count();
- $mc->cfgprint('totalusers', [qw(gauge)], 10000,
- 'Total Users and Nodes in the Visible Cluster Network',
+ $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};
}
@@ -66,7 +88,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',
+ $mc->cfgprint('hfspots', [qw(unknaszero gauge)], 1000, 'HF and VHF+ Spots',
'Spots', 'HF', 'VHF') unless $want{dataonly};
$mc->data('hfspots', $Spot::hfspots, $Spot::vhfspots, 'HF and VHF+ Spots') unless $want{cfgonly};
$Spot::hfspots = $Spot::vhfspots = 0;
@@ -74,17 +96,16 @@ 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->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->cfgprint('wwvka', [qw(gauge)], 1000, 'WWV A and K',
+ $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};
}
# WCY stuff
if ($want{wcy} || $want{all}) {
- $mc->cfgprint('wcyka', [qw(gauge)], 1000, 'WCY A and K',
+ $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};
}