X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fmrtg.pl;h=5473a81f43e997813526d250b67f1ad2b0af9686;hb=7d604d6c1d81a494a811afb3f93f8dc02eb59e2d;hp=dba856e5b4495d429e78c6750255a4a9b8d8c791;hpb=cd03052d795bdb1b7127dc3d365ed7008db30cf7;p=spider.git
diff --git a/cmd/mrtg.pl b/cmd/mrtg.pl
index dba856e5..5473a81f 100644
--- a/cmd/mrtg.pl
+++ b/cmd/mrtg.pl
@@ -4,129 +4,149 @@
#
# Your mrtg binary must live in one of the standard places
#
-# you will need perl 5.6 (probably) to be able to run this command
+# 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
+#
+#
#
-
-sub cfgprint($$@$$$$$);
my ($self, $line) = @_;
# create the arg list
my %want;
for (split /\s+/, $line) { $want{lc $_} = 1};
-
-return (1, "MRTG not installed") unless $want{test} || -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";
-
-my $mc = new IO::File ">$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
-
-##
-##
+$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;
+}
-EOF
+$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};
+ }
+}
-#dbg "$dir\n$html\n";
-
# 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 (my $m = new IO::File ">$dir/users") {
- print $m "$users\n$nodes\n$uptime\nUsers and Nodes\n";
- close $m;
-}
-cfgprint($mc, 'users', [qw(gauge)], 500,
- "Users and Nodes on $main::mycall",
- 'Users / Nodes', 'Users', '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();
- #dbg "$users $nodes $uptime\n";
- if (my $m = new IO::File ">$dir/totalusers") {
- print $m "$users\n$nodes\n$uptime\nTotal Users and Nodes\n";
- close $m;
- }
- cfgprint($mc, 'totalusers', [qw(gauge)], 10000,
- 'Total Users and Nodes in the Visible Cluster Network',
- 'Users / Nodes', 'Users', 'Nodes');
+ $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 (my $m = new IO::File ">$dir/totalspots") {
- print $m "$Spot::totalspots\n$Spot::totalspots\n$uptime\nTotal Spots\n";
- close $m;
- }
+ $mc->cfgprint('totalspots', [qw(unknaszero absolute noi perminute)], 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;
- cfgprint($mc, 'totalspots', [qw(unknaszero gauge noi)], 1000, 'Total Spots',
- 'Spots', 'Spots', 'Spots');
}
# do the HF and VHF spots
if ($want{hfvhf} || $want{all}) {
- if (my $m = new IO::File ">$dir/hfspots") {
- print $m "$Spot::hfspots\n$Spot::vhfspots\n$uptime\nHF and VHF+ Spots\n";
- close $m;
- }
+ $mc->cfgprint('hfspots', [qw(unknaszero absolute 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};
$Spot::hfspots = $Spot::vhfspots = 0;
- cfgprint($mc, 'hfspots', [qw(unknaszero gauge)], 1000, 'HF and VHF+ Spots',
- 'Spots', 'HF', 'VHF');
+}
+
+# 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};
+}
+
+# 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};
}
#
# do the mrtg thing
#
-close $mc;
-my @out = `mrtg $cfg`;
-return (1, @out);
-sub cfgprint
+my @out;
{
- my ($mc, $name, $options, $max, $title, $legend, $iname, $oname) = @_;
- my $opt = join ', ', @$options, qw(withzeroes gauge growright nopercent integer);
-
- print $mc <<"EOF";
-
-#
-# $title
-#
-
-Target[$name]: `cat /spider/mrtg/$name`
-MaxBytes[$name]: $max
-Title[$name]: $title
-Options[$name]: $opt
-YLegend[$name]: $legend
-YTicsFactor[$name]: 1
-ShortLegend[$name]: \
-Legend1[$name]:Maximum No of $iname
-Legend2[$name]:Maximum No of $oname
-LegendI[$name]:$iname
-LegendO[$name]:$oname
-PageTop[$name]: $title
-
- | System: | $main::mycall |
- | Maintainer: | $main::myemail |
- | Description: | $title |
-
-EOF
-
+local %ENV;
+$ENV{LANG} = 'C';
+@out = $mc->run unless $want{nomrtg};
}
+return (1, @out);