Date: Fri, 6 Aug 2010 10:51:43 GMT From: Ildar Hizbulin <hizel@vyborg.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/149358: [MANTAINER UPDATE] net-mgmt/nagiosgraph to 1.4.3 Message-ID: <201008061051.o76Aphxj021096@www.freebsd.org> Resent-Message-ID: <201008061100.o76B0AmH086742@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 149358
>Category: ports
>Synopsis: [MANTAINER UPDATE] net-mgmt/nagiosgraph to 1.4.3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Aug 06 11:00:10 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Ildar Hizbulin
>Release: 8.1-RELEASE
>Organization:
Ariadna-Link, ISP
>Environment:
FreeBSD o.vyborg.ru 8.1-RC2 FreeBSD 8.1-RC2 #2: Tue Jul 13 14:55:08 MSD 2010 root@server.vyborg.ru:/usr/obj/usr/src/sys/SERVER amd64
>Description:
1.4.3 TBD
* new configuration options (see nagiosgraph.conf for details):
stack
* added graph zooming. zooming happens in-place (no separate window).
drag to zoom. right-click to revert the graph.
* added mouseovers that display time under the cursor.
* optionally specify heartbeat, step, and resolution per host/service.
* clean up insert.pl in preparation for additional processing modes and
performance data sources.
* fix to javascript to display hosts and services when specified via CGI
even if they do not appear in the host and service menus.
* fixed bug in handling of backslashes in service and database names.
* added support for rrdtool STACK. stack can be specified using the 'stack'
directive and/or using the 'lineformat' directive. see nagiosgraph.conf
for details and examples.
>How-To-Repeat:
>Fix:
diff -ruN net-mgmt/nagiosgraph/Makefile hizel/nagiosgraph/Makefile
--- net-mgmt/nagiosgraph/Makefile 2010-05-02 16:11:04.000000000 +0400
+++ hizel/nagiosgraph/Makefile 2010-08-06 14:42:55.000000000 +0400
@@ -6,7 +6,7 @@
#
PORTNAME= nagiosgraph
-PORTVERSION= 1.4.2
+PORTVERSION= 1.4.3
CATEGORIES= net-mgmt
MASTER_SITES= SF
@@ -30,14 +30,14 @@
PLIST_SUB= NAGIOSWWWDIR=${NAGIOSWWWDIR} PORTNAME=${PORTNAME}
post-patch:
- ${REINPLACE_CMD} -e 's!%%PREFIX%%!${PREFIX}!' ${WRKSRC}/etc/nagiosgraph.conf
+ @${REINPLACE_CMD} -e 's!%%PREFIX%%!${PREFIX}!' ${WRKSRC}/etc/nagiosgraph.conf
.for i in ${CGIFILES}
- ${REINPLACE_CMD} -e 's!/usr/bin/perl!${PERL}!g' -e 's!/usr/local!${PREFIX}!g' \
+ @${REINPLACE_CMD} -e 's!/usr/bin/perl!${PERL}!g' -e 's!/usr/local!${PREFIX}!g' \
-e 's!/opt/nagiosgraph/etc!${PREFIX}/etc/nagios/nagiosgraph!g' ${WRKSRC}/cgi/$i
.endfor
.for i in ${LIBFILES}
- ${REINPLACE_CMD} -e 's!/usr/bin/perl!${PERL}!g' -e 's!/usr/local!${PREFIX}!g' \
+ @${REINPLACE_CMD} -e 's!/usr/bin/perl!${PERL}!g' -e 's!/usr/local!${PREFIX}!g' \
-e 's!/opt/nagiosgraph/etc!${PREFIX}/etc/nagios/nagiosgraph!g' ${WRKSRC}/lib/$i
.endfor
diff -ruN net-mgmt/nagiosgraph/distinfo hizel/nagiosgraph/distinfo
--- net-mgmt/nagiosgraph/distinfo 2010-05-02 16:11:04.000000000 +0400
+++ hizel/nagiosgraph/distinfo 2010-08-06 14:42:55.000000000 +0400
@@ -1,3 +1,3 @@
-MD5 (nagiosgraph-1.4.2.tar.gz) = 085c01c1f2534d050b21815af1986282
-SHA256 (nagiosgraph-1.4.2.tar.gz) = 798509946bbfc0d4f63fbf0d988dde4a40dcea9c5f935ee9c1ebd27158dff210
-SIZE (nagiosgraph-1.4.2.tar.gz) = 108561
+MD5 (nagiosgraph-1.4.3.tar.gz) = e00ac92d9d51a7605e08617d19b64080
+SHA256 (nagiosgraph-1.4.3.tar.gz) = f5c75abc782020d150c99417316dc838b640480be6b481cdd791b528954cd74f
+SIZE (nagiosgraph-1.4.3.tar.gz) = 113534
diff -ruN net-mgmt/nagiosgraph/files/patch-etc-nagiosgraph.conf.in hizel/nagiosgraph/files/patch-etc-nagiosgraph.conf.in
--- net-mgmt/nagiosgraph/files/patch-etc-nagiosgraph.conf.in 2010-05-02 16:11:05.000000000 +0400
+++ hizel/nagiosgraph/files/patch-etc-nagiosgraph.conf.in 2010-08-06 14:42:55.000000000 +0400
@@ -1,5 +1,5 @@
---- etc/nagiosgraph.conf.orig 2010-04-27 08:14:25.000000000 +0000
-+++ etc/nagiosgraph.conf 2010-04-27 08:18:16.000000000 +0000
+--- etc/nagiosgraph.conf.orig 2010-08-06 13:10:56.000000000 +0400
++++ etc/nagiosgraph.conf 2010-08-06 13:16:12.000000000 +0400
@@ -8,19 +8,19 @@
# Author: (c) 2010 Matthew Wall
@@ -15,7 +15,8 @@
+perflog = /var/spool/nagios/perfdata.log
# Directory to store rrd database files
- rrddir = /var/nagiosgraph/rrd
+-rrddir = /var/nagiosgraph/rrd
++rrddir = /var/spool/nagios/rrd
# File containing regular expressions to identify service and perf data
-mapfile = /etc/nagiosgraph/map
@@ -47,8 +48,7 @@
+#servdb = %%PREFIX%%/etc/nagios/nagiosgraph/servdb.conf
# Location of showgroup control file (required for showgroup.cgi)
--groupdb = /etc/nagiosgraph/groupdb.conf
-+groupdb = %%PREFIX%%/etc/nagios/nagiosgraph/groupdb.conf
+ groupdb = /etc/nagiosgraph/groupdb.conf
# File containing data sets that should be selected in queries (optional)
-#datasetdb = /etc/nagiosgraph/datasetdb.conf
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008061051.o76Aphxj021096>