Index: net-mgmt/observium/Makefile =================================================================== --- net-mgmt/observium/Makefile +++ net-mgmt/observium/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= observium -PORTVERSION= 0.16.10.8128 -PORTREVISION= 5 +PORTVERSION= 0.17.9.8859 +PORTREVISION= 0 CATEGORIES= net-mgmt MASTER_SITES= http://www.observium.org/ DISTNAME= ${PORTNAME}-community-latest @@ -23,48 +23,13 @@ SHEBANG_FILES= \ mibs/process.pl \ poller-wrapper.py \ - scripts/add_ds_to_rrd.pl \ - scripts/add_ds.pl \ - scripts/agent-local/areca-hw \ - scripts/agent-local/asterisk \ - scripts/agent-local/bind \ - scripts/agent-local/crashplan \ - scripts/agent-local/edac \ - 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/lvs_stats \ - scripts/agent-local/memcached \ - scripts/agent-local/nginx \ - 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/get-geshi.sh \ - scripts/get-jpgraph.sh \ - scripts/glue.py \ - scripts/ifAlias \ - scripts/ifAlias_persist \ - scripts/logparser \ - scripts/makecss.sh \ - scripts/observium_agent \ - scripts/removespikes.php \ - scripts/removespikes.pl \ - scripts/rename-mibs.pl \ - scripts/rrdtoolx.py + poller.php \ + scripts/ USE_PHP= ctype filter gd iconv json mcrypt mysqli openssl posix session snmp tokenizer xml zlib IGNORE_WITH_PHP= 71 +NO_ARCH= yes NO_BUILD= yes RUN_DEPENDS+= rrdtool:databases/rrdtool \ Index: net-mgmt/observium/distinfo =================================================================== --- net-mgmt/observium/distinfo +++ net-mgmt/observium/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1477762625 -SHA256 (observium-0.16.10.8128/observium-community-latest.tar.gz) = 1f974c4c0d7329465ecdc4b30396710957121ecccd812d8c5250b492dd447877 -SIZE (observium-0.16.10.8128/observium-community-latest.tar.gz) = 61246341 +TIMESTAMP = 1512221867 +SHA256 (observium-0.17.9.8859/observium-community-latest.tar.gz) = dcf2f72b1a1389d523f44bba31bccf72598bb5014c2850f8f3f70a30f0cc05ac +SIZE (observium-0.17.9.8859/observium-community-latest.tar.gz) = 71030546 Index: net-mgmt/observium/files/patch-includes_defaults.inc.php =================================================================== --- net-mgmt/observium/files/patch-includes_defaults.inc.php +++ net-mgmt/observium/files/patch-includes_defaults.inc.php @@ -1,4 +1,4 @@ ---- includes/defaults.inc.php.orig 2016-01-27 16:07:55 UTC +--- includes/defaults.inc.php.orig 2017-09-07 22:26:04 UTC +++ includes/defaults.inc.php @@ -36,7 +36,7 @@ $config['db']['debug'] = TRUE; @@ -9,7 +9,7 @@ #$config['html_dir'] = $config['install_dir'] . "/html"; #$config['rrd_dir'] = $config['install_dir'] . "/rrd"; #$config['template_dir'] = $config['install_dir'] . "/templates"; -@@ -49,27 +49,27 @@ $config['db']['debug'] = TRUE; +@@ -50,29 +50,29 @@ $config['db']['debug'] = TRUE; // Location of executables @@ -32,7 +32,6 @@ $config['whois'] = "/usr/bin/whois"; -$config['mtr'] = "/usr/bin/mtr"; -$config['nmap'] = "/usr/bin/nmap"; --$config['nagios_plugins'] = "/usr/lib/nagios/plugins"; -$config['ipmitool'] = "/usr/bin/ipmitool"; -$config['virsh'] = "/usr/bin/virsh"; -$config['dot'] = "/usr/bin/dot"; @@ -44,7 +43,6 @@ -$config['wmic'] = "/bin/wmic"; +$config['mtr'] = "/usr/local/sbin/mtr"; +$config['nmap'] = "/usr/local/bin/nmap"; -+$config['nagios_plugins'] = "/usr/local/libexec/nagios"; +$config['ipmitool'] = "/usr/local/bin/ipmitool"; +$config['virsh'] = "/usr/local/bin/virsh"; +$config['dot'] = "/usr/local/bin/dot"; @@ -55,5 +53,9 @@ +$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"; - - // RRD Format Settings + $config['wc'] = "/usr/bin/wc"; +-$config['sudo'] = "/usr/bin/sudo"; ++$config['sudo'] = "/usr/local/bin/sudo"; + $config['tail'] = "/usr/bin/tail"; + $config['cut'] = "/usr/bin/cut"; + $config['tr'] = "/usr/bin/tr"; Index: net-mgmt/observium/files/patch-poller-wrapper.py =================================================================== --- net-mgmt/observium/files/patch-poller-wrapper.py +++ net-mgmt/observium/files/patch-poller-wrapper.py @@ -1,18 +1,11 @@ ---- poller-wrapper.py.orig 2016-12-05 00:19:29 UTC +--- poller-wrapper.py.orig 2017-12-02 14:04:45 UTC +++ poller-wrapper.py -@@ -45,6 +45,8 @@ except: - print("threading, sys, subprocess, time, os, json") +@@ -72,6 +72,8 @@ except: + print("threading, sys, subprocess, os, json") sys.exit(2) +os.environ['PATH'] += ':%%LOCALBASE%%/sbin:%%LOCALBASE%%/bin' + - # start time - s_time = time.time() - -@@ -608,4 +610,4 @@ db.close() - # Return exit code - sys.exit(exit_code) - --# EOF -\ No newline at end of file -+# EOF + """ + Register global exepthook for ability stop execute wrapper by Ctrl+C + See: https://stackoverflow.com/questions/6598053/python-global-exception-handling Index: net-mgmt/observium/files/patch-poller.php =================================================================== --- net-mgmt/observium/files/patch-poller.php +++ /dev/null @@ -1,8 +0,0 @@ ---- poller.php.orig 2015-05-27 15:48:33 UTC -+++ poller.php -@@ -1,4 +1,4 @@ --#!/usr/bin/env php -+#!%%LOCALBASE%%/bin/php -