mrtg-rrd-0.7/0040755000076400007640000000000007720173767012430 5ustar fadminfadminmrtg-rrd-0.7/COPYING0100644000076400007640000004307607720173767013472 0ustar fadminfadmin GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, Cambridge, MA 02139, USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. 6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. 7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. 10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS Appendix: How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. Copyright (C) 19yy This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: Gnomovision version 69, Copyright (C) 19yy name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program. You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker. , 1 April 1989 Ty Coon, President of Vice This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License. mrtg-rrd-0.7/FAQ0100644000076400007640000001250407720173767012761 0ustar fadminfadmin$Id: FAQ,v 1.8 2003/03/14 13:42:09 kas Exp $ Q: What is this? A: The mrtg-rrd.cgi scripts is a replacement for the 14all.cgi script distributed in the MRTG contrib directory. It is the script which can generate on-the-fly HTML output and graph images from the MRTG statistics. Q: Why not let MRTG to generate the graphs? A: It is much slower to generate thousands of graphs every 5 minutes instead of generating them only when somebody is looking at them. This script (mrtg-rrd.cgi) uses the '--lazy' option of RRDtool, so images are generated only every 5 minutes even if somebody is looking at the statistics more frequently. Q: Do I need an additional software? A: You need the MRTG itself, and the RRDtool (see the http://people.ee.ethz.ch/~oetiker/webtools/mrtg/ and http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/ directories). Q: How to use this? A: Just put the mrtg-rrd.cgi somewhere into your WWW tree, where the CGI scripts can be executed (such as /var/www/cgi-bin/ directory), and edit the line which says "BEGIN { @config_files = }" to reflect all your MRTG config files (yes it can handle multiple config files as long as the target names are unique). Make sure the ImageDir (or the default WorkDir) is set to a directory writable by the HTTP server. You may want to edit the "use lib ..." line as well, if your RRDs.pm is not located in the @INC (the default Perl search path). Q: How to get the actual output? A: Point your browser to the http://your.server/cgi-bin/mrtg-rrd.cgi/ezwf.html (no question marks or ampesands here; just add the slash after the CGI name, then your resource name -- ezwf here -- and a ".html" extension). Q: It does not work. What should I do? A: The author is willing to help you in his spare time, but you must give as much information as you can (error messages, maybe HTML files it outputs, etc). Please state clearly what are you doing and when and how the mrtg-rrd behaviour starts to differ from what you are expecting. Q: It does not display the MRTG banner images at the bottom of the page. A: Either put the icons to the same directory as mrtg-rrd.cgi, or try to set the IconDir: directive in mrtg.cfg. You have to have the PNG versions of the images in that directory (mrtg-rrd currently does not use GIFs). Q: It does not display the graphs, just the HTML files. What should I do? A: The mrtg-rrd (i.e. the HTTP server under which it runs) need the write access to the directory where the graph images are to be created. Images are created either in the WorkDir: directory, or in the ImageDir: directory, if the ImageDir: is set. Set the ImageDir: directive to some separate directory (it does not need to be visible inside the WWW tree) and make this directory writable either by user or group under which the HTTP server runs. Q: On which systems mrtg-rrd runs? A: I have developed it and tested under Linux, but it should run under any system with Perl and RRDtool, whose HTTP server understands CGI with PATH_INFO. It has been reported to run under Solaris and even Micros~1 Windows with IIS. Q: I have problem running it on MS IIS. What should I do? A: Anders Fosgerau wrote: : Actually I almost got IIS to work. The trick is first the one that you : referred to. In short the solution is to: : : cd %SystemRoot%\inetsrv\adminsamples : adsutil.vbs SET W3SVC/AllowPathInfoforScriptMappings : : (reference: : http://www.mstm.okstate.edu/students/jrbattles/docs/nt/perloniis.htm) : : The next trick is to disable the "check that file exists" checkbox : under the IIS CGI application configuration (reference: : http://jmarshall.com/tools/cgiproxy/faq.html#q5) Q1: It is slow. How can I speed it up? Q2: I want to use FastCGI/mod_perl/Apache::Registry. I don't want to use CGI. A: The mrtg-rrd.cgi is written in a mod_perl friendly way. It can be run as a FastCGI, mod_perl or Apache::Registry. The script itself tries to precompute everything once (i.e. the parsing of mrtg.cfg) and then only perform the actual computations. If you want to run it under a different environment than CGI, just create the $q object with the path_info() method, and then call a handler($q) subroutine (see the bottom of the script for an example). Q: Can it fully emulate the MRTG behaviour? A: No, but it understands a very large subset of MRTG directives. See the file TODO for the list of unimplemented directives. Everything else (described in the MRTG reference.1 manpage) should be implemented. You are welcome to contribute any improvements. Q: Why to develop another 14all.cgi? A: This script tries to produce its output as much similar to the original MRTG output as possible. It also implements (I believe) much bigger subset of MRTG configuration directives than 14all.cgi. Q: Where can I find the newest version? A: Look at http://www.fi.muni.cz/~kas/mrtg-rrd/ - this is the project home page. You can also look at the FTP directory - ftp://ftp.linux.cz/pub/linux/people/jan_kasprzak/mrtg-rrd/ Q: Can I modify this script? A: Yes, it is distributed under the terms of GNU GPL. However, if you fix a bug in this script, please consider contributing the fix back to the author (use the "diff -u" command for generating patch). Q: Who is the author? A: This script was written by Jan "Yenya" Kasprzak . See http://www.fi.muni.cz/~kas/ page for details and other projects. mrtg-rrd-0.7/TODO0100644000076400007640000000506607720173767013124 0ustar fadminfadmin$Id: TODO,v 1.13 2003/08/18 15:56:40 kas Exp $ Unimplemented mrtg.cfg directives ================================= Htmldir: (it is determined by the .cgi location); no static HTML is generated NoMib2: (and displaying system uptime) I don't want to query routers from the CGI. Language: TODO Libadd: (handled separately) Don't want to mess with more BEGIN{} statements. RouterUptime: I don't want to query the routers from the CGI. Extension: (has no meaning) YTics: don't know how to tell this to rrdgraph YTicsFactor: don't know how to tell this to rrdgraph Step: don't know what this should do Option: growright: it is the default (don't know how to make growleft graphs) SetEnv: Makes sense only for Target[]. Not implemented. Weekformat: Dont know how to do this Other TODO/missing items ======================== More customizable directory listing. Exact time of the previous VRULE (for month and year graphs). The CGI speedup methods other than FastCGI (speedycgi?). Verify that it works on Windows (I have mixed reports both with MS IIS and with Apache on Windows). Rewrite the config file parsing using MRTG_lib.pm. Known bugs ========== * Directory mode does not honour the "Suppress[]: d" and refers to the daily graph unconditionally. * Directory mode does not generate the "WIDHT=" and "HEIGHT=" parameters to the tag. * Sometimes it displays 8-times bigger values than MRTG (Options[target]: bits usually helps there). Probably it has something to do with command-generated stats (Target[...]: `command`) and/or stats converted to RRD format from earlier MRTG log databases. I was not able to reproduce this, but I have reports of this behaviour. I tried to create a fresh mrtg.cfg file with "LogFormat: rrdtool" and "Options: bits", and measure the traffic of some switch. Then the mrtg-rrd.cgi generated the graphs and values which were in perfect correspondence with the real world. * The Refresh: HTTP header sometimes confuses older browser - when this header is added both to the main html file and to the image files, the browser sometimes redirects itself to the image URL instead of the main HTML page. Netscape 4 and Opera 5 and 6 are reported to have this problem (Mozilla, Galeon and MSIE are fine). Since the Refresh: header is not defined in the HTTP specification, there is no "correct" way to solve this. So I'll leave this unfixed. * The config file parsing is still not 100% MRTG-compatible, mainly with extensive use of [_], [$] and [^] in multiple config files. The fix is to use MRTG_lib.pm directly, but I will do it post 0.7 release. mrtg-rrd-0.7/Makefile0100644000076400007640000000111307720173767014061 0ustar fadminfadmin# $Id: Makefile,v 1.7 2003/08/18 15:58:57 kas Exp $ FILES = COPYING FAQ TODO Makefile mrtg-rrd.cgi ChangeLog TARGETS = mrtg-rrd.fcgi VERSION = 0.7 all: $(TARGETS) mrtg-rrd.fcgi: mrtg-rrd.cgi -rm -f mrtg-rrd.fcgi sed -e '/^#--BEGIN CGI--/,/^#--END CGI--/d' -e '/^#--BEGIN FCGI--/,/^#--END FCGI--/s/^#-# //' mrtg-rrd.fcgi chmod +x mrtg-rrd.fcgi clean: -rm -f $(TARGETS) dist: rm -rf mrtg-rrd-$(VERSION) mkdir mrtg-rrd-$(VERSION) cp $(FILES) mrtg-rrd-$(VERSION) tar cf - mrtg-rrd-$(VERSION) | gzip -9 > mrtg-rrd-$(VERSION).tar.gz -rm -rf mrtg-rrd-$(VERSION) mrtg-rrd-0.7/mrtg-rrd.cgi0100755000076400007640000006672107720173767014666 0ustar fadminfadmin#!/usr/bin/perl -w # # $Id: mrtg-rrd.cgi,v 1.35 2003/08/18 15:58:57 kas Exp $ # # mrtg-rrd.cgi: The script for generating graphs for MRTG statistics. # # Loosely modelled after the Rainer.Bawidamann@informatik.uni-ulm.de's # 14all.cgi # # Copyright (C) 2001 Jan "Yenya" Kasprzak # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # use strict; use POSIX qw(strftime); use Time::Local; # The %.1f should work on 5.005+. There may be other problems, though. # I've tested this on 5.8.0 only, so mind the gap! require 5.005; # Location of RRDs.pm, if it is not in @INC # use lib '/usr/lib/perl5/5.00503/i386-linux'; use RRDs; use vars qw(@config_files @all_config_files %targets $config_time %directories $version $imagetype); # EDIT THIS to reflect all your MRTG config files BEGIN { @config_files = qw(/home/fadmin/mrtg/cfg/mrtg.cfg); } $version = '0.7'; # This depends on what image format your libgd (and rrdtool) uses $imagetype = 'png'; # or make this 'gif'; # strftime(3) compatibility test my $percent_h = '%-H'; $percent_h = '%H' if (strftime('%-H', gmtime(0)) !~ /^\d+$/); sub handler ($) { my ($q) = @_; try_read_config($q->url()); my $path = $q->path_info(); $path =~ s/^\///; $path =~ s/\/$//; if (defined $directories{$path}) { if ($q->path_info() =~ /\/$/) { print_dir($path); } else { print "Location: ", $q->url(-path_info=>1), "/\n\n"; } return; } my ($dir, $stat, $ext) = ($q->path_info() =~ /^(.*)\/([^\/]+)(\.html|-(day|week|month|year)\.$imagetype)$/); $dir =~ s/^\///; print_error("Undefined statistics") unless defined $targets{$stat}; print_error("Incorrect directory") unless defined $targets{$stat}{directory} || $targets{$stat}{directory} eq $dir; my $tgt = $targets{$stat}; common_args($stat, $tgt, $q); # We may be running under mod_perl or something. Do not destroy # the original settings of timezone. my $oldtz; if (defined $tgt->{timezone}) { $oldtz = $ENV{TZ}; $ENV{TZ} = $tgt->{timezone}; } if ($ext eq '.html') { do_html($tgt); } elsif ($ext eq '-day.' . $imagetype) { do_image($tgt, 'day'); } elsif ($ext eq '-week.' . $imagetype) { do_image($tgt, 'week'); } elsif ($ext eq '-month.' . $imagetype) { do_image($tgt, 'month'); } elsif ($ext eq '-year.' . $imagetype) { do_image($tgt, 'year'); } else { print_error("Unknown extension"); } $ENV{TZ} = $oldtz if defined $oldtz; } sub do_html($) { my ($tgt) = @_; my @day = do_image($tgt, 'day'); my @week = do_image($tgt, 'week'); my @month = do_image($tgt, 'month'); my @year = do_image($tgt, 'year'); http_headers('text/html', $tgt->{config}); print <<'EOF'; EOF print $tgt->{title} if defined $tgt->{title}; print "\n"; html_comments($tgt, 'd', @{$day[0]}) if $#day != -1; html_comments($tgt, 'w', @{$week[0]}) if $#week != -1; html_comments($tgt, 'm', @{$month[0]}) if $#month != -1; html_comments($tgt, 'y', @{$year[0]}) if $#year != -1; print $tgt->{addhead} if defined $tgt->{addhead}; print "\n", $tgt->{bodytag}, "\n"; print $tgt->{pagetop} if defined $tgt->{pagetop}; unless (defined $tgt->{options}{noinfo}) { my @st = stat $tgt->{rrd}; print "
\nThe statistics were last updated ", strftime("%A, %d %B, %H:%M:%S %Z\n", localtime($st[9])); } my $dayavg = $tgt->{config}->{interval}; html_graph($tgt, 'day', 'Daily', $dayavg . ' Minute', \@day); html_graph($tgt, 'week', 'Weekly', '30 Minute', \@week); html_graph($tgt, 'month', 'Monthly', '2 Hour', \@month); html_graph($tgt, 'year', 'Yearly', '1 Day', \@year); unless (defined $tgt->{options}{nolegend}) { print < EOF print <{options}{noi}); EOF print <{options}{noo}); EOF if ($tgt->{withpeak} ne '') { print <{options}{noi}); EOF print <{options}{noo}); EOF } print < EOF } print_banner($tgt->{config}) unless defined $tgt->{options}{nobanner}; print $tgt->{pagefoot} if defined $tgt->{pagefoot}; print "\n", <<'EOF'; EOF } sub html_comments($$@) { my ($tgt, $letter, @val) = @_; return if $#val == -1; unless ($tgt->{options}{noi}) { print "\n"; print "\n"; print "\n"; } unless ($tgt->{options}{noo}) { print "\n"; print "\n"; print "\n"; } } sub html_graph($$$$$) { my ($tgt, $ext, $freq, $period, $params) = @_; return unless defined $tgt->{$ext}; my @values = @{$params->[0]}; my $x = $params->[1]; my $y = $params->[2]; $x *= $tgt->{xzoom} if defined $tgt->{xzoom}; $y *= $tgt->{yzoom} if defined $tgt->{yzoom}; my $kilo = $tgt->{kilo}; my @kmg = split(',', $tgt->{kmg}); my $fmt; if (defined $tgt->{options}{integer}) { $fmt = '%d'; } else { $fmt = '%.1f'; } my @percent = do_percent($tgt, \@values); my @relpercent = do_relpercent($tgt, \@values); my @nv; for my $val (@values) { if (@kmg == 0) { # kMG[target]: push @nv, sprintf($fmt, $val); next; } for my $si (@kmg) { if ($val < 10000) { push @nv, sprintf($fmt, $val) . " $si"; last; } $val /= $kilo; } } @values = @nv; print "
\n\`$freq\' Graph ($period Average)
\n"; print '', $freq, ' Graph
', "\n"; print '
$tgt->{colname1} ### $tgt->{legend1}
$tgt->{colname2} ### $tgt->{legend2}
$tgt->{colname3} ### $tgt->{legend3}
$tgt->{colname4} ### $tgt->{legend4}
'; print <{legendi} ne '' && !$tgt->{options}{noi}; EOF print <{legendo} ne '' && !$tgt->{options}{noo}; EOF if (defined $tgt->{options}{dorelpercent}) { print <<"EOF"; EOF } print <<'EOF';
Max $tgt->{legendi}  $values[1]$tgt->{shortlegend}$percent[1] Average $tgt->{legendi}  $values[3]$tgt->{shortlegend}$percent[3] Current $tgt->{legendi}  $values[5]$tgt->{shortlegend}$percent[5]
Max $tgt->{legendo}  $values[0]$tgt->{shortlegend}$percent[0] Average $tgt->{legendo}  $values[2]$tgt->{shortlegend}$percent[2] Current $tgt->{legendo}  $values[4]$tgt->{shortlegend}$percent[4]
Max  Percentage:  $relpercent[0] Average  Percentage:  $relpercent[1] Current  Percentage:  $relpercent[2]
EOF } sub do_percent($$) { my ($tgt, $values) = @_; my @percent = ('', '', '', '', '', ''); return @percent if defined $tgt->{options}{nopercent}; for my $val (0..$#$values) { my $mx = ($val % 2 == 1) ? $tgt->{maxbytes1} : $tgt->{maxbytes2}; next unless defined $mx; my $p = sprintf("%.1f", $values->[$val]*100/$mx); $percent[$val] = ' (' . $p . '%)'; } @percent; } sub do_relpercent($$) { my ($tgt, $values) = @_; my @percent = ('', '', ''); return @percent unless defined $tgt->{options}{dorelpercent}; for my $val (0..2) { $percent[$val] = sprintf("%.1f", $values->[2*$val+1] * 100 / $values->[2*$val]) if $values->[2*$val] > 0; $percent[$val] ||= 0; $percent[$val] .= ' %'; } @percent; } sub http_headers($$) { my ($content_type, $cfg) = @_; print <<"EOF"; Content-Type: $content_type Refresh: $cfg->{refresh} Pragma: no-cache EOF # Expires header calculation stolen from CGI.pm print strftime("Expires: %a, %d %b %Y %H:%M:%S GMT\n", gmtime(time+60*$cfg->{interval})); print "\n"; } sub do_image($$) { my ($target, $ext) = @_; my $file = $target->{$ext}; return unless defined $file; # Now the vertical rule at the end of the day my @t = localtime(time); $t[0] = $t[1] = $t[2] = 0; my $seconds; my $oldsec; my $back; my $xgrid; my $unscaled; my $withpeak; my $noi = 1 if $target->{options}{noi}; my $noo = 1 if $target->{options}{noo}; if ($ext eq 'day') { $seconds = timelocal(@t); $back = 30*3600; # 30 hours $oldsec = $seconds - 86400; $unscaled = 1 if $target->{unscaled} =~ /d/; $withpeak = 1 if $target->{withpeak} =~ /d/; # We need this only for day graph. The other ones # are magically correct. $xgrid = 'HOUR:1:HOUR:6:HOUR:2:0:' . $percent_h; } elsif ($ext eq 'week') { $seconds = timelocal(@t); $t[6] = ($t[6]+6) % 7; $seconds -= $t[6]*86400; $back = 8*86400; # 8 days $oldsec = $seconds - 7*86400; $unscaled = 1 if $target->{unscaled} =~ /w/; $withpeak = 1 if $target->{withpeak} =~ /w/; } elsif ($ext eq 'month') { $t[3] = 1; $seconds = timelocal(@t); $back = 36*86400; # 36 days $oldsec = $seconds - 30*86400; # FIXME (the right # of days!!) $unscaled = 1 if $target->{unscaled} =~ /m/; $withpeak = 1 if $target->{withpeak} =~ /m/; } elsif ($ext eq 'year') { $t[3] = 1; $t[4] = 0; $seconds = timelocal(@t); $back = 396*86400; # 365 + 31 days $oldsec = $seconds - 365*86400; # FIXME (the right # of days!!) $unscaled = 1 if $target->{unscaled} =~ /y/; $withpeak = 1 if $target->{withpeak} =~ /y/; } else { print_error("Unknown file extension: $ext"); } my @local_args; if ($unscaled) { @local_args = ('-u', $target->{maxbytes1}); push @local_args, '--rigid' unless defined $target->{absmax}; } if ($xgrid) { push @local_args, '-x', $xgrid; } my @local_args_end; if ($withpeak) { push @local_args_end, 'LINE1:maxin'.$target->{col3}.':MaxIn' unless $noi; push @local_args_end, 'LINE1:maxout'.$target->{col4}.':MaxOut' unless $noo; } my @rv = RRDs::graph($file, '-s', "-$back", @local_args, @{$target->{args}}, "VRULE:$oldsec#ff0000", "VRULE:$seconds#ff0000", @local_args_end); my $rrd_error = RRDs::error; print_error("RRDs::graph failed, $rrd_error") if defined $rrd_error; # In array context just return the values if (wantarray) { if (defined $target->{factor}) { @{$rv[0]} = map { $_ * $target->{factor} } @{$rv[0]}; } if ($noi) { return ([$rv[0][0], 0, $rv[0][1], 0, $rv[0][2], 0], $rv[1], $rv[2]); } elsif ($noo) { return ([0, $rv[0][0], 0, $rv[0][1], 0, $rv[0][2]], $rv[1], $rv[2]); } else { return @rv; } } # Not in array context ==> print out the PNG file. open PNG, "<$file" or print_error("Can't open $file: $!"); binmode PNG; http_headers("image/$imagetype", $target->{config}); my $buf; # could be sendfile in Linux ;-) while(sysread PNG, $buf, 8192) { print $buf; } close PNG; } sub common_args($$$) { my ($name, $target, $q) = @_; return @{$target->{args}} if defined @{$target->{args}}; my $noi = 1 if $target->{options}{noi}; my $noo = 1 if $target->{options}{noo}; $target->{name} = $name; $target->{directory} = '' unless defined $target->{directory}; my $tdir = $target->{directory}; $tdir .= '/' unless $tdir eq '' || $tdir =~ /\/$/; $target->{url} = $q->url . '/' . $tdir . $name; my $cfg = $target->{config}; my $dir = $cfg->{workdir}; $dir = $cfg->{logdir} if defined $cfg->{logdir}; $target->{rrd} = $dir . '/' . $tdir . $name . '.rrd'; %{$target->{options}} = () unless defined %{$target->{options}}; $dir = $cfg->{workdir}; $dir = $cfg->{imagedir} if defined $cfg->{imagedir}; $target->{suppress} ||= ''; $target->{day} = $dir . '/' . $tdir . $name . '-day.' . $imagetype unless $target->{suppress} =~ /d/; $target->{week} = $dir . '/' . $tdir . $name . '-week.' . $imagetype unless $target->{suppress} =~ /w/; $target->{month} = $dir . '/' . $tdir . $name . '-month.' . $imagetype unless $target->{suppress} =~ /m/; $target->{year} = $dir . '/' . $tdir . $name . '-year.' . $imagetype unless $target->{suppress} =~ /y/; $target->{maxbytes1} = $target->{maxbytes} if defined $target->{maxbytes} && !defined $target->{maxbytes1}; $target->{maxbytes2} = $target->{maxbytes1} if defined $target->{maxbytes1} && !defined $target->{maxbytes2}; my @args = (); push @args, '--lazy', '-c', 'FONT#000000', '-c', 'MGRID#000000', '-c', 'FRAME#000000', '-g', '-l', '0'; $target->{background} = '#f5f5f5' unless defined $target->{background}; push @args, '-c', 'BACK'. $target->{background}; push @args, '-c', 'SHADEA' . $target->{background}, '-c', 'SHADEB' . $target->{background} if defined $target->{options}{noborder}; if (defined $target->{options}{noarrow}) { push @args, '-c', 'ARROW' . $target->{background}; } else { push @args, '-c', 'ARROW#000000'; } push @args, '-b', $target->{kilo} if defined $target->{kilo}; if (defined $target->{xsize}) { if (defined $target->{xscale}) { push @args, '-w', $target->{xsize}*$target->{xscale}; } else { push @args, '-w', $target->{xsize}; } } if (defined $target->{ysize}) { if (defined $target->{yscale}) { push @args, '-h', $target->{ysize}*$target->{yscale}; } else { push @args, '-h', $target->{ysize}; } } my $scale = 1; if (defined $target->{options}->{perminute}) { $scale *= 60; } elsif (defined $target->{options}->{perhour}) { $scale *= 3600; } if (defined $target->{options}->{bits}) { $scale *= 8; $target->{ylegend} = 'Bits per second' unless defined $target->{ylegend}; $target->{legend1} = 'Incoming Traffic in Bits per Second' unless defined $target->{legend1}; $target->{legend2} = 'Outgoing Traffic in Bits per Second' unless defined $target->{legend2}; $target->{legend3} = 'Peak Incoming Traffic in Bits per Second' unless defined $target->{legend3}; $target->{legend4} = 'Peak Outgoing Traffic in Bits per Second' unless defined $target->{legend4}; $target->{shortlegend} = 'b/s' unless defined $target->{shortlegend}; } else { $target->{ylegend} = 'Bytes per second' unless defined $target->{ylegend}; $target->{legend1} = 'Incoming Traffic in Bytes per Second' unless defined $target->{legend1}; $target->{legend2} = 'Outgoing Traffic in Bytes per Second' unless defined $target->{legend2}; $target->{legend3} = 'Peak Incoming Traffic in Bytes per Second' unless defined $target->{legend3}; $target->{legend4} = 'Peak Outgoing Traffic in Bytes per Second' unless defined $target->{legend4}; $target->{shortlegend} = 'B/s' unless defined $target->{shortlegend}; } if ($scale > 1) { push @args, "DEF:in0=$target->{rrd}:ds0:AVERAGE", "CDEF:in=in0,$scale,*", "DEF:maxin0=$target->{rrd}:ds0:MAX", "CDEF:maxin=maxin0,$scale,*" unless $noi; push @args, "DEF:out0=$target->{rrd}:ds1:AVERAGE", "CDEF:out=out0,$scale,*", "DEF:maxout0=$target->{rrd}:ds1:MAX", "CDEF:maxout=maxout0,$scale,*" unless $noo; } else { push @args, "DEF:in=$target->{rrd}:ds0:AVERAGE", "DEF:maxin=$target->{rrd}:ds0:MAX" unless $noi; push @args, "DEF:out=$target->{rrd}:ds1:AVERAGE", "DEF:maxout=$target->{rrd}:ds1:MAX" unless $noo; } my $i=1; for my $coltext (split(/,/, $target->{colours})) { my ($text, $rgb) = ($coltext =~ /^([^#]+)(#[0-9a-fA-F]{6})$/); $target->{'col'.$i} = $rgb; $target->{'colname'.$i} = $text; $i++; } push @args, '-v', $target->{ylegend}; push @args, 'AREA:in' . $target->{col1} . ':In', unless $noi; push @args, 'LINE2:out' . $target->{col2} . ':Out' unless $noo; push @args, 'PRINT:out:MAX:%.1lf' unless $noo; push @args, 'PRINT:in:MAX:%.1lf' unless $noi; push @args, 'PRINT:out:AVERAGE:%.1lf' unless $noo; push @args, 'PRINT:in:AVERAGE:%.1lf' unless $noi; push @args, 'PRINT:out:LAST:%.1lf' unless $noo; push @args, 'PRINT:in:LAST:%.1lf' unless $noi; if (defined $target->{maxbytes1}) { $target->{maxbytes1} *= $scale; push @args, 'HRULE:' . $target->{maxbytes1} . '#cc0000'; } if (defined $target->{maxbytes2}) { $target->{maxbytes2} *= $scale; push @args, 'HRULE:' . $target->{maxbytes2} . '#cccc00' if $target->{maxbytes2} != $target->{maxbytes1}; } @{$target->{args}} = @args; @args; } sub try_read_config($) { my ($prefix) = (@_); $prefix =~ s/\/[^\/]*$//; # Verify the version of RRDtool: if (!defined $RRDs::VERSION || $RRDs::VERSION < 1.000331) { print_error("Please install more up-to date RRDtool - need at least 1.000331"); } my $read_cfg; if (!defined $config_time) { $read_cfg = 1; } else { for my $file (@all_config_files) { my @stat = stat $file; if ($config_time < $stat[9]) { $read_cfg = 1; last; } } } return unless $read_cfg; my %defaults = ( xsize => 400, ysize => 100, kmg => ',k,M,G,T,P', kilo => 1000, bodytag => "\n", colours => 'GREEN#00cc00,BLUE#0000ff,DARK GREEN#006600,MAGENTA#ff00ff,AMBER#ef9f4f', legendi => ' In:', legendo => ' Out:', unscaled => '', withpeak => '', directory => '', ); %targets = (); @all_config_files = @config_files; my $order = 0; for my $cfgfile (@config_files) { %{$targets{_}} = %defaults; %{$targets{'^'}} = (); %{$targets{'$'}} = (); my $cfgref = { refresh => 300, interval => 5, icondir => $prefix }; read_mrtg_config($cfgfile, \%defaults, $cfgref, \$order); } delete $targets{'^'}; delete $targets{_}; delete $targets{'$'}; parse_directories(); $config_time = time; } sub read_mrtg_config($$$$); sub read_mrtg_config($$$$) { my ($file, $def, $cfgref, $order) = @_; my %defaults = %$def; my @lines; open(CFG, "<$file") || print_error("Cannot open config file: $!"); while () { chomp; # remove newline s/\s+$//; # remove trailing space s/\s+/ /g; # collapse white spaces to ' ' next if /^ *\#/; # skip comment lines next if /^\s*$/; # skip empty lines if (/^ \S/) { # multiline options $lines[$#lines] .= $_; } else { push @lines, $_; } } close CFG; foreach (@lines) { if (/^\s*([\w\d]+)\[(\S+)\]\s*:\s*(.*)$/) { my ($tgt, $opt, $val) = (lc($2), lc($1), $3); unless (exists $targets{$tgt}) { # pre-set defaults constructed on all of ^, _, and $ for my $key (%{$targets{'^'}}) { $targets{$tgt}{$key} = $targets{'^'}{$key}; } for my $key (%{$targets{'$'}}) { $targets{$tgt}{$key} .= $targets{'$'}{$key}; } # WARNING: Tobi explicitly said that when all ^, _, and $ # options are set, the result should be just the value # of the _ option (when the option itself is not explicitly # defined. I do not agree with him here but I respect this # and will try to be compatible with MRTG. for my $key (%{$targets{'_'}}) { $targets{$tgt}{$key} = $targets{'_'}{$key}; } # anonymous hash ref - need copy, not ref delete $targets{$tgt}{options}; # The same as above - we need to create this # based on [^], [_], and [$] values %{$targets{$tgt}{options}} = (); %{$targets{$tgt}{options}} = %{$targets{'^'}{options}} if defined $targets{'^'}{options}; %{$targets{$tgt}{options}} = (%{$targets{$tgt}{options}}, %{$targets{'_'}{options}}) if defined $targets{'_'}{options}; %{$targets{$tgt}{options}} = (%{$targets{$tgt}{options}}, %{$targets{'$'}{options}}) if defined $targets{'$'}{options}; $targets{$tgt}{order} = ++$$order; $targets{$tgt}{config} = $cfgref; } if ($tgt eq '_' && $val eq '') { if (defined $defaults{$opt}) { $targets{_}{$opt} = $defaults{$opt}; } else { delete $targets{_}{$opt}; } } elsif (($tgt eq '^' || $tgt eq '$') && $val eq '') { delete $targets{$tgt}{$opt}; } elsif ($opt eq 'options') { # Do not forget defaults [^] and [$] delete $targets{$tgt}{options}; %{$targets{$tgt}{options}} = %{$targets{'^'}{options}} if defined $targets{'^'}{options}; $val = lc($val); map { $targets{$tgt}{options}{$_} = 1 } ($val =~ m/([a-z]+)/g); %{$targets{$tgt}{options}} = (%{$targets{$tgt}{options}}, %{$targets{'$'}{options}}) if defined $targets{'$'}{options}; } else { my $pre = $targets{'^'}{$opt} if defined $targets{'^'}{$opt}; $pre ||= ''; $targets{$tgt}{$opt} = $pre.$val; $targets{$tgt}{$opt} .= $targets{'$'}{$opt} if defined $targets{'$'}{$opt}; } next; } elsif (/^Include\s*:\s*(\S*)$/) { push @all_config_files, $1; read_mrtg_config($1, $def, $cfgref, $order); next; } elsif (/^([\w\d]+)\s*:\s*(\S.*)$/) { my ($opt, $val) = (lc($1), $2); $cfgref->{$opt} = $val; next; } print_error("Parse error in $file near $_"); } if (defined $cfgref->{pathadd}) { $ENV{PATH} .= ':'.$cfgref->{pathadd}; } # if (defined $cfgref->{libadd}) { # use lib $cfgref->{libadd} # } } sub parse_directories { %directories = (); # FIXME: the sort is expensive for my $name (sort { $targets{$a}{order} <=> $targets{$b}{order} } keys %targets) { my $dir = $targets{$name}{directory} if defined $targets{$name}{directory}; $dir = '' unless defined $dir; my $prefix = ''; for my $component (split /\/+/, $dir) { unless (defined $directories{$prefix.$component}) { push (@{$directories{$prefix}{subdir}}, $component); # For the directory, get the global parameters # from the # config of the first item of the # directory: $directories{$prefix}{config} = $targets{$name}{config}; $directories{$prefix}{bodytag} = $targets{$name}{bodytag}; } $prefix .= $component . '/'; } unless (defined $directories{$dir}) { $directories{$dir}{config} = $targets{$name}{config}; $directories{$dir}{bodytag} = $targets{$name}{bodytag}; } push (@{$directories{$dir}{target}}, $name); } } sub print_dir($) { my ($dir) = @_; my $dir1 = $dir . '/'; http_headers('text/html', $directories{$dir}{config}); print < MRTG: Directory $dir1 EOF print $directories{$dir}{bodytag}; my $subdirs_printed; if (defined @{$directories{$dir}{subdir}}) { $subdirs_printed = 1; print <MRTG subdirectories in the directory $dir1
    EOF for my $item (@{$directories{$dir}{subdir}}) { print "
  • $item/\n"; } print "
\n"; } if (defined @{$directories{$dir}{target}}) { print "
\n" if defined $subdirs_printed; print <MRTG graphs in the directory $dir1 EOF my $odd; for my $item (@{$directories{$dir}{target}}) { my $itemname = $item; $itemname = $targets{$item}{title} if defined $targets{$item}{title}; print " \n" unless $odd; print <$itemname
$item
EOF print " \n" if $odd; $odd = !$odd; } print " \n
\n"; } print_banner($directories{$dir}{config}); print "\n\n"; } sub print_banner($) { my $cfg = shift; print <
version 2.9.17 Tobias Oetiker <oetiker\@ee.ethz.ch>
and Dave Rand <dlr\@bungi.com>
mrtg-rrd.cgi version $version Jan "Yenya" Kasprzak <kas\@fi.muni.cz>
EOF print '', "\n"; } sub dump_targets() { for my $tgt (keys %targets) { print "Target $tgt:\n"; for my $opt (keys %{$targets{$tgt}}) { if ($opt eq 'options') { print "\toptions: "; for my $o1 (keys %{$targets{$tgt}{options}}) { print $o1, ","; } print "\n"; next; } print "\t$opt: ", $targets{$tgt}{$opt}, "\n"; } } } sub dump_directories { print "Directories:\n"; for my $dir (keys %directories) { print "Directory $dir:\n"; for my $item (@{$directories{$dir}}) { print "\t$item\n"; } } } sub print_error(@) { print "Content-Type: text/plain\n\nError: ", join(' ', @_), "\n"; exit 0; } #--BEGIN CGI-- #For CGI, use this: use CGI; my $q = new CGI; # thttpd fix up by Akihiro Sagawa if ($q->server_software() =~ m|^thttpd/|) { my $path = $q->path_info(); $path .= '/' if ($q->script_name=~ m|/$|); $q->path_info($path); } handler($q); #--END CGI-- #--BEGIN FCGI-- # For FastCGI, uncomment this and comment out the above: #-# use FCGI; #-# use CGI; #-# #-# my $req = FCGI::Request(); #-# #-# while ($req->Accept >= 0) { #-# my $q = new CGI; #-# #-# # thttpd fix up by Akihiro Sagawa #-# if ($q->server_software() =~ m|^thttpd/|) { #-# my $path = $q->path_info(); #-# $path .= '/' if ($q->script_name=~ m|/$|); #-# $q->path_info($path); #-# } #-# #-# handler($q); #-# } #--END FCGI-- 1; mrtg-rrd-0.7/ChangeLog0100644000076400007640000001354007720173767014202 0ustar fadminfadmin$Id: ChangeLog,v 1.28 2003/08/18 15:58:57 kas Exp $ ================================================================== RELEASE 0.7 * Mon Aug 18 16:13:16 CEST 2003 The "Factor[target]: value" directive implemented. Suggested by Adam Denenberg and others, but I've changed this to modify only numbers below graphs, not the graphs itself - it is documented in MRTG reference(1) manual page to work this way. binmode fix for the PNG file as suggested by Paul Rathbone. require 5.005 (it should work there, but not tested!) thttpd fix by Akihiro Sagawa. strftime() now uses only ANSI C standard format string directives. * Wed Aug 13 16:08:45 CEST 2003 Work on noi/noo options based on the implementation by Tobias Gruetzmacher. * Wed Aug 13 15:46:03 CEST 2003 The kMG[]: now implemented. Fix suggested by Tobias Gruetzmacher, I've modified this slightly. * Fri Aug 1 17:19:12 CEST 2003 The automatic compatibility test for strftime("%-H"), which does not work on some platforms (e.g. Solaris). The "%H" format string is used instead in that case. * Sun Mar 23 18:06:48 CET 2003 Make the version string in "require" portable (5.008 instead of 5.8.0). Fix suggested by Haroon Rafique. * Mon Mar 17 14:48:31 CET 2003 Fixed the undefined variable error when Options[_] was set. Reported by Mark Pelillo, thanks! ================================================================== RELEASE 0.6 * Fri Mar 14 14:39:16 CET 2003 Bumped the version number to 0.6. Fixed some spelling mistakes in FAQ and TODO. More known bugs/mis-features added to TODO. * Wed Mar 12 17:05:53 CET 2003 Fixed the hard-coded "5 Minute" legend in the daly graph (in fact it should be based on the Interval: setting). Thanks to Vincent Aniello for reporting this. The Interval: parameter is in minutes, not in seconds (as opposed from the Refresh: parameter). Requires Perl 5.8.0 because of the sprintf() handling. Accepts tabs and other whitespace characters at the beginning of line, and before and after the ":" sign in the directive. Reworked handling of [^], [_], and [$] - now it uses [_] when no [target] is set and all of [^], [_] and [$] is set, and [^][target][$] otherwise. Bug reported by Alejandro Marco. Reworked handling of Options[^], [_], and [$]. When no Options[target] is set, all of Options[^], [_], and [$] apply. When Options[target] is set, the Options[^], Options[target], and Options[$] apply. I've try to verify this against MRTG, but its handling of these cases seems to be a bit erratic. Sent a question to the mrtg list, we'll se what reply I get. Added $imagetype configuration variable so that GIF images can be used instead of PNG. * Wed Oct 30 14:08:46 CET 2002 Fixed the "%.1lf" format string (does not work on 5.8.0). * Wed Apr 14 18:51:52 CEST 2002 Fixed the shallow copy of the [_] default values of the "options" hash. Fix by Daniel Drown. * Wed Apr 10 14:24:06 CEST 2002 The X axis labels on the -day graph looks similar to the original MRTG (i.e., labels every 2 hours instead of every 6th hour). Suggested by Glen Gold. * Mon Feb 25 16:08:18 CET 2002 Fixed the ugly bug with Refresh handling in leaf subdirectories. =================================================================== RELEASE 0.5 * Thu Feb 21 19:02:40 CET 2002 Spelling fixes by Evans O'Shaughnessy. Multilple config files now works even with different WorkDirs etc. The parameters (such as IconDir or Refresh) for the directory is taken from the global configuration directives of the first target in the particular sub-tree. Bumped the version number to 0.5. * Thu Feb 7 20:36:57 CET 2002 Incorrect handling of Suppress[]: d (reported by Luc Ducazu). * Wed Jan 16 09:16:47 CET 2002 Moved mis-placed call to http_headers() after the opening of the PNG file. Added FAQ entry about CGI with PATH_INFO in IIS. Added FAQ entry about operating systems compatibility. * Fri Jan 11 13:48:34 CET 2002 Changed the non-portable strftime("%s", @t) to timelocal(@t) (the timelocal() is in the Time::Local module). This non-portability has been reported by Takuya Mori. =================================================================== RELEASE 0.4 * Wed Jan 9 13:50:29 CET 2002 Fixed the incorrect behaviour when IconDir is not set. Now it displays the icons from the same directory where the script is located. Fixed the misplaced lc() in the config dir name (bug reported by Peter Banfi). Added few bug-hunting tips to the FAQ. Reformated the ChangeLog to the more readable/structured form. Implemented the double-column directory output. When the directory contains both subdirectories and graphs, the directory index consists of two sections - subdirs first and then graphs. The HTML files contain the RCS id of the script in comment in the banner part. Bumped the version number to 0.4 * Tue Jan 8 10:03:41 CET 2002 Older versions of RRDtool do not grok the "-g" switch. Added testing the $RRDs::VERSION. * Mon Jan 7 16:10:39 CET 2002 Configuration file directives can have values including whitespace (thanks to Petr Prazak for discovering this). Added checking of the RRD::graph's error code (as suggested by Petr Prazak). =================================================================== RELEASE 0.3 * Fri Jan 4 18:00:39 CET 2002 Directory mode almost fully implemented. Bumped the version number to 0.3 * Wed Jan 2 17:57:31 CET 2002 The Directory[] directive is now visible in the URL. * Tue Dec 18 14:06:29 CET 2001 Implemented the following mrtg.cfg directives: Unscaled, WithPeak, XZoom, YZoom Fixed the wrong behaviour of XScale, YScale. Added $version as the separate variable. Fixed the global options so that the graph still starts at y_min=0, even if there is no time when the variable is near 0. Fixed the [^], [_], and [$] behaviour for multiple configuration files (the value should not remain defined from the previous cfg. file).