Index: head/net-mgmt/Makefile =================================================================== --- head/net-mgmt/Makefile (revision 364419) +++ head/net-mgmt/Makefile (revision 364420) @@ -1,358 +1,359 @@ # $FreeBSD$ # COMMENT = Network management tools SUBDIR += 2ping SUBDIR += TkTopNetFlows SUBDIR += aggregate SUBDIR += aircrack-ng SUBDIR += angst SUBDIR += ap-utils SUBDIR += argus-monitor SUBDIR += argus3 SUBDIR += argus3-clients SUBDIR += arpalert SUBDIR += arpscan SUBDIR += arpwatch SUBDIR += arts++ SUBDIR += aspathtree SUBDIR += bandwidthd SUBDIR += bgpq SUBDIR += bgpq3 SUBDIR += bigsister SUBDIR += bpft SUBDIR += braa SUBDIR += bsnmp-jails SUBDIR += bsnmp-regex SUBDIR += bsnmp-ucd SUBDIR += bsnmptools SUBDIR += bwm-ng SUBDIR += cacti SUBDIR += cacti-spine SUBDIR += cdpd SUBDIR += cdpr SUBDIR += centreon-clib SUBDIR += cflowd SUBDIR += check_logfiles SUBDIR += check_multi SUBDIR += check_mysql_health SUBDIR += check_snmp_pkgvuln SUBDIR += chillispot SUBDIR += choparp SUBDIR += cidr SUBDIR += circe SUBDIR += cisco_conf SUBDIR += ciscoconf SUBDIR += clog SUBDIR += cnagios SUBDIR += collectd SUBDIR += collectd5 SUBDIR += confregdecode SUBDIR += coovachilli SUBDIR += cowpatty SUBDIR += cricket SUBDIR += darkstat SUBDIR += devmon SUBDIR += devmon-templates SUBDIR += dhcdrop SUBDIR += disco SUBDIR += docsis SUBDIR += driftnet SUBDIR += ehnt SUBDIR += etherape SUBDIR += ettercap SUBDIR += ezradius SUBDIR += fetchconfig SUBDIR += flow-extract SUBDIR += flow-tools SUBDIR += flow-tools-ng SUBDIR += flowd SUBDIR += flowviewer SUBDIR += fprobe SUBDIR += fruity SUBDIR += glpi-plugins-fusioninventory-server SUBDIR += glpi-plugins-tracker-agent SUBDIR += glpi-plugins-tracker-server SUBDIR += gps SUBDIR += grepcidr SUBDIR += grepip SUBDIR += gsnmp SUBDIR += guifi-snpservices SUBDIR += hastmon SUBDIR += hawk SUBDIR += horde3-nic SUBDIR += icinga SUBDIR += icinga2 SUBDIR += icli SUBDIR += icmpmonitor SUBDIR += icmpquery SUBDIR += ifgraph SUBDIR += iftop SUBDIR += iog SUBDIR += ipacco SUBDIR += ipacctd SUBDIR += ipaudit SUBDIR += ipcad SUBDIR += ipcalc SUBDIR += ipfm SUBDIR += ipplan SUBDIR += ipv6calc SUBDIR += ipv6gen SUBDIR += ipv6mon SUBDIR += irrtoolset SUBDIR += isic SUBDIR += jnettop SUBDIR += kismet SUBDIR += lanmap SUBDIR += libsmi SUBDIR += macroscope SUBDIR += mbrowse SUBDIR += mk-livestatus SUBDIR += monitoring-plugins SUBDIR += mrtg SUBDIR += mrtg-ping-probe SUBDIR += mtrace SUBDIR += nagcon SUBDIR += nagios SUBDIR += nagios-certexp-plugin SUBDIR += nagios-check_bacula SUBDIR += nagios-check_bacula5 SUBDIR += nagios-check_clamav SUBDIR += nagios-check_cpu_usage SUBDIR += nagios-check_email_delivery SUBDIR += nagios-check_hdd_health SUBDIR += nagios-check_hp_bladechassis SUBDIR += nagios-check_kumofs SUBDIR += nagios-check_memcached_paranoid SUBDIR += nagios-check_mysql_slave SUBDIR += nagios-check_netsnmp SUBDIR += nagios-check_ports SUBDIR += nagios-check_postgres SUBDIR += nagios-check_relayd_status SUBDIR += nagios-check_puppet SUBDIR += nagios-check_smartmon SUBDIR += nagios-check_tftp SUBDIR += nagios-pf-plugin SUBDIR += nagios-geom SUBDIR += nagios-openldap-plugins SUBDIR += nagios-plugins SUBDIR += nagios-portaudit SUBDIR += nagios-silfreed-plugins SUBDIR += nagios-snmp-plugins SUBDIR += nagios-snmp-plugins-extras SUBDIR += nagios-spamd-plugin SUBDIR += nagios4 SUBDIR += nagiosagent SUBDIR += nagiosgraph SUBDIR += nagiosql SUBDIR += nagiostat SUBDIR += nagircbot SUBDIR += nagstamon SUBDIR += nagtail SUBDIR += nagvis SUBDIR += nat SUBDIR += nbtscan SUBDIR += ndoutils SUBDIR += ndpmon SUBDIR += nedi SUBDIR += nefu SUBDIR += net-snmp SUBDIR += netams SUBDIR += netams-front SUBDIR += netdisco SUBDIR += netdisco-mibs SUBDIR += netdot SUBDIR += netleak SUBDIR += netmagis-common SUBDIR += netmagis-database SUBDIR += netmagis-detecteq SUBDIR += netmagis-metro SUBDIR += netmagis-servers SUBDIR += netmagis-topo SUBDIR += netmagis-utils SUBDIR += netmagis-www SUBDIR += netmask SUBDIR += netmond SUBDIR += netspoc SUBDIR += netustad SUBDIR += netwag SUBDIR += netwox SUBDIR += netxms SUBDIR += nfdump SUBDIR += nfsen SUBDIR += ng_ipacct SUBDIR += nitpicker SUBDIR += nocol SUBDIR += nrpe SUBDIR += nrpe-ssl SUBDIR += nsca SUBDIR += nsca-client SUBDIR += nsca27 SUBDIR += nsca27-client SUBDIR += nstreams SUBDIR += observium SUBDIR += ocsinventory-agent SUBDIR += ocsinventory-ng SUBDIR += omping SUBDIR += openlldp SUBDIR += openvmps SUBDIR += ourmon SUBDIR += p0f SUBDIR += p0f2 SUBDIR += p5-AnyEvent-SNMP SUBDIR += p5-BigIP-iControl SUBDIR += p5-Cflow SUBDIR += p5-Cisco-Reconfig SUBDIR += p5-Data-Validate-IP SUBDIR += p5-FusionInventory-Agent SUBDIR += p5-FusionInventory-Agent-Task-NetDiscovery SUBDIR += p5-FusionInventory-Agent-Task-SNMPQuery SUBDIR += p5-GRNOC-Config SUBDIR += p5-GRNOC-TL1 SUBDIR += p5-MRTG-Parse SUBDIR += p5-Mon SUBDIR += p5-Monitoring-Plugin SUBDIR += p5-NSNMP SUBDIR += p5-Nagios-Object SUBDIR += p5-Nagios-Plugin SUBDIR += p5-Nagios-Plugin-Beanstalk SUBDIR += p5-Nagios-Plugin-LDAP SUBDIR += p5-Nagios-Plugins-Memcached SUBDIR += p5-Net-ACL SUBDIR += p5-Net-Abuse-Utils SUBDIR += p5-Net-Abuse-Utils-Spamhaus SUBDIR += p5-Net-CIDR SUBDIR += p5-Net-ILO SUBDIR += p5-Net-IP SUBDIR += p5-Net-IP-Match-Regexp SUBDIR += p5-Net-IP-Match-XS SUBDIR += p5-Net-IP-Resolver SUBDIR += p5-Net-IPAddress SUBDIR += p5-Net-IPv4Addr SUBDIR += p5-Net-IPv6Addr SUBDIR += p5-Net-NSCA-Client SUBDIR += p5-Net-Netmask SUBDIR += p5-Net-SNMP SUBDIR += p5-Net-SNMP-Util SUBDIR += p5-Net-SNMPTrapd SUBDIR += p5-Net-Telnet-Cisco-IOS SUBDIR += p5-NetAddr-IP SUBDIR += p5-NetAddr-IP-Lite SUBDIR += p5-NetApp SUBDIR += p5-POE-Component-SNMP SUBDIR += p5-SNMP-Info SUBDIR += p5-SNMP-MIB-Compiler SUBDIR += p5-SNMP-Simple SUBDIR += p5-SNMP-Trapinfo SUBDIR += p5-SNMP-Util SUBDIR += p5-SNMP_Session SUBDIR += p5-Telnet-Cisco SUBDIR += p5-Tie-NetAddr-IP SUBDIR += p5-Xymon SUBDIR += p5-Xymon-Client SUBDIR += p5-Xymon-Server SUBDIR += p5-Zenoss SUBDIR += p5-jmx4perl SUBDIR += packit SUBDIR += pads SUBDIR += pancho SUBDIR += pandorafms_agent SUBDIR += pandorafms_console SUBDIR += pandorafms_server SUBDIR += percona-monitoring-plugins SUBDIR += pftabled SUBDIR += php5-snmp SUBDIR += php53-snmp SUBDIR += php55-snmp SUBDIR += phpip SUBDIR += phpipam SUBDIR += phpweathermap SUBDIR += pixilate SUBDIR += pmacct SUBDIR += pnp SUBDIR += pnp-icinga SUBDIR += portmon SUBDIR += py-flowtools SUBDIR += py-ipcalc SUBDIR += py-ipy SUBDIR += py-pyang SUBDIR += py-snmp4 SUBDIR += py-snmp4-apps SUBDIR += py-snmp4-mibs SUBDIR += py-yapsnmp SUBDIR += qkismet SUBDIR += rackmonkey SUBDIR += ramond SUBDIR += rancid SUBDIR += rancid-devel SUBDIR += rate SUBDIR += rcpd SUBDIR += remarp SUBDIR += rotorouter SUBDIR += routers2 SUBDIR += routers2-extensions SUBDIR += routers2-extras SUBDIR += rrdbot SUBDIR += rubygem-blimpy SUBDIR += rubygem-snmp SUBDIR += rubygem-visage-app SUBDIR += satellite SUBDIR += sblim-wbemcli SUBDIR += scdp SUBDIR += scli SUBDIR += sdig SUBDIR += sendip SUBDIR += sing SUBDIR += sipcalc SUBDIR += sjitter SUBDIR += slate SUBDIR += smokeping SUBDIR += snmp++ SUBDIR += snmp4nagios SUBDIR += snmptt SUBDIR += softflowd SUBDIR += spectools SUBDIR += ssgless SUBDIR += statsd SUBDIR += subcalc SUBDIR += sx SUBDIR += sysmon SUBDIR += tcpreplay SUBDIR += tcptrack SUBDIR += torrus SUBDIR += unifi2 SUBDIR += unifi3 + SUBDIR += victorops-nagios SUBDIR += vidalia SUBDIR += virt-viewer SUBDIR += virtinst SUBDIR += wdiag SUBDIR += weathermap SUBDIR += weplab SUBDIR += whatmask SUBDIR += wide-dhcp SUBDIR += wifimgr SUBDIR += wmi-client SUBDIR += xymon-client SUBDIR += xymon-server SUBDIR += yabm SUBDIR += yaf SUBDIR += zabbix2-agent SUBDIR += zabbix2-frontend SUBDIR += zabbix2-proxy SUBDIR += zabbix2-server SUBDIR += zabbix22-agent SUBDIR += zabbix22-frontend SUBDIR += zabbix22-proxy SUBDIR += zabbix22-server SUBDIR += zenoss SUBDIR += zenpack-checkping SUBDIR += zenpack-dellmon SUBDIR += zenpack-deviceadvdetail SUBDIR += zenpack-devicesearch SUBDIR += zenpack-graphportlet SUBDIR += zenpack-interfacegraphs SUBDIR += zenpack-libvirt SUBDIR += zenpack-macreport .include Index: head/net-mgmt/victorops-nagios/Makefile =================================================================== --- head/net-mgmt/victorops-nagios/Makefile (nonexistent) +++ head/net-mgmt/victorops-nagios/Makefile (revision 364420) @@ -0,0 +1,49 @@ +# Created by: Douglas K. Rand +# $FreeBSD$ + +PORTNAME= victorops-nagios +PORTVERSION= 1.1.8 +CATEGORIES= net-mgmt +MASTER_SITES= http://software.victorops.com/ +DISTNAME= ${PORTNAME}_${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} + +MAINTAINER= rand@iteris.com +COMMENT= Nagios integration for VictorOps incident notification service + +NO_WRKSUBDIR= YES +NO_BUILD= YES + +RESTRICTED= Redistribution of software prohibited by VictorOps + +OPTIONS_DEFINE= QPAGE +OPTIONS_DEFAULT= +QPAGE_DESC= Integrate qpage for victorops server problems + +RUN_DEPENDS+= bash:${PORTSDIR}/shells/bash + +.include +.if ${PORT_OPTIONS:MQPAGE} +RUN_DEPENDS+= qpage:${PORTSDIR}/comms/qpage +EXTRA_PATCHES+= ${FILESDIR}/qpage-patch +.endif + +post-patch: + @${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} \ + -e '1s|#!/bin/bash|#!/usr/local/bin/bash|' + +do-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily + ${INSTALL_DATA} ${WRKSRC}/etc/cron.daily/victorops ${STAGEDIR}${PREFIX}/etc/periodic/daily/400.victorops + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/nagios +.for i in victorops victorops_email vo_test_svc vo_test_svc_cmd + ${INSTALL_DATA} ${WRKSRC}/opt/victorops/nagios_plugin/nagios_conf/${i}.cfg ${STAGEDIR}${PREFIX}/etc/nagios/${i}.cfg-sample +.endfor + ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/victorops +.for i in check_test_svc check_victorops_cmds check_victorops_forwarder \ + do_victorops_heartbeat enqueue_alert forward_alert_file forward_alerts \ + send_email_alert send_status stop_forwarder support_collect.sh \ + url_encode.sed utils + ${INSTALL_SCRIPT} ${WRKSRC}/opt/victorops/nagios_plugin/bin/${i} ${STAGEDIR}${PREFIX}/libexec/victorops/${i} +.endfor + +.include Property changes on: head/net-mgmt/victorops-nagios/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ 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/victorops-nagios/distinfo =================================================================== --- head/net-mgmt/victorops-nagios/distinfo (nonexistent) +++ head/net-mgmt/victorops-nagios/distinfo (revision 364420) @@ -0,0 +1,2 @@ +SHA256 (victorops-nagios_1.1.8.tar.gz) = 796e146552e27b45d0339c9c74883ba8048125887461f9e69a1e36cbd752e1a2 +SIZE (victorops-nagios_1.1.8.tar.gz) = 12838 Property changes on: head/net-mgmt/victorops-nagios/distinfo ___________________________________________________________________ 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/victorops-nagios/files/patch-check_victorops_cmds =================================================================== --- head/net-mgmt/victorops-nagios/files/patch-check_victorops_cmds (nonexistent) +++ head/net-mgmt/victorops-nagios/files/patch-check_victorops_cmds (revision 364420) @@ -0,0 +1,11 @@ +--- opt/victorops/nagios_plugin/bin/check_victorops_cmds.orig 2014-06-11 10:22:45.587219788 -0500 ++++ opt/victorops/nagios_plugin/bin/check_victorops_cmds 2014-06-11 12:37:39.711662512 -0500 +@@ -46,7 +46,7 @@ + TMP_FILE=$(mktemp) + + # Get the commands from VictorOps +- wget -T $TIMEOUT -t $TRIES --no-verbose -O $TMP_FILE "$URL" ++ $WGET -T $TIMEOUT -t $TRIES --no-verbose -O $TMP_FILE "$URL" + + # Check the result, and if OK, send them to the command file + grep $RESULT_OK $TMP_FILE Property changes on: head/net-mgmt/victorops-nagios/files/patch-check_victorops_cmds ___________________________________________________________________ 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/victorops-nagios/files/patch-check_victorops_forwarder =================================================================== --- head/net-mgmt/victorops-nagios/files/patch-check_victorops_forwarder (nonexistent) +++ head/net-mgmt/victorops-nagios/files/patch-check_victorops_forwarder (revision 364420) @@ -0,0 +1,32 @@ +--- opt/victorops/nagios_plugin/bin/check_victorops_forwarder.orig 2014-04-02 15:36:08.000000000 -0500 ++++ opt/victorops/nagios_plugin/bin/check_victorops_forwarder 2014-06-15 16:34:11.635114340 -0500 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/local/bin/bash + + if [ -x /usr/bin/dirname ]; then + . $(/usr/bin/dirname $0)/utils +@@ -10,7 +10,7 @@ + + verifyEnvironment + +-QUEUE=/var/nagios ++QUEUE=/var/spool/nagios/victorops/alerts + LOG=/var/log/victorops/forward_alerts.log + DEBUG_FILE=/dev/null + while getopts "l:q:" flag +@@ -27,7 +27,13 @@ + FORWARDER=$($DIRNAME $BASH_SOURCE)/forward_alerts + PID_FILE=/tmp/victorops_forward_alerts.pid + +-FORWARDER_COUNT=$($PS -eaf | $GREP -v grep | $GREP "$FORWARDER" | $WC -l 2>/dev/null) ++if [ ! -e $PID_FILE ]; then ++ PID=9999999999 ++else ++ PID=$($CAT $PID_FILE) ++fi ++ ++FORWARDER_COUNT=$($PS -ww -p $PID | $GREP "$FORWARDER" | $WC -l 2>/dev/null) + if (( $FORWARDER_COUNT == 0 )); then + echo "$($DATE) Starting $FORWARDER" >> "$LOG" + $FORWARDER "$QUEUE" >> "$LOG" 2>&1 & Property changes on: head/net-mgmt/victorops-nagios/files/patch-check_victorops_forwarder ___________________________________________________________________ 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/victorops-nagios/files/patch-do_victorops_heartbeat =================================================================== --- head/net-mgmt/victorops-nagios/files/patch-do_victorops_heartbeat (nonexistent) +++ head/net-mgmt/victorops-nagios/files/patch-do_victorops_heartbeat (revision 364420) @@ -0,0 +1,11 @@ +--- opt/victorops/nagios_plugin/bin/do_victorops_heartbeat.orig 2014-06-11 10:25:17.252208492 -0500 ++++ opt/victorops/nagios_plugin/bin/do_victorops_heartbeat 2014-06-11 10:29:51.392206330 -0500 +@@ -44,7 +44,7 @@ + fi + + # guess Distro +-DISTRO=$(/usr/bin/lsb_release -d 2>/dev/null | $SED 's/.*:[[:space:]]*//') ++DISTRO=$(/usr/bin/uname -or 2>/dev/null | $SED 's/.*:[[:space:]]*//') + if [ "$DISTRO" = "" ]; then + DISTRO=$($CAT /etc/*release | $HEAD -1) + fi Property changes on: head/net-mgmt/victorops-nagios/files/patch-do_victorops_heartbeat ___________________________________________________________________ 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/victorops-nagios/files/patch-enqueue_alert =================================================================== --- head/net-mgmt/victorops-nagios/files/patch-enqueue_alert (nonexistent) +++ head/net-mgmt/victorops-nagios/files/patch-enqueue_alert (revision 364420) @@ -0,0 +1,14 @@ +--- opt/victorops/nagios_plugin/bin/enqueue_alert.orig 2014-06-11 10:34:56.607169001 -0500 ++++ opt/victorops/nagios_plugin/bin/enqueue_alert 2014-06-11 10:35:58.757671279 -0500 +@@ -15,9 +15,9 @@ + # Get the queue dir from the alert info in the environment vars. + # If it's empty, use a default. + # The queue dir can also be given on the command line. +-QUEUE_DIR="$(getVal _CONTACTVO_QUEUE_DIR /var/nagios)" ++QUEUE_DIR="$(getVal _CONTACTVO_QUEUE_DIR /var/spool/nagios/victorops/alerts)" + if [ -z "$QUEUE_DIR" ]; then +- QUEUE_DIR=/var/nagios ++ QUEUE_DIR=/var/spool/nagios/victorops/alerts + fi + if [ ! -z "$1" ]; then + QUEUE_DIR=$1 Property changes on: head/net-mgmt/victorops-nagios/files/patch-enqueue_alert ___________________________________________________________________ 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/victorops-nagios/files/patch-forward_alerts =================================================================== --- head/net-mgmt/victorops-nagios/files/patch-forward_alerts (nonexistent) +++ head/net-mgmt/victorops-nagios/files/patch-forward_alerts (revision 364420) @@ -0,0 +1,11 @@ +--- opt/victorops/nagios_plugin/bin/forward_alerts.orig 2014-06-11 10:38:17.374154833 -0500 ++++ opt/victorops/nagios_plugin/bin/forward_alerts 2014-06-11 10:38:59.844409788 -0500 +@@ -18,7 +18,7 @@ + QUEUE_DIR=$1 + fi + if [ -z "$QUEUE_DIR" ]; then +- QUEUE_DIR=/var/nagios ++ QUEUE_DIR=/var/spool/nagios/victorops/alerts + fi + DONE_DIR=$QUEUE_DIR/forwarded + EMAILED_DIR=$QUEUE_DIR/emailed Property changes on: head/net-mgmt/victorops-nagios/files/patch-forward_alerts ___________________________________________________________________ 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/victorops-nagios/files/patch-support_collect.sh =================================================================== --- head/net-mgmt/victorops-nagios/files/patch-support_collect.sh (nonexistent) +++ head/net-mgmt/victorops-nagios/files/patch-support_collect.sh (revision 364420) @@ -0,0 +1,13 @@ +--- opt/victorops/nagios_plugin/bin/support_collect.sh.orig 2014-06-11 11:24:28.858964094 -0500 ++++ opt/victorops/nagios_plugin/bin/support_collect.sh 2014-06-11 11:25:03.784958472 -0500 +@@ -11,8 +11,8 @@ + TARBALL=$($DATE +%Y%m%d-%H%M)-victorops.tgz + SUPPORT=support@victorops.com + +-echo $TAR -cz -f $TARBALL /var/log/victorops /var/nagios +-$TAR -cz -f $TARBALL /var/log/victorops /var/nagios ++echo $TAR -cz -f $TARBALL /var/log/victorops /var/spool/nagios/victorops/alerts ++$TAR -cz -f $TARBALL /var/log/victorops /var/spool/nagios/victorops/alerts + + if [ -e "$MUTT" ]; then + echo Property changes on: head/net-mgmt/victorops-nagios/files/patch-support_collect.sh ___________________________________________________________________ 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/victorops-nagios/files/patch-utils =================================================================== --- head/net-mgmt/victorops-nagios/files/patch-utils (nonexistent) +++ head/net-mgmt/victorops-nagios/files/patch-utils (revision 364420) @@ -0,0 +1,21 @@ +--- opt/victorops/nagios_plugin/bin/utils.orig 2014-06-11 11:25:07.834962605 -0500 ++++ opt/victorops/nagios_plugin/bin/utils 2014-06-11 11:26:48.367951852 -0500 +@@ -46,7 +46,8 @@ + function findStatusFile { + local f="$1" + if [ -z "$f" ]; then +- echo "STATUSDATAFILE is empty" >> $DEBUG_FILE ++ echo "STATUSDATAFILE($f) is empty" >> $DEBUG_FILE ++ echo "Looking for STATUS file in $2" >> $DEBUG_FILE + f=$($GREP "^status_file=" $2 | $SED 's/.*=//') + fi + if [ -z "$f" ]; then +@@ -82,6 +83,8 @@ + APP=/bin/$1 + elif [ -x /usr/bin/$1 ]; then + APP=/usr/bin/$1 ++ elif [ -x /usr/local/bin/$1 ]; then ++ APP=/usr/local/bin/$1 + else + APP=$1 + fi Property changes on: head/net-mgmt/victorops-nagios/files/patch-utils ___________________________________________________________________ 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/victorops-nagios/files/patch-victorops.cron =================================================================== --- head/net-mgmt/victorops-nagios/files/patch-victorops.cron (nonexistent) +++ head/net-mgmt/victorops-nagios/files/patch-victorops.cron (revision 364420) @@ -0,0 +1,10 @@ +--- etc/cron.daily/victorops.orig 2014-06-11 12:49:42.035618811 -0500 ++++ etc/cron.daily/victorops 2014-06-11 12:50:57.241605821 -0500 +@@ -1,5 +1,5 @@ + #!/bin/sh + + # Clean up old alerts +-/usr/bin/find /var/nagios/emailed/ -mtime +7 -type f -delete +-/usr/bin/find /var/nagios/forwarded/ -mtime +7 -type f -delete ++/usr/bin/find /var/spool/nagios/victorops/alerts/emailed/ -mtime +7 -type f -delete ++/usr/bin/find /var/spool/nagios/victorops/alerts/forwarded/ -mtime +7 -type f -delete Property changes on: head/net-mgmt/victorops-nagios/files/patch-victorops.cron ___________________________________________________________________ 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/victorops-nagios/files/qpage-patch =================================================================== --- head/net-mgmt/victorops-nagios/files/qpage-patch (nonexistent) +++ head/net-mgmt/victorops-nagios/files/qpage-patch (revision 364420) @@ -0,0 +1,38 @@ +--- opt/victorops/nagios_plugin/bin/send_email_alert.orig 2014-06-11 10:39:13.918151547 -0500 ++++ opt/victorops/nagios_plugin/bin/send_email_alert 2014-06-11 11:20:43.930977406 -0500 +@@ -31,6 +31,7 @@ + # Build the contact email list + ORG_SLUG="$(getVal _CONTACTVO_ORGANIZATION_ID unkonwn_org)" + CONTACTEMAIL="$(getVal _CONTACTVO_CONTACTEMAIL)" ++CONTACTPAGER="$(getVal CONTACTPAGER)" + VO_CONTACT="failsafe+$ORG_SLUG@victorops.net" + WGET_LOG=/tmp/victorops_forward_wget.out + STDERR_LOG=/tmp/victorops_forward_wget.err +@@ -42,10 +43,16 @@ + if [ "$CONTACTEMAIL" != "" ]; then + $PRINTF "%b" "***** Alert *****\n\nNotification Type: $(getVal NOTIFICATIONTYPE)\n\nService: $(getVal SERVICEDESC)\nHost: $(getVal HOSTALIAS)\nAddress: $(getVal HOSTADDRESS)\nState: $(getVal SERVICESTATE)\n\nDate/Time: $(getVal LONGDATETIME)\n\nAdditional Info:\n\n$(getVal SERVICEOUTPUT)\n\n" | $MAIL -s "** $(getVal NOTIFICATIONTYPE) Service Alert: $(getVal HOSTALIAS)/$(getVal SERVICEDESC) is $(getVal SERVICESTATE) **" $CONTACTEMAIL + fi ++ if [ "$CONTACTPAGER" != "" ]; then ++ $PRINTF "%b" "$(getVal SERVICEDESC) $(getVal NOTIFICATIONTYPE) for $(getVal HOSTNAME) is $(getVal SERVICESTATE) at $(getVal TIME) $(getVal SERVICEOUTPUT)" | $QPAGE -f icinga $CONTACTPAGER ++ fi + else + if [ "$CONTACTEMAIL" != "" ]; then + $PRINTF "%b" "***** Alert *****\n\nNotification Type: $(getVal NOTIFICATIONTYPE)\nHost: $(getVal HOSTNAME)\nState: $(getVal HOSTSTATE)\nAddress: $(getVal HOSTADDRESS)\nInfo: $(getVal HOSTOUTPUT)\n\nDate/Time: $(getVal LONGDATETIME)\n" | $MAIL -s "** $(getVal NOTIFICATIONTYPE) Host Alert: $(getVal HOSTNAME) is $(getVal HOSTSTATE) **" $CONTACTEMAIL + fi ++ if [ "$CONTACTPAGER" != "" ]; then ++ $PRINTF "%b" "$(getVal HOSTNAME) is $(getVal HOSTSTATE) at $(getVal TIME) -- $(getVal HOSTOUTPUT)" | $QPAGE -f icinga $CONTACTPAGER ++ fi + fi + # *** + # *** Make sure the mail command is the last thing in this file so the including file can check the exit code +--- opt/victorops/nagios_plugin/bin/utils.orig 2014-06-16 20:12:16.713013963 -0500 ++++ opt/victorops/nagios_plugin/bin/utils 2014-06-16 20:12:58.533005832 -0500 +@@ -110,6 +110,7 @@ + MV=$(findApp mv) + PRINTF=$(findApp printf) + PS=$(findApp ps) ++QPAGE=$(findApp qpage) + SED=$(findApp sed) + SLEEP=$(findApp sleep) + TAR=$(findApp tar) + Property changes on: head/net-mgmt/victorops-nagios/files/qpage-patch ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +ON \ 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/victorops-nagios/pkg-descr =================================================================== --- head/net-mgmt/victorops-nagios/pkg-descr (nonexistent) +++ head/net-mgmt/victorops-nagios/pkg-descr (revision 364420) @@ -0,0 +1,4 @@ +VictorOps is an on-call management and incident notification service. +This is the Nagios/Icinga integration package for VictorOps. + +WWW: http://www.victorops.com Property changes on: head/net-mgmt/victorops-nagios/pkg-descr ___________________________________________________________________ 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/victorops-nagios/pkg-message =================================================================== --- head/net-mgmt/victorops-nagios/pkg-message (nonexistent) +++ head/net-mgmt/victorops-nagios/pkg-message (revision 364420) @@ -0,0 +1,11 @@ +======================================================================== + +victorops-nagios requires that ca_root_nss be built with the option + + ETCSYMLINK Add symlink to /etc/ssl/cert.pem + +enabled. With out that option, wget will complain that VictorOps' +GoDaddy SSL certificate is a self-signed certificate, which will +prevent VictorOps from working. + +======================================================================== Property changes on: head/net-mgmt/victorops-nagios/pkg-message ___________________________________________________________________ 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/victorops-nagios/pkg-plist =================================================================== --- head/net-mgmt/victorops-nagios/pkg-plist (nonexistent) +++ head/net-mgmt/victorops-nagios/pkg-plist (revision 364420) @@ -0,0 +1,22 @@ +etc/nagios/victorops.cfg-sample +etc/nagios/victorops_email.cfg-sample +etc/nagios/vo_test_svc.cfg-sample +etc/nagios/vo_test_svc_cmd.cfg-sample +etc/periodic/daily/400.victorops +libexec/victorops/check_test_svc +libexec/victorops/check_victorops_cmds +libexec/victorops/check_victorops_forwarder +libexec/victorops/do_victorops_heartbeat +libexec/victorops/enqueue_alert +libexec/victorops/forward_alert_file +libexec/victorops/forward_alerts +libexec/victorops/send_email_alert +libexec/victorops/send_status +libexec/victorops/stop_forwarder +libexec/victorops/support_collect.sh +libexec/victorops/url_encode.sed +libexec/victorops/utils +@dirrmtry etc/nagios +@dirrmtry libexec/victorops +@dirrmtry etc/periodic/daily +@dirrmtry etc/periodic Property changes on: head/net-mgmt/victorops-nagios/pkg-plist ___________________________________________________________________ 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