Skip to content

Commit

Permalink
released version 2.17.10
Browse files Browse the repository at this point in the history
  • Loading branch information
oetiker committed Jan 19, 2022
1 parent 93d4b7a commit 0893fc3
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 33 deletions.
6 changes: 3 additions & 3 deletions src/bin/cfgmaker
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /home/oetiker/.plenv/shims/perl -w
# -*- mode: Perl -*-
##################################################################
# MRTG 2.17.9 -- Config file creator
# MRTG 2.17.10 -- Config file creator
##################################################################
# Created by Tobias Oetiker <[email protected]>
# this produces an mrtg config file for one router or more routers
Expand Down Expand Up @@ -1282,7 +1282,7 @@ sub options ($$) {
'zero-speed=s',
'<>', $addrouter_ornf) or pod2usage(2);

die("cfgmaker for mrtg-2.17.9\n") if $$opt{version};
die("cfgmaker for mrtg-2.17.10\n") if $$opt{version};
pod2usage(-exitval => 0, -verbose => 2) if $$opt{man};
pod2usage(-verbose => 1) if not keys %$routers;
} # end options
Expand Down Expand Up @@ -1589,7 +1589,7 @@ __END__
=head1 NAME
cfgmaker - Creates mrtg.cfg files (for mrtg-2.17.9)
cfgmaker - Creates mrtg.cfg files (for mrtg-2.17.10)
=head1 SYNOPSIS
Expand Down
8 changes: 4 additions & 4 deletions src/bin/indexmaker
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /home/oetiker/.plenv/shims/perl -w
# -*- mode: Perl -*-
##################################################################
# MRTG 2.17.9 --- Index Generator
# MRTG 2.17.10 --- Index Generator
##################################################################
#
# This reads a mrtg.cfg file form std input or cmdline argument
Expand Down Expand Up @@ -527,7 +527,7 @@ ECHO
# -----------------------------------------------------------


my $VERSION = "2.17.9";
my $VERSION = "2.17.10";
$index .= <<ECHO;
<td></td>
</tr>
Expand Down Expand Up @@ -636,7 +636,7 @@ sub options ($) {
$$opt{prefix} .= '/';
$$opt{prefix} =~ s|/+$|/|;
}
die ("Indexmaker for mrtg-2.17.9\n") if $$opt{version};
die ("Indexmaker for mrtg-2.17.10\n") if $$opt{version};
pod2usage(-exitval => 1, -verbose => 2) if $$opt{man};
pod2usage(-verbose => 1) if not @ARGV;
Expand Down Expand Up @@ -666,7 +666,7 @@ __END__
=head1 NAME
indexmaker - Creates index files for mrtg web sites (mrtg-2.17.9)
indexmaker - Creates index files for mrtg web sites (mrtg-2.17.10)
=head1 SYNOPSIS
Expand Down
6 changes: 3 additions & 3 deletions src/bin/mrtg
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# -*- mode: cperl -*-

