[opsview-base] [449] pager duty enqueue and flush script is part of opsview base

[s...@opsview.com]

Revision

449

Author

fsiddiqui

Date

2014-05-20 11:43:08 +0100 (Tue, 20 May 2014)

Log Message

pager duty enqueue and flush script is part of opsview base

Modified Paths

• trunk/Makefile

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2014-05-19 16:58:08 UTC (rev 448)
+++ trunk/Makefile	2014-05-20 10:43:08 UTC (rev 449)
@@ -54,7 +54,7 @@
 NFDUMP = nfdump-1.6.9
 FLOT = flot-0.5
 JQUERYSPARKLINES=jquery.sparkline.uncompressed.2.1.js
-PAGERDUTY=pagerduty_nagios
+PAGERDUTY_NAGIOS=pagerduty_nagios
 # EasyXDM is different. Need to install every version available
 EASYXDM = easyXDM-2.4.9.102 easyXDM-2.4.15.118 easyXDM-2.4.19
 SHOWDOWN = showdown-0.9
@@ -159,7 +159,7 @@
 	${NDOUTILS} nrpe.cfg opsview-base.spec opsview-agent.spec version \
 	allmibs.tar.gz ${CHECK_RADIUS_IH} ${AUTOSSH} ${HYPERGRAPH} ${NMIS} ${FABTABULOUS} \
 	${NAGVIS} ${DATATABLES} ${TIMELINE} ${TANGOICONS} ${WEBICONS} ${ICOJOY4} ${FLOT} \
-	${JQUERYSPARKLINES} ${EASYXDM} ${SHOWDOWN} ${WMI} ${NFDUMP}
+	${JQUERYSPARKLINES} ${EASYXDM} ${SHOWDOWN} ${WMI} ${NFDUMP} ${PAGERDUTY_NAGIOS}
 
 # This is new style builds/installs. Makes it easier to compile and test local changes
 BUILDS = ${NFDUMP}-build
@@ -177,12 +177,13 @@
 install: dirs ${NAGIOS}-install ${NAGIOSPLUG}-install ${NRPE}-install ${NSCA}-install \
 	javascript-install ${NDOUTILS}-install install-mibs \
 	${CHECK_RADIUS_IH}-install ${AUTOSSH}-install ${NMIS}-install nrpe.cfg-install \
-	${FLOT}-install ${NFDUMP}-install ${WMI}-install \
+	${FLOT}-install ${NFDUMP}-install ${WMI}-install ${PAGERDUTY_NAGIOS}-install \
 	${ICOJOY4}-install ${FABTABULOUS}-install ${TANGOICONS}-install ${WEBICONS}-install ${NAGVIS}-install \
 	easyxdm-install \
 	${SHOWDOWN}-install \
 	jsscripts-install install-fladmin post-test
 
+
 install-dev:
 	PERL5LIB="/usr/local/nagios/perl/lib/i486-linux-gnu-thread-multi:/usr/local/nagios/perl/lib:$PERL5LIB" \
 	$(MAKE) install
@@ -206,14 +207,6 @@
 
 allmibs.tar.gz:
 	cd mibs && tar --gzip -cf ../allmibs.tar.gz *
-
-pagerduty:
-	tar -xvf ${PAGERDUTY}.tar.gz
-	chmod 755 ${PAGERDUTY}.pl
-	mv ${PAGERDUTY}.pl ${PLUGIN_DIR}/notifications/notify_by_pagerduty
-	
-
-post-test:
 	perl -e '$$_="${DESTDIR}/${PLUGIN_DIR}/check_icmp"; -u $$_ || warn "WARNING: File not setuid (ok if packaging) : $$_\n"'
 	perl -e '$$_="${DESTDIR}/${PLUGIN_DIR}/check_dhcp"; -u $$_ || warn "WARNING: File not setuid (ok if packaging) : $$_\n"'
 
@@ -378,6 +371,8 @@
 
 flot-install: ${FLOT}-install
 
+pagerduty-install: ${PAGERDUTY_NAGIOS}-install 
+
 jquerysparklines-install: ${JQUERYSPARKLINES}-install
 
 ${SCRIPT}:
@@ -466,6 +461,10 @@
 	gunzip -c ${FLOT}.tar.gz | tar -xf -
 	perl -i -pe 's/browser\.msie\)/browser.msie && typeof window.G_vmlCanvasManager=="object"\)/g' flot/jquery.flot.pack.js
 
+${PAGERDUTY_NAGIOS}:
+	tar -xvf ${PAGERDUTY_NAGIOS}.tar.gz
+	chmod 755 ${PAGERDUTY_NAGIOS}.pl
+
 ${JQUERYSPARKLINES}:
 	gunzip -c ${JQUERYSPARKLINES}.gz > ${JQUERYSPARKLINES}
 	patch ${JQUERYSPARKLINES} < patches/sparkline_all_null_values.patch
@@ -1085,6 +1084,9 @@
 	#${INSTALL} -c -o ${NAGIOS_USER} -m 0444 flot/jquery.flot.min.js ${DESTDIR}/${WEB_DIR}/javascript/jquery.flot.js
 	#${INSTALL} -c -o ${NAGIOS_USER} -m 0444 flot/excanvas.min.js ${DESTDIR}/${WEB_DIR}/javascript/excanvas.js
 
+${PAGERDUTY_NAGIOS}-install:
+	mv pagerduty_nagios.pl ${PLUGIN_DIR}/notifications/notify_by_pagerduty
+
 ${JQUERYSPARKLINES}-install:
 	${INSTALL} -c -o ${NAGIOS_USER} -m 0444 ${JQUERYSPARKLINES} ${DESTDIR}/${WEB_DIR}/javascript/jquery.sparkline.js