From owner-svn-ports-head@freebsd.org Tue Feb 9 22:27:55 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 7C941AA32A1; Tue, 9 Feb 2016 22:27:55 +0000 (UTC) (envelope-from zeising@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 41DE4971; Tue, 9 Feb 2016 22:27:55 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u19MRsOH087788; Tue, 9 Feb 2016 22:27:54 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u19MRs4K087785; Tue, 9 Feb 2016 22:27:54 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <201602092227.u19MRs4K087785@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Tue, 9 Feb 2016 22:27:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408601 - in head/net-mgmt/observium: . 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.20 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: Tue, 09 Feb 2016 22:27:55 -0000 Author: zeising Date: Tue Feb 9 22:27:53 2016 New Revision: 408601 URL: https://svnweb.freebsd.org/changeset/ports/408601 Log: Fix when using rrdtool 1.5+ Pet portlint, add missing dependency. PR: 207057 Submitted by: Mathieu Arnold Approved by: maintainer Added: head/net-mgmt/observium/files/patch-html_includes_graphs_generic__multi__bits__separated.inc.php (contents, props changed) Modified: head/net-mgmt/observium/Makefile head/net-mgmt/observium/files/pkg-message.in Modified: head/net-mgmt/observium/Makefile ============================================================================== --- head/net-mgmt/observium/Makefile Tue Feb 9 22:05:19 2016 (r408600) +++ head/net-mgmt/observium/Makefile Tue Feb 9 22:27:53 2016 (r408601) @@ -3,7 +3,7 @@ PORTNAME= observium PORTVERSION= 0.16.1.7533 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= http://www.observium.org/ DISTNAME= ${PORTNAME}-community-latest @@ -63,7 +63,9 @@ RUN_DEPENDS+= rrdtool:${PORTSDIR}/databa mtr:${PORTSDIR}/net/mtr-nox11 \ ${LOCALBASE}/share/pear/Net/IPv4.php:${PORTSDIR}/net/pear-Net_IPv4 \ ${LOCALBASE}/share/pear/Net/IPv6.php:${PORTSDIR}/net/pear-Net_IPv6 \ - snmpget:${PORTSDIR}/net-mgmt/net-snmp + snmpget:${PORTSDIR}/net-mgmt/net-snmp \ + sudo:${PORTSDIR}/security/sudo +LIB_DEPENDS+= libpng.so:${PORTSDIR}/graphics/png OPTIONS_DEFINE= APACHEMOD FPING IPMITOOL LIBVIRT MYSQLD NAGPLUGINS NMAP PYPOLLER SVN WMIC OPTIONS_DEFAULT= APACHEMOD FPING IPMITOOL LIBVIRT NAGPLUGINS NMAP PYPOLLER SVN WMIC Added: head/net-mgmt/observium/files/patch-html_includes_graphs_generic__multi__bits__separated.inc.php ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/observium/files/patch-html_includes_graphs_generic__multi__bits__separated.inc.php Tue Feb 9 22:27:53 2016 (r408601) @@ -0,0 +1,27 @@ +--- html/includes/graphs/generic_multi_bits_separated.inc.php.orig 2016-01-15 08:37:56 UTC ++++ html/includes/graphs/generic_multi_bits_separated.inc.php +@@ -76,13 +76,13 @@ foreach ($rrd_list as $rrd) + $rrd_options .= " VDEF:totout".$i."=outB".$i.",TOTAL"; + $rrd_options .= " VDEF:tot".$i."=octets".$i.",TOTAL"; + +- if ($i) { $stack="STACK"; } ++ if ($i) { $stack=":STACK"; } + + if ($vars['line_graph']) + { + $rrd_options .= " LINE1.25:inB".$i."#" . $colour_in . ":'" . $descr . "'"; + } else { +- $rrd_options .= " AREA:inB".$i."#" . $colour_in . ":'" . $descr . "':$stack"; ++ $rrd_options .= " AREA:inB".$i."#" . $colour_in . ":'" . $descr . "'$stack"; + } + $rrd_options .= " GPRINT:inB".$i.":LAST:%6.2lf%s$units"; + $rrd_options .= " GPRINT:inB".$i.":AVERAGE:%6.2lf%s$units"; +@@ -97,7 +97,7 @@ foreach ($rrd_list as $rrd) + $rrd_options .= " 'LINE1.25:outB".$i."_neg#" . $colour_out . ":" . $descr_out . "'"; + } else { + $rrd_options .= " 'HRULE:0#" . $colour_out.":".$descr_out."'"; +- $rrd_optionsb .= " 'AREA:outB".$i."_neg#" . $colour_out . "::$stack'"; ++ $rrd_optionsb .= " 'AREA:outB".$i."_neg#" . $colour_out . ":$stack'"; + } + $rrd_options .= " GPRINT:outB".$i.":LAST:%6.2lf%s$units"; + $rrd_options .= " GPRINT:outB".$i.":AVERAGE:%6.2lf%s$units"; Modified: head/net-mgmt/observium/files/pkg-message.in ============================================================================== --- head/net-mgmt/observium/files/pkg-message.in Tue Feb 9 22:05:19 2016 (r408600) +++ head/net-mgmt/observium/files/pkg-message.in Tue Feb 9 22:27:53 2016 (r408601) @@ -4,7 +4,6 @@ http://observium.org/wiki/Installation with the following notes: - Installation directory is %%WWWDIR%% -- $config['fping'] should be set to '%%LOCALBASE%%/sbin/fping' - The following lines should be added to /etc/crontab: 33 */6 * * * www cd %%WWWDIR%% && %%PHP%% discovery.php -h all @@ -14,24 +13,16 @@ with the following notes: Notes: -- Setting $config['snmp']['internal'] to true is not recommended. The - php function snmp_set_quick_print() used by Observium leaves units like - kB in the value and Observium currently does not deal with that correctly. - - This line can be added to %%WWWDIR%%/config.php - - With newer MySQL databases you may need to disable strict mode for Observium to function: SET GLOBAL sql_mode = ''; -- Apache needs mod_rewrite enable; uncomment the line below in httpd.conf as needed. +- Apache needs mod_rewrite enabled; uncomment the line below in httpd.conf as needed. LoadModule rewrite_module libexec/apache24/mod_rewrite.so -MINIMAL baseline install. - -A minimal install can be created with the following steps and configuration file: +- A minimal install can be created with the following steps and configuration file: 0: make sure apache and mysql are up and running. @@ -53,8 +44,6 @@ $config['db_user'] = 'observium'; $config['db_pass'] = 'notSecure'; $config['db_name'] = 'observium'; -$config['snmp']['internal'] = TRUE; - 3: populate the admin user and initialize the database (as 'www' user): sudo -u www %%WWWDIR%%/discovery.php -u