Index: head/net-mgmt/pnp/Makefile =================================================================== --- head/net-mgmt/pnp/Makefile (revision 436604) +++ head/net-mgmt/pnp/Makefile (revision 436605) @@ -1,106 +1,105 @@ # Created by: rea-fbsd@codelabs.ru # $FreeBSD$ PORTNAME= pnp PORTVERSION= 0.6.25 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-mgmt MASTER_SITES= SF/pnp4nagios/PNP-0.6 DISTNAME= pnp4nagios-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} MAINTAINER?= lme@FreeBSD.org COMMENT?= Nagios / Icinga performance data collector and grapher LICENSE= GPLv2 BUILD_DEPENDS= ${LOCALBASE}/bin/rrdtool:databases/rrdtool RUN_DEPENDS?= ${LOCALBASE}/bin/rrdtool:databases/rrdtool \ nagios:net-mgmt/nagios MAKE_JOBS_UNSAFE= yes -USES= perl5 dos2unix +USES= dos2unix perl5 php php:web OPTIONS_DEFINE= PDF OPTIONS_DEFAULT= PDF PDF_DESC= Use built-in fpdf library to produce PDF views .include USE_PHP= gd iconv json pcre session simplexml sockets xml zlib -WANT_PHP_WEB= yes USE_RC_SUBR= npcd DOS2UNIX_REGEX= '.*\.\(php\|js\|txt\)$$' NAGIOSDIR?= /var/spool/nagios NAGIOSHTMURL?= /nagios NAGIOSUSER?= nagios NAGIOSGROUP?= nagios PNP_STATE= ${NAGIOSDIR}/pnp PNP_RRDS= ${PNP_STATE}/rrd PNP_SPOOL= ${PNP_STATE}/perfspool PNP_URL?= ${NAGIOSHTMURL}/pnp FPDF_DIR?= share/fpdf PDF_EXTRA_PATCHES_OFF+= ${FILESDIR}/extra-patch-disable-pdf GNU_CONFIGURE= yes CONFIGURE_ARGS+= \ --sysconfdir=${ETCDIR} \ --datarootdir=${WWWDIR} \ --datadir=${WWWDIR} \ --localstatedir=/var/log \ --with-rrdtool=${LOCALBASE}/bin/rrdtool \ --with-perfdata-dir=${PNP_RRDS} \ --with-perfdata-spool-dir=${PNP_SPOOL} \ --with-nagios-user=${NAGIOSUSER} \ --with-nagios-group=${NAGIOSGROUP} # Get rid of INSTALL_OPTS that are set by configure -- # we want the things to be installed with root:wheel and # NAGIOSUSER:NAGIOSGROUP are going to the configuration files. MAKE_ARGS= INSTALL_OPTS= INSTALL_TARGET= install install-config PLIST_SUB+= NAGIOSDIR=${NAGIOSDIR} \ NAGIOSUSER=${NAGIOSUSER} \ NAGIOSGROUP=${NAGIOSGROUP} \ WWWOWN=${WWWOWN} \ WWWGRP=${WWWGRP} SUB_FILES= pkg-message SUB_LIST= PNP_RRDS=${PNP_RRDS} \ PNP_URL=${PNP_URL} \ NAGIOSUSER=${NAGIOSUSER} \ NAGIOSGROUP=${NAGIOSGROUP} SAMPLE_CONFIGS= lighttpd.pnp4nagios.conf nginx.pnp4nagios.conf httpd.conf .if ${PORT_OPTIONS:MPDF} PNP_USE_FPDF= 1 .else PNP_USE_FPDF= 0 .endif post-patch: @${REINPLACE_CMD} \ -e's|^\$$conf\['\''use_fpdf'\''\] = [[:digit:]];|$$conf['\''use_fpdf'\''] = ${PNP_USE_FPDF};|' \ -e's|^\$$conf\['\''nagios_base'\''\] = "/nagios/cgi-bin";|$$conf\['\''nagios_base'\''\] = "${NAGIOSHTMURL}/cgi-bin";|' \ -e's|/usr/local/check_mk/|/usr/local/share/check_mk/|g' \ -e's|/usr/local/nagios/var/rw/live|/${NAGIOSDIR}/rw/live|' \ "${WRKSRC}/sample-config/pnp/config.php.in" .for f in ${SAMPLE_CONFIGS} @${REINPLACE_CMD} -e 's|@BASE_URL@|${PNP_URL}|g' -e 's|@datarootdir@|${WWWDIR}|g' \ -e 's|/usr/local/nagios/etc|${PREFIX}/etc/${NAGIOSUSER}|' -e 's|Nagios|${NAGIOSUSER}|' \ "${WRKSRC}/sample-config/${f}.in" .endfor @${LN} -fs ../en_US/dwnld.html ${WRKSRC}/share/pnp/documents/de_DE/dwnld.html post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for f in ${SAMPLE_CONFIGS} ${INSTALL_DATA} ${WRKSRC}/sample-config/${f} ${STAGEDIR}${EXAMPLESDIR} .endfor ${INSTALL_MAN} ${WRKSRC}/man/npcd.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 .include Index: head/net-mgmt/pnp/files/patch-sample-config__Makefile.in =================================================================== --- head/net-mgmt/pnp/files/patch-sample-config__Makefile.in (revision 436604) +++ head/net-mgmt/pnp/files/patch-sample-config__Makefile.in (revision 436605) @@ -1,43 +1,43 @@ ---- sample-config/Makefile.in.orig 2015-01-03 14:09:06.000000000 +0100 -+++ sample-config/Makefile.in 2015-04-22 21:47:23.294933000 +0200 +--- sample-config/Makefile.in.orig 2015-01-03 13:09:06 UTC ++++ sample-config/Makefile.in @@ -40,35 +40,18 @@ install: $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/check_commands $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/pages $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/pnp4nagios_release $(DESTDIR)$(SYSCONFDIR) - $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/background.pdf $(DESTDIR)$(SYSCONFDIR) - $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/config.php $(DESTDIR)$(SYSCONFDIR)/config.php.$(PKG_VERSION); \ - $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/config.php $(DESTDIR)$(SYSCONFDIR); \ + $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/background.pdf $(DESTDIR)$(SYSCONFDIR)/background.pdf-sample + $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/config.php $(DESTDIR)$(SYSCONFDIR) install-config: $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR) $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/check_commands $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/pages - - $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/config.php $(DESTDIR)$(SYSCONFDIR)/config.php.$(PKG_VERSION); \ - $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/config.php $(DESTDIR)$(SYSCONFDIR); \ - - if [ ! -e $(DESTDIR)$(SYSCONFDIR)/config_local.php ] ;then \ - $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/config.php $(DESTDIR)$(SYSCONFDIR)/config_local.php; \ - fi - - if [ -e $(DESTDIR)$(SYSCONFDIR)/process_perfdata.cfg ] ;then \ - $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/process_perfdata.cfg-sample $(DESTDIR)$(SYSCONFDIR)/process_perfdata.cfg.$(PKG_VERSION); \ - else\ - $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/process_perfdata.cfg-sample $(DESTDIR)$(SYSCONFDIR)/process_perfdata.cfg; \ - fi - - if [ -e $(DESTDIR)$(SYSCONFDIR)/npcd.cfg ] ;then \ - $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/npcd.cfg-sample $(DESTDIR)$(SYSCONFDIR)/npcd.cfg.$(PKG_VERSION); \ - else\ - $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/npcd.cfg-sample $(DESTDIR)$(SYSCONFDIR)/npcd.cfg; \ - fi + $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/config.php $(DESTDIR)$(SYSCONFDIR)/config_local.php.sample + $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/process_perfdata.cfg-sample $(DESTDIR)$(SYSCONFDIR)/process_perfdata.cfg.sample + $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/npcd.cfg-sample $(DESTDIR)$(SYSCONFDIR)/npcd.cfg.sample $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/rra.cfg-sample $(DESTDIR)$(SYSCONFDIR) $(INSTALL) -m 644 $(INSTALL_OPTS) misccommands.cfg-sample $(DESTDIR)$(SYSCONFDIR) $(INSTALL) -m 644 $(INSTALL_OPTS) nagios.cfg-sample $(DESTDIR)$(SYSCONFDIR) Index: head/net-mgmt/pnp/files/patch-share_pnp_templates.dist_check__dns.php =================================================================== --- head/net-mgmt/pnp/files/patch-share_pnp_templates.dist_check__dns.php (nonexistent) +++ head/net-mgmt/pnp/files/patch-share_pnp_templates.dist_check__dns.php (revision 436605) @@ -0,0 +1,11 @@ +--- share/pnp/templates.dist/check_dns.php.orig 2017-03-21 13:39:01 UTC ++++ share/pnp/templates.dist/check_dns.php +@@ -4,7 +4,7 @@ + # Template for check_dns + # + +-$opt[1] = "--lower=$MIN[1] --vertical-label $UNIT[1] --title \"DNS Response Time\" "; ++$opt[1] = "--lower-limit=$MIN[1] --vertical-label $UNIT[1] --title \"DNS Response Time\" "; + + + $def[1] = "DEF:var1=$RRDFILE[1]:$DS[1]:AVERAGE " ; Property changes on: head/net-mgmt/pnp/files/patch-share_pnp_templates.dist_check__dns.php ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/pnp/files/patch-share_pnp_templates.dist_check__multi.php =================================================================== --- head/net-mgmt/pnp/files/patch-share_pnp_templates.dist_check__multi.php (nonexistent) +++ head/net-mgmt/pnp/files/patch-share_pnp_templates.dist_check__multi.php (revision 436605) @@ -0,0 +1,11 @@ +--- share/pnp/templates.dist/check_multi.php.orig 2017-03-21 13:39:07 UTC ++++ share/pnp/templates.dist/check_multi.php +@@ -4,7 +4,7 @@ + # Template for check_multi + # + +-$opt[1] = "--lower=$MIN[1] --vertical-label num --title \"Number of Checks\" "; ++$opt[1] = "--lower-limit=$MIN[1] --vertical-label num --title \"Number of Checks\" "; + $ds_name[1] = "Executed Plugins"; + + $def[1] = "DEF:var1=$RRDFILE[1]:$DS[1]:AVERAGE " ; Property changes on: head/net-mgmt/pnp/files/patch-share_pnp_templates.dist_check__multi.php ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/pnp/files/patch-share_pnp_templates.dist_check__ping__tick.php =================================================================== --- head/net-mgmt/pnp/files/patch-share_pnp_templates.dist_check__ping__tick.php (nonexistent) +++ head/net-mgmt/pnp/files/patch-share_pnp_templates.dist_check__ping__tick.php (revision 436605) @@ -0,0 +1,11 @@ +--- share/pnp/templates.dist/check_ping_tick.php.orig 2017-03-21 13:39:12 UTC ++++ share/pnp/templates.dist/check_ping_tick.php +@@ -6,7 +6,7 @@ + # RTA + # + $ds_name[1] = "Round Trip Times"; +-$opt[1] = "--lower=0 --vertical-label \"RTA\" --title \"Ping times\" "; ++$opt[1] = "--lower-limit=0 --vertical-label \"RTA\" --title \"Ping times\" "; + $opt[1] .= rrd::darkteint(); + $def[1] = rrd::def("var1", $RRDFILE[1], $DS[1], "AVERAGE") ; + $def[1] .= rrd::ticker("var1", $WARN[1], $CRIT[1]) ; Property changes on: head/net-mgmt/pnp/files/patch-share_pnp_templates.dist_check__ping__tick.php ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/pnp/files/patch-share_pnp_templates.dist_check__users.php =================================================================== --- head/net-mgmt/pnp/files/patch-share_pnp_templates.dist_check__users.php (nonexistent) +++ head/net-mgmt/pnp/files/patch-share_pnp_templates.dist_check__users.php (revision 436605) @@ -0,0 +1,11 @@ +--- share/pnp/templates.dist/check_users.php.orig 2017-03-21 13:39:19 UTC ++++ share/pnp/templates.dist/check_users.php +@@ -4,7 +4,7 @@ + # Template for check_users + # + +-$opt[1] = "--lower=$MIN[1] --vertical-label \"Users\" --title \"Users\" "; ++$opt[1] = "--lower-limit=$MIN[1] --vertical-label \"Users\" --title \"Users\" "; + + + $def[1] = "DEF:var1=$RRDFILE[1]:$DS[1]:MAX " ; Property changes on: head/net-mgmt/pnp/files/patch-share_pnp_templates.dist_check__users.php ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/pnp/files/patch-share_pnp_templates.dist_default.php =================================================================== --- head/net-mgmt/pnp/files/patch-share_pnp_templates.dist_default.php (nonexistent) +++ head/net-mgmt/pnp/files/patch-share_pnp_templates.dist_default.php (revision 436605) @@ -0,0 +1,22 @@ +--- share/pnp/templates.dist/default.php.orig 2017-03-21 13:39:25 UTC ++++ share/pnp/templates.dist/default.php +@@ -47,7 +47,7 @@ foreach ($this->DS as $KEY=>$VAL) { + $crit_min = $VAL['CRIT_MIN']; + } + if ( $VAL['MIN'] != "" && is_numeric($VAL['MIN']) ) { +- $lower = " --lower=" . $VAL['MIN']; ++ $lower = " --lower-limit=" . $VAL['MIN']; + $minimum = $VAL['MIN']; + } + if ( $VAL['MAX'] != "" && is_numeric($VAL['MAX']) ) { +@@ -55,8 +55,8 @@ foreach ($this->DS as $KEY=>$VAL) { + } + if ($VAL['UNIT'] == "%%") { + $vlabel = "%"; +- $upper = " --upper=101 "; +- $lower = " --lower=0 "; ++ $upper = " --upper-limit=101 "; ++ $lower = " --lower-limit=0 "; + } + else { + $vlabel = $VAL['UNIT']; Property changes on: head/net-mgmt/pnp/files/patch-share_pnp_templates.dist_default.php ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property