Attachment 157863 Details for Bug 200955 – patch

[patch] patch

victorops-nagios.diff (text/plain), 10.33 KB, created by Brad Davis on 2015-06-18 15:25:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brad Davis

Created: 2015-06-18 15:25:42 UTC

Size: 10.33 KB

patch

obsolete

>Index: net-mgmt/victorops-nagios/Makefile
>===================================================================
>--- net-mgmt/victorops-nagios/Makefile	(revision 390006)
>+++ net-mgmt/victorops-nagios/Makefile	(working copy)
>@@ -2,16 +2,14 @@
> # $FreeBSD$
> 
> PORTNAME=	victorops-nagios
>-PORTVERSION=	1.1.8
>+PORTVERSION=	1.3.16
> CATEGORIES=	net-mgmt
> MASTER_SITES=	http://software.victorops.com/
>-DISTNAME=	${PORTNAME}_${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
>+#DISTNAME=	${PORTNAME}_${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
> 
> MAINTAINER=	rand@iteris.com
> COMMENT=	Nagios integration for VictorOps incident notification service
> 
>-BROKEN=		Unfetchable
>-
> NO_WRKSUBDIR=	YES
> NO_BUILD=	YES
> 
>@@ -37,7 +35,7 @@
> 	${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
>+.for i in victorops victorops_email vo_test_svc
> 	${INSTALL_DATA} ${WRKSRC}/opt/victorops/nagios_plugin/nagios_conf/${i}.cfg ${STAGEDIR}${PREFIX}/etc/nagios/${i}.cfg-sample
> .endfor
> 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/victorops
>Index: net-mgmt/victorops-nagios/distinfo
>===================================================================
>--- net-mgmt/victorops-nagios/distinfo	(revision 390006)
>+++ net-mgmt/victorops-nagios/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (victorops-nagios_1.1.8.tar.gz) = 796e146552e27b45d0339c9c74883ba8048125887461f9e69a1e36cbd752e1a2
>-SIZE (victorops-nagios_1.1.8.tar.gz) = 12838
>+SHA256 (victorops-nagios-1.3.16.tar.gz) = f1f6459b68a104c4136b60bf6728c0727f9d436f7c74ca0391d604fcc03a7fe0
>+SIZE (victorops-nagios-1.3.16.tar.gz) = 20936
>Index: net-mgmt/victorops-nagios/files/patch-check_victorops_cmds
>===================================================================
>--- net-mgmt/victorops-nagios/files/patch-check_victorops_cmds	(revision 390006)
>+++ net-mgmt/victorops-nagios/files/patch-check_victorops_cmds	(working copy)
>@@ -1,11 +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 @@
>+--- opt/victorops/nagios_plugin/bin/check_victorops_cmds.orig	2015-04-27 18:37:40 UTC
>++++ opt/victorops/nagios_plugin/bin/check_victorops_cmds
>+@@ -52,7 +52,7 @@ getAndExecuteCmds() {
>      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"
>+-    timeout $(( $TIMEOUT + 5 )) wget -T $TIMEOUT -t $TRIES -O $TMP_FILE "$URL" 2>$WGET_RESULT
>++    timeout $(( $TIMEOUT + 5 )) $WGET -T $TIMEOUT -t $TRIES -O $TMP_FILE "$URL" 2>$WGET_RESULT
>  
>      # Check the result, and if OK, send them to the command file
>      grep $RESULT_OK $TMP_FILE
>Index: net-mgmt/victorops-nagios/files/patch-check_victorops_forwarder
>===================================================================
>--- net-mgmt/victorops-nagios/files/patch-check_victorops_forwarder	(revision 390006)
>+++ net-mgmt/victorops-nagios/files/patch-check_victorops_forwarder	(working copy)
>@@ -1,32 +1,17 @@
>---- 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
>+--- opt/victorops/nagios_plugin/bin/check_victorops_forwarder.orig	2015-04-27 12:37:40.000000000 -0600
>++++ opt/victorops/nagios_plugin/bin/check_victorops_forwarder	2015-06-17 19:34:28.726282536 -0600
> @@ -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
>+ #//==========================================================================//
>+ #//         Copyright 2013-2015 VictorOps, Inc. All Rights Reserved          //
>+ #//                                                                          //
>+@@ -32,7 +32,7 @@
>+ 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 -eaww -o command | grep "$FORWARDER" | grep -v grep | wc -l 2>/dev/null)
> +FORWARDER_COUNT=$($PS -ww -p $PID | $GREP "$FORWARDER" | $WC -l 2>/dev/null)
>  if (( $FORWARDER_COUNT == 0 )); then
>-     echo "$($DATE) Starting $FORWARDER" >> "$LOG"
>+     echo "$(date) Starting $FORWARDER" >> "$LOG"
>      $FORWARDER "$QUEUE" >> "$LOG" 2>&1 &
>Index: net-mgmt/victorops-nagios/files/patch-do_victorops_heartbeat
>===================================================================
>--- net-mgmt/victorops-nagios/files/patch-do_victorops_heartbeat	(revision 390006)
>+++ net-mgmt/victorops-nagios/files/patch-do_victorops_heartbeat	(working copy)
>@@ -1,11 +0,0 @@
>---- 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
>Index: net-mgmt/victorops-nagios/files/patch-enqueue_alert
>===================================================================
>--- net-mgmt/victorops-nagios/files/patch-enqueue_alert	(revision 390006)
>+++ net-mgmt/victorops-nagios/files/patch-enqueue_alert	(working copy)
>@@ -1,14 +0,0 @@
>---- 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
>Index: net-mgmt/victorops-nagios/files/patch-forward_alerts
>===================================================================
>--- net-mgmt/victorops-nagios/files/patch-forward_alerts	(revision 390006)
>+++ net-mgmt/victorops-nagios/files/patch-forward_alerts	(working copy)
>@@ -1,11 +0,0 @@
>---- 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
>Index: net-mgmt/victorops-nagios/files/patch-support_collect.sh
>===================================================================
>--- net-mgmt/victorops-nagios/files/patch-support_collect.sh	(revision 390006)
>+++ net-mgmt/victorops-nagios/files/patch-support_collect.sh	(working copy)
>@@ -1,13 +0,0 @@
>---- 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
>Index: net-mgmt/victorops-nagios/files/patch-utils
>===================================================================
>--- net-mgmt/victorops-nagios/files/patch-utils	(revision 390006)
>+++ net-mgmt/victorops-nagios/files/patch-utils	(working copy)
>@@ -1,21 +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 @@
>+--- opt/victorops/nagios_plugin/bin/utils.orig	2015-04-27 12:37:40.000000000 -0600
>++++ opt/victorops/nagios_plugin/bin/utils	2015-06-18 09:18:20.814876729 -0600
>+@@ -10,7 +10,7 @@
>+ #//==========================================================================//
>+ 
>+ VO_PLUGIN_VERSION=1.3.16
>+-DEFAULT_QUEUE_DIR=/var/nagios
>++DEFAULT_QUEUE_DIR=/var/spool/nagios/victorops/alerts
>+ DEFAULT_LOG_DIR=/var/log/victorops
>+ 
>+ #-------------------------------------------------------------------
>+@@ -57,7 +57,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/.*=//')
>++        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
>Index: net-mgmt/victorops-nagios/pkg-plist
>===================================================================
>--- net-mgmt/victorops-nagios/pkg-plist	(revision 390006)
>+++ net-mgmt/victorops-nagios/pkg-plist	(working copy)
>@@ -1,7 +1,6 @@
>-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
>+@sample etc/nagios/victorops.cfg-sample
>+@sample etc/nagios/victorops_email.cfg-sample
>+@sample etc/nagios/vo_test_svc.cfg-sample
> etc/periodic/daily/400.victorops
> libexec/victorops/check_test_svc
> libexec/victorops/check_victorops_cmds

Actions: View | Diff

Attachments on bug 200955: 157863 | 157864 | 158023 | 158024