From owner-svn-ports-head@freebsd.org Wed Apr 6 16:02:58 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 990E5B06567; Wed, 6 Apr 2016 16:02:58 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7098D1A3B; Wed, 6 Apr 2016 16:02:58 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u36G2vMi095851; Wed, 6 Apr 2016 16:02:57 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u36G2v1b095847; Wed, 6 Apr 2016 16:02:57 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201604061602.u36G2v1b095847@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Wed, 6 Apr 2016 16:02:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412630 - in head/net-mgmt/nagiosgraph: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Apr 2016 16:02:58 -0000 Author: pi Date: Wed Apr 6 16:02:57 2016 New Revision: 412630 URL: https://svnweb.freebsd.org/changeset/ports/412630 Log: net-mgmt/nagiosgraph: 1.4.4 -> 1.5.2 Changes: - Added ART20 LICENSE - ensure that insert.pl works with nagios embedded perl - use embedded images for show/hide toggle buttons (thanks to matt perry) - ensure graph controls float above other elements - zoom when zoom rectangle drags to right or left - added hourly interval - generate text and html readme files from README.pod (thanks to matt perrry) - fix map rule for PROCS (thanks to matt perry) - increase variety of colors (thanks to matt perry) - improved controls layout (thanks to matt perry) - block right-click menu on graphs (thanks to matt perry) - fixed escaping of urls - isolate date/time formatting for graph mouseovers - include pid when logging to help isolate multi-core/multi-thread issues. - fixed debian6 packaging problems. - change authentication behavior when nagios default_user_name is defined. behavior is now aligned to that defined in nagios. - use more precise values for graph zoom bounds. - specify explicitly the default graph height. - strip leading and trailing whitespace from tuples (heartbeats, stepsizes, resolutions, steps, xffs, plotasLINE1, plotasLINE2, etc). - added fixedscale as a per host/service/database/source parameter. for backward compatibility it still works when specified as a cgi argument. note that it affects the vertical axis and the values in the legend. - handle # in database and data source names - ensure the directory containing perfdata log is writeable by nagios user. - added export.cgi to dump rrd data in csv or xml format. - automatically determine groups from the Nagios servicegroup definitions. - fixed heartbeats/stepsizes/resolutions bug. this time for real. really. - retain a copy of any modifications made to nagios.cfg and commands.cfg when removing rpm or deb packages. - fixed install.pl to work with icinga. - renamed upgrade.pl to flat2hier.pl - fixed install option typo for --check-prerequisites in install instructions. - encourage standalone installations rather than overlays unless installing from rpm or deb package. - encourage nagios pre-flight checks before restarting nagios. PR: 208483 Approved by: hizel@vyborg.ru (maintainer) Added: head/net-mgmt/nagiosgraph/files/patch-etc_nagiosgraph.conf - copied, changed from r412629, head/net-mgmt/nagiosgraph/files/patch-etc__nagiosgraph.conf.in Deleted: head/net-mgmt/nagiosgraph/files/patch-etc__nagiosgraph.conf.in Modified: head/net-mgmt/nagiosgraph/Makefile head/net-mgmt/nagiosgraph/distinfo head/net-mgmt/nagiosgraph/pkg-plist Modified: head/net-mgmt/nagiosgraph/Makefile ============================================================================== --- head/net-mgmt/nagiosgraph/Makefile Wed Apr 6 15:53:33 2016 (r412629) +++ head/net-mgmt/nagiosgraph/Makefile Wed Apr 6 16:02:57 2016 (r412630) @@ -2,14 +2,15 @@ # $FreeBSD$ PORTNAME= nagiosgraph -PORTVERSION= 1.4.4 -PORTREVISION= 2 +PORTVERSION= 1.5.2 CATEGORIES= net-mgmt MASTER_SITES= SF MAINTAINER= hizel@vyborg.ru COMMENT= Generate rrdtool graphs using performance data from nagios plugins +LICENSE= ART20 + RUN_DEPENDS= rrdtool>=0:databases/rrdtool OPTIONS_DEFINE= DOCS @@ -91,9 +92,7 @@ do-install: ${STAGEDIR}${PREFIX}/${NAGIOSWWWDIR}/images/action-nagiosgraph.gif @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} -.for i in utils/testentry.pl utils/upgrade.pl - ${INSTALL_SCRIPT} ${WRKSRC}/$i ${STAGEDIR}${EXAMPLESDIR}/ -.endfor + ${INSTALL_SCRIPT} ${WRKSRC}/utils/testentry.pl ${STAGEDIR}${EXAMPLESDIR}/ @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${DOCS} Modified: head/net-mgmt/nagiosgraph/distinfo ============================================================================== --- head/net-mgmt/nagiosgraph/distinfo Wed Apr 6 15:53:33 2016 (r412629) +++ head/net-mgmt/nagiosgraph/distinfo Wed Apr 6 16:02:57 2016 (r412630) @@ -1,2 +1,2 @@ -SHA256 (nagiosgraph-1.4.4.tar.gz) = e6c7091fbbf7dc44a5a3e8584d3f85dfbf20171dcb253c744ac15300cc9804a1 -SIZE (nagiosgraph-1.4.4.tar.gz) = 157955 +SHA256 (nagiosgraph-1.5.2.tar.gz) = c466193233a4affbd32f882d8cb475ef2d1e9bf091a21fbf3fccd1f825d7450e +SIZE (nagiosgraph-1.5.2.tar.gz) = 329978 Copied and modified: head/net-mgmt/nagiosgraph/files/patch-etc_nagiosgraph.conf (from r412629, head/net-mgmt/nagiosgraph/files/patch-etc__nagiosgraph.conf.in) ============================================================================== --- head/net-mgmt/nagiosgraph/files/patch-etc__nagiosgraph.conf.in Wed Apr 6 15:53:33 2016 (r412629, copy source) +++ head/net-mgmt/nagiosgraph/files/patch-etc_nagiosgraph.conf Wed Apr 6 16:02:57 2016 (r412630) @@ -1,5 +1,5 @@ ---- ./etc/nagiosgraph.conf.orig 2011-01-15 09:27:44.000000000 +0300 -+++ ./etc/nagiosgraph.conf 2011-02-03 16:08:34.000000000 +0300 +--- etc/nagiosgraph.conf.orig 2013-06-11 22:09:56 UTC ++++ etc/nagiosgraph.conf @@ -8,19 +8,19 @@ # Author: (c) 2010 Matthew Wall @@ -24,7 +24,7 @@ # Nagiosgraph CGI URL. nagiosgraphcgiurl = /nagiosgraph/cgi-bin -@@ -33,22 +33,22 @@ +@@ -33,27 +33,27 @@ nagiosgraphcgiurl = /nagiosgraph/cgi-bin javascript = /nagiosgraph/nagiosgraph.js # Stylesheet: URL to the nagiosgraph stylesheet. @@ -43,17 +43,22 @@ -#servdb = /etc/nagiosgraph/servdb.conf +#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 + # Groups can be enumerated explicitly in the groupdb file, gathered + # automatically from the service group definitions in the Nagios + # configuration, or a combination of both. + # Location of showgroup control file (optional) +-#groupdb = /etc/nagiosgraph/groupdb.conf ++#groupdb = %%PREFIX%%/etc/nagios/nagiosgraph/groupdb.conf + # Location of the Nagios configuration file (optional) + #groupcfgfile = /etc/nagios/nagios.cfg - # File containing data sets that should be selected in queries (optional) + # File containing sets of data sources to select in queries (optional) -#datasetdb = /etc/nagiosgraph/datasetdb.conf +#datasetdb = %%PREFIX%%/etc/nagios/nagiosgraph/datasetdb.conf # Access control configuration (optional) # The authorization method can be one of nagios3 or nagiosgraph. If no -@@ -61,12 +61,12 @@ +@@ -66,12 +66,12 @@ stylesheet = /nagiosgraph/nagiosgraph.cs # authorized_for_all_hosts, authorized_for_all_services, and default_user_name # variables to determine permissions. #authzmethod = nagios3 Modified: head/net-mgmt/nagiosgraph/pkg-plist ============================================================================== --- head/net-mgmt/nagiosgraph/pkg-plist Wed Apr 6 15:53:33 2016 (r412629) +++ head/net-mgmt/nagiosgraph/pkg-plist Wed Apr 6 16:02:57 2016 (r412630) @@ -18,7 +18,6 @@ libexec/%%PORTNAME%%/insert.pl %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testentry.pl -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/upgrade.pl %%NAGIOSWWWDIR%%/cgi-bin/%%PORTNAME%%/show.cgi %%NAGIOSWWWDIR%%/cgi-bin/%%PORTNAME%%/showconfig.cgi %%NAGIOSWWWDIR%%/cgi-bin/%%PORTNAME%%/showgraph.cgi