From: minima Date: Thu, 26 Sep 2002 09:19:21 +0000 (+0000) Subject: improved version of mrtg X-Git-Tag: PRE-1-52~193 X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=cd03052d795bdb1b7127dc3d365ed7008db30cf7;p=spider.git improved version of mrtg --- diff --git a/cmd/mrtg.pl b/cmd/mrtg.pl index 0d3176bf..dba856e5 100644 --- a/cmd/mrtg.pl +++ b/cmd/mrtg.pl @@ -4,22 +4,27 @@ # # 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 +# + +sub cfgprint($$@$$$$$); + my ($self, $line) = @_; -return (1) unless -e '/usr/bin/mrtg' || -e '/usr/local/bin/mrtg'; +# 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"; -# 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"); +my $mc = new IO::File ">$cfg" or return(1, "cannot open $cfg for mrtg writing"); # print out the header -print MC <<"EOF"; +print $mc <<"EOF"; ### Global Defaults # to get bits instead of bytes and graphs growing to the right @@ -35,146 +40,93 @@ Options[_]: growright EOF -# create the arg list -my %want; -for ( split /\s+/, $line) { - $want{lc $_} = 1; -}; #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 (open M, ">$dir/users") { - print M "$users\n$nodes\n$uptime\nUsers and Nodes\n"; - close M; +if (my $m = new IO::File ">$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 +cfgprint($mc, 'users', [qw(gauge)], 500, + "Users and Nodes on $main::mycall", + 'Users / Nodes', 'Users', 'Nodes'); # 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; + if (my $m = new IO::File ">$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 + cfgprint($mc, 'totalusers', [qw(gauge)], 10000, + 'Total Users and Nodes in the Visible Cluster Network', + 'Users / Nodes', 'Users', 'Nodes'); } # 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; + if (my $m = new IO::File ">$dir/totalspots") { + print $m "$Spot::totalspots\n$Spot::totalspots\n$uptime\nTotal Spots\n"; + close $m; } $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 + 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 (open M, ">$dir/hfspots") { - print M "$Spot::hfspots\n$Spot::vhfspots\n$uptime\nHF and VHF+ Spots\n"; - close M; + if (my $m = new IO::File ">$dir/hfspots") { + print $m "$Spot::hfspots\n$Spot::vhfspots\n$uptime\nHF and VHF+ Spots\n"; + close $m; } $Spot::hfspots = $Spot::vhfspots = 0; - print MC <<"EOF"; + cfgprint($mc, 'hfspots', [qw(unknaszero gauge)], 1000, 'HF and VHF+ Spots', + 'Spots', 'HF', 'VHF'); +} + # -# HF and VHF spots +# do the mrtg thing +# +close $mc; +my @out = `mrtg $cfg`; +return (1, @out); + +sub cfgprint +{ + my ($mc, $name, $options, $max, $title, $legend, $iname, $oname) = @_; + my $opt = join ', ', @$options, qw(withzeroes gauge growright nopercent integer); + + print $mc <<"EOF"; + +# +# $title # -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

+ +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:Total HF and VHF+ Spots
Description:$title
EOF -} - -close MC; -my @args; -@args = ("mrtg", $cfg); -system @args; - -return (1); +} diff --git a/perl/Spot.pm b/perl/Spot.pm index 80d345ed..2863a449 100644 --- a/perl/Spot.pm +++ b/perl/Spot.pm @@ -52,7 +52,7 @@ $filterdef = bless ([ ['by_zone', 'nz', 11], ['channel', 'c', 12], ], 'Filter::Cmd'); - +$totalspots = $hfspots = $vhfspots = 0; # create a Spot Object sub new