From owner-svn-ports-all@freebsd.org Wed Feb 3 16:26:37 2016 Return-Path: Delivered-To: svn-ports-all@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 CDDE1A9A3A1; Wed, 3 Feb 2016 16:26:37 +0000 (UTC) (envelope-from feld@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 673AC25C; Wed, 3 Feb 2016 16:26:37 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u13GQaZU006664; Wed, 3 Feb 2016 16:26:36 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u13GQadP006659; Wed, 3 Feb 2016 16:26:36 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201602031626.u13GQadP006659@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Wed, 3 Feb 2016 16:26:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r407957 - 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-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Feb 2016 16:26:37 -0000 Author: feld Date: Wed Feb 3 16:26:35 2016 New Revision: 407957 URL: https://svnweb.freebsd.org/changeset/ports/407957 Log: net-mgmt/observium: Update to latest community release 0.16.1.7533 While here, hand over maintainership Modified: head/net-mgmt/observium/Makefile head/net-mgmt/observium/distinfo head/net-mgmt/observium/files/patch-includes_defaults.inc.php head/net-mgmt/observium/files/pkg-message.in head/net-mgmt/observium/pkg-plist Modified: head/net-mgmt/observium/Makefile ============================================================================== --- head/net-mgmt/observium/Makefile Wed Feb 3 15:54:30 2016 (r407956) +++ head/net-mgmt/observium/Makefile Wed Feb 3 16:26:35 2016 (r407957) @@ -2,14 +2,14 @@ # $FreeBSD$ PORTNAME= observium -PORTVERSION= 0.15.06.6430 +PORTVERSION= 0.16.1.7533 PORTREVISION= 0 CATEGORIES= net-mgmt MASTER_SITES= http://www.observium.org/ DISTNAME= ${PORTNAME}-community-latest DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} -MAINTAINER= feld@FreeBSD.org +MAINTAINER= dirkx@webweaving.org COMMENT= Autodiscovering PHP/MySQL/SNMP based network monitoring LICENSE= GPLv3 @@ -17,8 +17,7 @@ LICENSE= GPLv3 WRKSRC= ${WRKDIR}/${PORTNAME} USES= python shebangfix -SHEBANG_FILES= html/js/makemini.pl \ - mibs/process.pl \ +SHEBANG_FILES= mibs/process.pl \ scripts/agent-local/areca-hw \ scripts/agent-local/asterisk \ scripts/agent-local/bind \ @@ -27,28 +26,33 @@ SHEBANG_FILES= html/js/makemini.pl \ scripts/agent-local/exim-mailqueue.sh \ scripts/agent-local/hdarray \ scripts/agent-local/ipmitool-sensor \ + scripts/agent-local/kamailio \ scripts/agent-local/ksm \ + scripts/agent-local/lighttpd \ scripts/agent-local/lmsensors \ scripts/agent-local/postfix_mailgraph \ scripts/agent-local/postfix_qshape \ scripts/agent-local/postgresql.pl \ + scripts/agent-local/proxmox-qemu \ scripts/agent-local/sabnzbd-qstatus \ scripts/agent-local/temperature \ + scripts/agent-local/virt-what \ scripts/agent-local/vmwaretools \ scripts/agent-local/zimbra \ - scripts/cron-hourly.sh \ - scripts/cron-minute.sh \ - scripts/cron.sh \ + scripts/add_ds.pl \ scripts/get-geshi.sh \ scripts/get-jpgraph.sh \ - scripts/ifAlias scripts/rename-mibs.pl \ + scripts/ifAlias \ + scripts/ifAlias_persist \ scripts/makecss.sh \ scripts/observium_agent \ - scripts/removespikes.php scripts/rrdtoolx.py \ - scripts/removespikes.pl scripts/add_ds.pl \ + scripts/removespikes.php \ + scripts/removespikes.pl \ + scripts/rename-mibs.pl \ + scripts/rrdtoolx.py \ scripts/watchmaillog/watchmaillog.pl -USE_PHP= ctype filter gd json mcrypt mysql session snmp tokenizer xml +USE_PHP= ctype filter gd iconv json mcrypt mysql mysqli posix session snmp tokenizer xml zlib WANT_PHP_CLI= yes NO_BUILD= yes @@ -82,13 +86,13 @@ WMIC_RUN_DEPENDS= wmic:${PORTSDIR}/net-m .include SUB_FILES+= pkg-message -SUB_LIST+= PHP="${PHPBASE}/bin/php" +SUB_LIST+= PHP="${PHPBASE}/bin/php" PYTHON=${PHPBASE}/bin/python -ROOT_FILES= rename_device.php snmptrap.php .scrutinizer.yml add_device.php \ +ROOT_FILES= rename_device.php snmptrap.php add_device.php \ snmpd.conf.example check-errors.php config_to_json.php delete_device.php \ syslog.php irc.php snmp.conf.example adduser.php discovery.php \ check-services.php poller.php config.php.default poller-wrapper.py -ROOT_DIRS= html scripts includes update mibs +ROOT_DIRS= html scripts includes update mibs libs PORTDOCS= INSTALL README PORTEXAMPLES= snmp.conf.example snmpd.conf.example @@ -119,8 +123,8 @@ do-install: .for f in ${ROOT_FILES} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${WWWDIR} .endfor - # Create empty rrd dir writable by www - ${MKDIR} ${STAGEDIR}/${WWWDIR}/rrd + # Create empty rrd dir and logs writable by www (the apache user) + ${MKDIR} ${STAGEDIR}/${WWWDIR}/rrd ${STAGEDIR}/${WWWDIR}/logs # Files in scripts dir should be executable ${FIND} ${STAGEDIR}/${WWWDIR}/scripts -type f -exec ${CHMOD} +x {} \; # Ensure PHP and Python scripts are executable Modified: head/net-mgmt/observium/distinfo ============================================================================== --- head/net-mgmt/observium/distinfo Wed Feb 3 15:54:30 2016 (r407956) +++ head/net-mgmt/observium/distinfo Wed Feb 3 16:26:35 2016 (r407957) @@ -1,2 +1,2 @@ -SHA256 (observium-0.15.06.6430/observium-community-latest.tar.gz) = 60a8bbcba05c5b587856b8d2e9ec82507baa98affb82b17f297924a7eb62f560 -SIZE (observium-0.15.06.6430/observium-community-latest.tar.gz) = 41032260 +SHA256 (observium-0.16.1.7533/observium-community-latest.tar.gz) = 55f0feddf0595289c09304d0cf5a26625a057dfb314b22b9fe5726977d1c2b29 +SIZE (observium-0.16.1.7533/observium-community-latest.tar.gz) = 50107191 Modified: head/net-mgmt/observium/files/patch-includes_defaults.inc.php ============================================================================== --- head/net-mgmt/observium/files/patch-includes_defaults.inc.php Wed Feb 3 15:54:30 2016 (r407956) +++ head/net-mgmt/observium/files/patch-includes_defaults.inc.php Wed Feb 3 16:26:35 2016 (r407957) @@ -1,15 +1,15 @@ ---- includes/defaults.inc.php.orig 2014-11-21 12:33:07 UTC +--- includes/defaults.inc.php.orig 2016-01-27 16:07:55 UTC +++ includes/defaults.inc.php -@@ -17,7 +17,7 @@ error_reporting(E_ERROR); +@@ -36,7 +36,7 @@ $config['db']['debug'] = TRUE; // Default directories --$config['install_dir'] = "/opt/observium"; +-#$config['install_dir'] = "/opt/observium"; +$config['install_dir'] = "/usr/local/www/observium"; #$config['html_dir'] = $config['install_dir'] . "/html"; #$config['rrd_dir'] = $config['install_dir'] . "/rrd"; - #$config['log_file'] = $config['install_dir'] . "/observium.log"; -@@ -29,27 +29,27 @@ $config['install_dir'] = "/opt/observi + #$config['template_dir'] = $config['install_dir'] . "/templates"; +@@ -49,27 +49,27 @@ $config['db']['debug'] = TRUE; // Location of executables @@ -40,7 +40,7 @@ -$config['neato'] = "/usr/bin/neato"; -$config['sfdp'] = "/usr/bin/sfdp"; -$config['svn'] = "/usr/bin/svn"; --#$config['git'] = '/usr/bin/git'; // Not enabled by default, used in show device config feature for git-enabled repos +-$config['git'] = "/usr/bin/git"; // Used in show device config feature for git-enabled repos and rancid >= 3.2 -$config['wmic'] = "/bin/wmic"; +$config['mtr'] = "/usr/local/sbin/mtr"; +$config['nmap'] = "/usr/local/bin/nmap"; @@ -52,7 +52,7 @@ +$config['neato'] = "/usr/local/bin/neato"; +$config['sfdp'] = "/usr/local/bin/sfdp"; +$config['svn'] = "/usr/local/bin/svn"; -+#$config['git'] = "/usr/local/bin/git"; // Not enabled by default, used in show device config feature for git-enabled repos ++$config['git'] = "/usr/local/bin/git"; // Used in show device config feature for git-enabled repos and rancid >= 3.2 +$config['wmic'] = "/usr/local/bin/wmic"; $config['file'] = "/usr/bin/file"; Modified: head/net-mgmt/observium/files/pkg-message.in ============================================================================== --- head/net-mgmt/observium/files/pkg-message.in Wed Feb 3 15:54:30 2016 (r407956) +++ head/net-mgmt/observium/files/pkg-message.in Wed Feb 3 16:26:35 2016 (r407957) @@ -10,8 +10,64 @@ with the following notes: 33 */6 * * * www cd %%WWWDIR%% && %%PHP%% discovery.php -h all */5 * * * * www cd %%WWWDIR%% && %%PHP%% discovery.php -h new */5 * * * * www cd %%WWWDIR%% && %%PHP%% poller.php -h all +*/5 * * * * www cd %%WWWDIR%% && %%PYTHON%% poller-wrapper.py 2 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. + + LoadModule rewrite_module libexec/apache24/mod_rewrite.so + +MINIMAL baseline install. + +A minimal install can be created with the following steps and configuration file: + +0: make sure apache and mysql are up and running. + +1: create the database and a dbaccount with the following (my)SQL commands: + + CREATE DATABASE observium DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci; + GRANT ALL PRIVILEGES ON observium.* TO 'observium'@'localhost' IDENTIFIED BY 'notSecure'; + SET GLOBAL sql_mode = ''; + +2: create a minimal config file at: + + %%WWWDIR%%/config.php + + containing: + +