FreeBSD Bugzilla – Attachment 165732 Details for
Bug 206350
[patch] net-mgmt/victorops-nagios Update to 1.4.20
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch to upgrade victorops-nagios from 1.1.8 to 1.4.20
victorops.diff (text/plain), 7.25 KB, created by
Douglas K. Rand
on 2016-01-17 23:28:03 UTC
(
hide
)
Description:
Patch to upgrade victorops-nagios from 1.1.8 to 1.4.20
Filename:
MIME Type:
Creator:
Douglas K. Rand
Created:
2016-01-17 23:28:03 UTC
Size:
7.25 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 406537) >+++ Makefile (working copy) >@@ -2,16 +2,13 @@ > # $FreeBSD$ > > PORTNAME= victorops-nagios >-PORTVERSION= 1.1.8 >+PORTVERSION= 1.4.20 > 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 > >-BROKEN= Unfetchable >- > NO_WRKSUBDIR= YES > NO_BUILD= YES > >@@ -21,7 +18,8 @@ > OPTIONS_DEFAULT= > QPAGE_DESC= Integrate qpage for victorops server problems > >-RUN_DEPENDS+= bash:${PORTSDIR}/shells/bash >+RUN_DEPENDS+= bash:${PORTSDIR}/shells/bash \ >+ curl:${PORTSDIR}/ftp/curl > > .include <bsd.port.options.mk> > .if ${PORT_OPTIONS:MQPAGE} >@@ -37,13 +35,15 @@ > ${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 >+ ${MKDIR} ${STAGEDIR}${PREFIX}/etc/victorops >+ ${MKDIR} ${STAGEDIR}/var/log/victorops >+ ${INSTALL_DATA} ${WRKSRC}/opt/victorops/nagios_plugin/nagios_conf/victorops.cfg ${STAGEDIR}${PREFIX}/etc/nagios/victorops.cfg-sample >+ ${INSTALL_DATA} ${WRKSRC}/opt/victorops/nagios_plugin/conf/env.sh.sample ${STAGEDIR}${PREFIX}/etc/victorops >+ ${INSTALL_DATA} ${WRKSRC}/opt/victorops/nagios_plugin/conf/proxy.sh.sample ${STAGEDIR}${PREFIX}/etc/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 \ >+ send_email_alert send_status stop_forwarder \ > url_encode.sed utils > ${INSTALL_SCRIPT} ${WRKSRC}/opt/victorops/nagios_plugin/bin/${i} ${STAGEDIR}${PREFIX}/libexec/victorops/${i} > .endfor >Index: distinfo >=================================================================== >--- distinfo (revision 406537) >+++ 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.4.20.tar.gz) = 87d8c87182e8945357cb9b602d19452754a4decb4809a8594a2495a04f3d9664 >+SIZE (victorops-nagios-1.4.20.tar.gz) = 1678731 >Index: files/qpage-patch >=================================================================== >--- files/qpage-patch (revision 406537) >+++ files/qpage-patch (working copy) >@@ -1,38 +1,27 @@ >---- 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 @@ >+--- opt/victorops/nagios_plugin/bin/send_email_alert.orig 2016-01-16 21:20:46 UTC >++++ opt/victorops/nagios_plugin/bin/send_email_alert >+@@ -34,6 +34,7 @@ fi > # 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 @@ >+ WGET_LOG=$LOG_DIR/victorops_forward_wget.out >+ STDERR_LOG=$LOG_DIR/victorops_forward_wget.err >+@@ -45,10 +46,16 @@ if (( $IS_SERVICE )); then > 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 >+ 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 >++ 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 >+ 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 >++ 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) >- >Index: pkg-plist >=================================================================== >--- pkg-plist (revision 406537) >+++ 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/victorops/env.sh.sample >+@sample etc/victorops/proxy.sh.sample >+@sample etc/nagios/victorops.cfg-sample > etc/periodic/daily/400.victorops > libexec/victorops/check_test_svc > libexec/victorops/check_victorops_cmds >@@ -13,6 +12,7 @@ > 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 >+@dir etc/victorops >+@dir /var/log/victorops
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
rakuco
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 206350
:
165732
|
168371
|
168427
|
168428