X-Git-Url: http://scm.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;ds=inline;f=cmd%2Fmrtg.pl;h=2542edf5a3f0114c8977e09229222d97e4723416;hb=d7c0e5450bfc963d1adb291611dd5b3664f9069d;hp=0d3176bfc812f3fb5bf5fea7e44503e7a266c661;hpb=abe7df695ac8666bf0d00c38f43bf68b76a00c31;p=spider.git
diff --git a/cmd/mrtg.pl b/cmd/mrtg.pl
index 0d3176bf..2542edf5 100644
--- a/cmd/mrtg.pl
+++ b/cmd/mrtg.pl
@@ -4,177 +4,143 @@
#
# Your mrtg binary must live in one of the standard places
#
-my ($self, $line) = @_;
-
-return (1) unless -e '/usr/bin/mrtg' || -e '/usr/local/bin/mrtg';
-
-my $dir = "$main::root/mrtg";
-my $html = "$main::root/html/mrtg";
-my $cfg = "$dir/mrtg.cfg";
-
-# do some checking
-return (1, "$dir is missing") unless -d $dir;
-return (1, "$html is missing") unless -d $html;
-return (1, "$cfg is missing") unless -e "$cfg";
-open MC, ">$cfg" or return(1, "cannot open $cfg for mrtg writing");
-
-# print out the header
-print MC <<"EOF";
-### Global Defaults
-
-# to get bits instead of bytes and graphs growing to the right
-# Options[_]: growright, bits
-
-Htmldir: $html
-Imagedir: $html
-Logdir: $dir
-Options[_]: growright
-
-##
-##
+# The arguments (keywords) to the mrtg command are these
+#
+# 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
+# wwv - two graphs of WWV, one SFI and R other A and K
+# wcy - WCY A and K
+# all - all of the above
+#
+# b) actions
+# test - do everything except check for and run mrtg
+# nomrtg - ditto (better name)
+# dataonly - only generate the data files for mrtg
+# cfgonly - only generate the mrtg.cfg file (like cfgmaker)
+# runmrtg - run mrtg, this is probably used with dataonly
+# - together with a home rolled mrtg.cfg
+#
+# Copyright (c) 2002 Dirk Koopman G1TLH
+#
+# $Id$
+#
-EOF
+my ($self, $line) = @_;
# create the arg list
my %want;
-for ( split /\s+/, $line) {
- $want{lc $_} = 1;
-};
+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;
+}
-#dbg "$dir\n$html\n";
+$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};
+}
+
+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();
-my $uptime = main::uptime();
-#dbg "$users $nodes $uptime\n";
-if (open M, ">$dir/users") {
- print M "$users\n$nodes\n$uptime\nUsers and Nodes\n";
- close M;
-}
-print MC <<"EOF";
-#
-# local users and nodes
-#
-Target[users]: `cat /spider/mrtg/users`
-MaxBytes1[users]: 500
-MaxBytes2[users]: 200
-Title[users]: Users and Nodes for $main::mycall
-Options[users]: withzeroes, gauge, growright, nopercent, integer
-YLegend[users]: Users \& Nodes
-YTicsFactor[users]: 1
-ShortLegend[users]: \
-Legend1[users]:Maximum No of Users
-Legend2[users]:Maximum No of Nodes
-LegendI[users]:Users
-LegendO[users]:Nodes
-PageTop[users]:
Users and Nodes on GB7DJK
-
- System: | $main::mycall |
- Maintainer: | $main::myemail |
- Description: | Users \& Nodes |
-
-EOF
+
+$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();
- #dbg "$users $nodes $uptime\n";
- if (open M, ">$dir/totalusers") {
- print M "$users\n$nodes\n$uptime\nTotal Users and Nodes\n";
- close M;
- }
- print MC <<"EOF";
-#
-# total users and nodes
-#
-Target[totalusers]: `cat /spider/mrtg/totalusers`
-MaxBytes1[totalusers]: 5000
-MaxBytes2[totalusers]: 5000
-Title[totalusers]: Total Users and Nodes for the Visible Cluster Network
-Options[totalusers]: withzeroes, gauge, growright, nopercent, integer
-YLegend[totalusers]: Users \& Nodes
-YTicsFactor[totalusers]: 1
-ShortLegend[totalusers]: \
-Legend1[totalusers]:Maximum No of Users
-Legend2[totalusers]:Maximum No of Nodes
-LegendI[totalusers]:Users
-LegendO[totalusers]:Nodes
-PageTop[totalusers]: Total Users and Nodes in the Visible Network
-
- System: | $main::mycall |
- Maintainer: | $main::myemail |
- Description: | Total Users \& Nodes for the Visible Cluster Network |
-
-EOF
+ $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 total spots
if ($want{totalspots} || $want{all}) {
- if (open M, ">$dir/totalspots") {
- print M "$Spot::totalspots\n$Spot::totalspots\n$uptime\nTotal Spots\n";
- close M;
- }
+ $mc->cfgprint('totalspots', [qw(unknaszero gauge noi)], 1000, 'Total Spots',
+ 'Spots / min', 'Spots', 'Spots') unless $want{dataonly};
+ $mc->data('totalspots', $Spot::totalspots, $Spot::totalspots, 'Total Spots') unless $want{cfgonly};
$Spot::totalspots = 0;
- print MC <<"EOF";
-#
-# total spots
-#
-Target[totalspots]: `cat /spider/mrtg/totalspots`
-MaxBytes[totalspots]: 20000
-Title[totalspots]: Total Spots
-Options[totalspots]: unknaszero, gauge, withzeroes, growright, nopercent, integer, noi
-YLegend[totalspots]: Spots
-YTicsFactor[totalspots]: 1
-ShortLegend[totalspots]: \
-Legend2[totalspots]:Maximum No of Spots
-LegendO[totalspots]:Spots
-PageTop[totalspots]: Total Spots
-
- System: | $main::mycall |
- Maintainer: | $main::myemail |
- Description: | Total Spots |
-
-EOF
}
# do the HF and VHF spots
if ($want{hfvhf} || $want{all}) {
- if (open M, ">$dir/hfspots") {
- print M "$Spot::hfspots\n$Spot::vhfspots\n$uptime\nHF and VHF+ Spots\n";
- close M;
- }
+ $mc->cfgprint('hfspots', [qw(unknaszero gauge)], 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};
$Spot::hfspots = $Spot::vhfspots = 0;
- print MC <<"EOF";
-#
-# HF and VHF spots
-#
-Target[hfspots]: `cat /spider/mrtg/hfspots`
-MaxBytes[hfspots]: 20000
-Title[hfspots]: HF and VHF+ Spots
-Options[hfspots]: unknaszero, gauge, withzeroes, growright, nopercent, integer
-YLegend[hfspots]: Spots
-WithPeak[hfspots]: ymwd
-YTicsFactor[hfspots]: 1
-ShortLegend[hfspots]: \
-Legend1[hfspots]:Max no of HF Spots
-Legend2[hfspots]:Max no of VHF Spots
-LegendI[hfspots]:HF
-LegendO[hfspots]:VHF+
-PageTop[hfspots]: Total HF and VHF+ Spots
-
- System: | $main::mycall |
- Maintainer: | $main::myemail |
- Description: | Total HF and VHF+ Spots |
-
-EOF
}
-close MC;
+# 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->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};
+}
-my @args;
-@args = ("mrtg", $cfg);
-system @args;
+# 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};
+}
-return (1);
+#
+# do the mrtg thing
+#
+my @out = $mc->run unless $want{nomrtg};
+return (1, @out);