diff options
author | martti <martti> | 2007-01-10 14:25:39 +0000 |
---|---|---|
committer | martti <martti> | 2007-01-10 14:25:39 +0000 |
commit | 4968b486cc68a964cf52c8d7364e0c8eac860c46 (patch) | |
tree | 6dd118e7be62e282388c05712449ee6edc17cd0c | |
parent | 50cc7b43262f36cc81ea9809d5386acd6e4d3dad (diff) | |
download | pkgsrc-4968b486cc68a964cf52c8d7364e0c8eac860c46.tar.gz |
Updated net/mrtg to 2.15.0
* Free positioning of a generated ifIndex in the OID string using
the magic IndexPOS keyword
* When doing threshold checking with rrdtool, there was a very expensive
'getting the data back with rrdinfo and rrdfetch' cycle after each
rrdupdate. with rrdtool 1.2 and the updatev function this is not
necessary anymore the new code speeds up mrtg cycle time by a factor of 3
to 10 depending on your platform.
* Threshold Un-Borken Messages will only be generated when the value is 10%
away from the threshold. Configurable via ThreshHyst
* New function thresholdmail lets you send an email when a threshold
is broken. This feature talks directly to the mailserver and does
not require any external programs.
* New template writers helper function in cfgmaker - oid_pick. It tests if a
device is willing to supply information regarding a particular oid. This
makes template writing much more plesant.
http://oss.oetiker.ch/mrtg-trac/browser/trunk/templates/cisco/host-cisco.tmpl
* added new tool mrtg-traffic-sum to build traffic stats based on the
content of your mrtg log (not rrd) files.
* mrtg running with rrdtool can now do sub-minute resolution if the interval
is specified like that: 0:30 ... note that you can not change the
resolution of an existing rrd file. So this will only have the desired
effect on new rrds. Also note that the graphing frontend may need changes
too to be able to deal with the new interval type. Internally interval is
now a float!
* new debug option 'prof' to see how long rrdtool spends on its writes ...
* fixed snmpv3 support in cfgmaker
-rw-r--r-- | net/mrtg/Makefile | 4 | ||||
-rw-r--r-- | net/mrtg/distinfo | 10 | ||||
-rw-r--r-- | net/mrtg/patches/patch-ad | 24 |
3 files changed, 25 insertions, 13 deletions
diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile index a4da4ca124a..33e73ee770f 100644 --- a/net/mrtg/Makefile +++ b/net/mrtg/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.76 2007/01/07 09:14:04 rillig Exp $ +# $NetBSD: Makefile,v 1.77 2007/01/10 14:25:39 martti Exp $ -DISTNAME= mrtg-2.14.7 +DISTNAME= mrtg-2.15.0 CATEGORIES= net MASTER_SITES= http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/ \ http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/old/ \ diff --git a/net/mrtg/distinfo b/net/mrtg/distinfo index d34c251fa4b..72396ca18b3 100644 --- a/net/mrtg/distinfo +++ b/net/mrtg/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.22 2006/10/19 06:40:54 martti Exp $ +$NetBSD: distinfo,v 1.23 2007/01/10 14:25:39 martti Exp $ -SHA1 (mrtg-2.14.7.tar.gz) = dd97dfb75dffe0c4abfabb26c73951641994ffc5 -RMD160 (mrtg-2.14.7.tar.gz) = e7c57aaef0160ef3a1144e2f9f9720c483192c65 -Size (mrtg-2.14.7.tar.gz) = 1061341 bytes +SHA1 (mrtg-2.15.0.tar.gz) = 0936bf8d62b5f9da542b0516c24d18a42d8adcde +RMD160 (mrtg-2.15.0.tar.gz) = 69905525f63082f701f9eeafd8471050f4db4f98 +Size (mrtg-2.15.0.tar.gz) = 1068297 bytes SHA1 (patch-ab) = bf367e6c43030a9cb64a88336b66932d7e05025c SHA1 (patch-ac) = e12f74ea083c1e3a7793afc35dcd698611823d81 -SHA1 (patch-ad) = 5d6cb2ea1c16dc53fab49e7dd166b6f246db40e1 +SHA1 (patch-ad) = f6d737bad01ffbfdeb40fe08361810881f0257d5 SHA1 (patch-ae) = b76543d57a4c630adec51f78c1d6005dffee6a3d diff --git a/net/mrtg/patches/patch-ad b/net/mrtg/patches/patch-ad index cdd15b0d5e9..3939b3b3f69 100644 --- a/net/mrtg/patches/patch-ad +++ b/net/mrtg/patches/patch-ad @@ -1,21 +1,33 @@ -$NetBSD: patch-ad,v 1.12 2006/10/19 06:40:54 martti Exp $ +$NetBSD: patch-ad,v 1.13 2007/01/10 14:25:40 martti Exp $ ---- bin/mrtg.orig 2006-09-06 13:42:50.000000000 +0000 -+++ bin/mrtg 2006-10-19 08:47:41.000000000 +0000 -@@ -828,4 +828,4 @@ +--- bin/mrtg.orig 2006-12-06 00:10:06.000000000 +0000 ++++ bin/mrtg 2007-01-10 16:00:01.000000000 +0000 +@@ -864,8 +864,8 @@ + + ((($MRTG_lib::OS eq 'NT' or $MRTG_lib::OS eq 'OS2') and (-e "${FindBin::Bin}${MRTG_lib::SL}rateup.exe")) or (($MRTG_lib::OS eq 'NW') and (-e "SYS:/Mrtg/bin/rateup.nlm")) or - (-x "${FindBin::Bin}${MRTG_lib::SL}rateup")) or - die "$NOW: ERROR: Can't Execute '${FindBin::Bin}${MRTG_lib::SL}rateup'\n"; + (-x "__PREFIX__/libexec/rateup")) or + die "$NOW: ERROR: Can't Execute '__PREFIX__/libexec/rateup'\n"; -@@ -841,3 +841,3 @@ + # rateup does not know about undef so we make inlast and outlast ready for rateup + #warn "$NOW: ERROR: inlast is undefined. Skipping $router\n" unless defined $inlast; +@@ -877,7 +877,7 @@ + $outlast = -1 unless defined $outlast; + if ($$rcfg{'options'}{'dorelpercent'}{$router}) { - @exec = ("${FindBin::Bin}${MRTG_lib::SL}rateup", + @exec = ("__PREFIX__/libexec/rateup", "$$cfg{'logdir'}$$rcfg{'directory'}{$router}","$router", -@@ -850,3 +850,3 @@ + $time, $$rcfg{'options'}{'unknaszero'}{$router} ? '-z':'-Z', + "$up_abs"."p", $inlast, $outlast, $absmax, +@@ -886,7 +886,7 @@ + $$rcfg{'rgb5'}{$router}); + } else { - @exec = ("${FindBin::Bin}${MRTG_lib::SL}rateup", + @exec = ("__PREFIX__/libexec/rateup", "$$cfg{'logdir'}$$rcfg{'directory'}{$router}","$router", + $time, $$rcfg{'options'}{'unknaszero'}{$router} ? '-z':'-Z', + "$up_abs", $inlast, $outlast, $absmax, |