###################################################################
# MRTG 2.17.9 Multi Router Traffic Grapher
# MRTG 2.17.10 Multi Router Traffic Grapher
###################################################################
# Created by Tobias Oetiker <[email protected]>
# and Dave Rand <[email protected]>
Expand Down Expand Up @@ -1622,7 +1622,7 @@ sub writehtml {
my $dirrel = "../" x ($$rcfg{'directory_web'}{$router} =~ tr|/|/|);

$Today=&$LOC(datestr(time));
$VERSION = "2.17.9";
$VERSION = "2.17.10";
open (HTML,">$$cfg{'htmldir'}$$rcfg{'directory'}{$router}$router.$$rcfg{'extension'}{$router}") ||
do { warn ("$NOW: WARNING: Writing $router.$$rcfg{'extension'}{$router}: $!");
next };
Expand Down Expand Up @@ -2038,7 +2038,7 @@ sub printusage {
print <<USAGEDESC;
Usage: mrtg <config-file>
mrtg-2.17.9 - Multi Router Traffic Grapher
mrtg-2.17.10 - Multi Router Traffic Grapher
Copyright 1995-2006 by Tobias Oetiker
Licensed under the Gnu GPL.
Expand Down
2 changes: 1 addition & 1 deletion src/doc/mrtg-contrib.pod
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ work.

MRTG messages have been translated to a number of languages but there are
still many which have not been covered yet. If you want to add yours, go
into the F<mrtg-2.17.9/translate> directory and follow the instructions
into the F<mrtg-2.17.10/translate> directory and follow the instructions
given in the F<README> file.

=head2 Patches
Expand Down
4 changes: 2 additions & 2 deletions src/doc/mrtg-faq.pod
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ In the following sections you'll find some additional Frequently Asked Questions
=head2 Why is there no "@#$%" (my native language) version of MRTG?

Nobody has contributed a F<@#$%.pmd> file yet. Go into the
F<mrtg-2.17.9/translate> directory and create your own translation file.
F<mrtg-2.17.10/translate> directory and create your own translation file.
When you are happy with it send it to me for inclusion with the next mrtg
release.


=head2 I need a script to make mrtg work with my xyz device.

Probably this has already been done. Check the stuff in the
F<mrtg-2.17.9/contrib> directory. There is a file called F<00INDEX> in
F<mrtg-2.17.10/contrib> directory. There is a file called F<00INDEX> in
that directory which tells what you can find in there.

=head2 How does this SNMP thing work
Expand Down
22 changes: 11 additions & 11 deletions src/doc/mrtg-nt-guide.pod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
=head1 NAME

mrtg-nt-guide - The MRTG 2.17.9 Windows Installation Guide
mrtg-nt-guide - The MRTG 2.17.10 Windows Installation Guide

=head1 SYNOPSIS

Expand All @@ -24,7 +24,7 @@ http://www.activestate.com/store/activeperl/download/
=item *

The latest version of MRTG from http://oss.oetiker.ch/mrtg/pub. Look for
mrtg-2.17.9.zip or better. The archive also contains a precompiled copy of
mrtg-2.17.10.zip or better. The archive also contains a precompiled copy of
rateup.exe for Win32.


Expand All @@ -40,7 +40,7 @@ to a LOCAL machine.

=item First

Unzip MRTG to C:\mrtg-2.17.9 on the Windows machine of your choice.
Unzip MRTG to C:\mrtg-2.17.10 on the Windows machine of your choice.

=item Next

Expand All @@ -54,7 +54,7 @@ You can manually check this by going to [Control Panel]->[System]->[Environment]
=back

To see if everything is installed properly you can open a Command Shell
and go into F<c:\mrtg-2.17.9\bin>. Type:
and go into F<c:\mrtg-2.17.10\bin>. Type:

perl mrtg

Expand Down Expand Up @@ -89,7 +89,7 @@ Catalyst 5000) with Community string B<public>. We are interested in monitoring
traffic, and the CPU load. Let's begin.

The first thing we do in setting up MRTG is making a default config file.
Get to a cmd prompt and change to the F<c:\mrtg-2.17.9\bin> directory. Type the
Get to a cmd prompt and change to the F<c:\mrtg-2.17.10\bin> directory. Type the
following command:

perl cfgmaker [email protected] --global "WorkDir: c:\www\mrtg" --output mrtg.cfg
Expand Down Expand Up @@ -157,7 +157,7 @@ This section determines how the web page headers will look
#---------------------------------------------------------------

And that's a very basic MRTG config file. You can run this and see your
results by going into the F<c:\mrtg-2.17.9\bin> directory and typing:
results by going into the F<c:\mrtg-2.17.10\bin> directory and typing:

perl mrtg mrtg.cfg

Expand Down Expand Up @@ -186,7 +186,7 @@ Add the option

to your mrtg.cfg file and start it with:

start /Dc:\mrtg-2.17.9\bin wperl mrtg --logging=eventlog mrtg.cfg
start /Dc:\mrtg-2.17.10\bin wperl mrtg --logging=eventlog mrtg.cfg

If you use B<wperl> instead of B<perl>, no console window will show. MRTG is now
running in the background. If it runs into problems it will tell you so
Expand All @@ -197,7 +197,7 @@ can be found in the event log.
If you put a shortcut with

Target: wperl mrtg --logging=eventlog mrtg.cfg
Start in: c:\mrtg-2.17.9\bin
Start in: c:\mrtg-2.17.10\bin

into your start-up folder, MRTG will now start whenever you login to your NT
box.
Expand Down Expand Up @@ -246,7 +246,7 @@ Please complete the following steps before starting the installation:

=item *

Copy B<srvany.exe> and B<instsrv.exe> to c:\mrtg-2.17.9\bin\ (your MRTG bin directory).
Copy B<srvany.exe> and B<instsrv.exe> to c:\mrtg-2.17.10\bin\ (your MRTG bin directory).

=item *

Expand All @@ -257,8 +257,8 @@ following content into it:

[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\MRTG\Parameters]
"Application"="c:\\perl\\bin\\wperl.exe"
"AppParameters"="c:\\mrtg-2.17.9\\bin\\mrtg --logging=eventlog c:\\mrtg-2.17.9\\bin\\mrtg.cfg"
"AppDirectory"="c:\\mrtg-2.17.9\\bin\\"
"AppParameters"="c:\\mrtg-2.17.10\\bin\\mrtg --logging=eventlog c:\\mrtg-2.17.10\\bin\\mrtg.cfg"
"AppDirectory"="c:\\mrtg-2.17.10\\bin\\"

=back

Expand Down
2 changes: 1 addition & 1 deletion src/doc/mrtg-reference.pod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
=head1 NAME

mrtg-reference - MRTG 2.17.9 configuration reference
mrtg-reference - MRTG 2.17.10 configuration reference

=head1 OVERVIEW

Expand Down
8 changes: 4 additions & 4 deletions src/doc/mrtg-unix-guide.pod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
=head1 NAME

mrtg-unix-guide - The MRTG 2.17.9 Linux/Unix Installation Guide
mrtg-unix-guide - The MRTG 2.17.10 Linux/Unix Installation Guide

=head1 DESCRIPTION

Expand Down Expand Up @@ -160,8 +160,8 @@ For versions starting around 2.0.11, try:
Ok, now everything is ready for the mrtg compilation.

cd /usr/local/src
gunzip -c mrtg-2.17.9.tar.gz | tar xvf -
cd mrtg-2.17.9
gunzip -c mrtg-2.17.10.tar.gz | tar xvf -
cd mrtg-2.17.10

If all the libraries have been preinstalled on your system you can
configure mrtg by doing a simple:
Expand Down Expand Up @@ -274,7 +274,7 @@ documentation of your system to make sure you get this right.
A B<minimal> script to put into F<init.d> might look like this:

#! /bin/sh
cd /usr/local/mrtg-2.17.9/bin && ./mrtg --user=mrtg-user \
cd /usr/local/mrtg-2.17.10/bin && ./mrtg --user=mrtg-user \
/home/httpd/mrtg/mrtg.cfg --logging /var/log/mrtg.log


Expand Down
2 changes: 1 addition & 1 deletion src/doc/mrtglib.3
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "doc::mrtglib 3"
.TH doc::mrtglib 3 "2022-01-19" "2.17.9" "mrtg"
.TH doc::mrtglib 3 "2022-01-19" "2.17.10" "mrtg"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
Expand Down
2 changes: 1 addition & 1 deletion src/lib/mrtg2/MRTG_lib.pm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- mode: Perl -*-
package MRTG_lib;
###################################################################
# MRTG 2.17.9 Support library MRTG_lib.pm
# MRTG 2.17.10 Support library MRTG_lib.pm
###################################################################
# Created by Tobias Oetiker <[email protected]>
# and Dave Rand <[email protected]>
Expand Down
4 changes: 2 additions & 2 deletions src/src/rateup.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
MRTG 2.17.9 -- Rateup
MRTG 2.17.10 -- Rateup
*********************
Rateup is a fast add-on to the great MRTG Traffic monitor. It makes
Expand Down Expand Up @@ -84,7 +84,7 @@
#include <gd.h>
#include <gdfonts.h>

char *VERSION = "2.17.9";
char *VERSION = "2.17.10";
char *program, *router, *routerpath;
int histvalid;

Expand Down

0 comments on commit 0893fc3

Please sign in to comment.