[icinga-checkins] icinga.org: icinga-reports/mluebben/default: Add new make option js-export and rename jasper package

git at icinga.org git at icinga.org
Wed Aug 24 10:38:54 CEST 2011


Module: icinga-reports
Branch: mluebben/default
Commit: 75ad61ca4313580f7fe6a87e809e1ac45728f855
URL:    https://git.icinga.org/?p=icinga-reports.git;a=commit;h=75ad61ca4313580f7fe6a87e809e1ac45728f855

Author: Michael Lübben <michael_luebben at web.de>
Date:   Wed Aug 24 10:38:29 2011 +0200

Add new make option js-export and rename jasper package

---

 AvailReportParser/Makefile.in                      |   60 +++++++++++++++++++-
 AvailReportParser/configure                        |   29 ++++++++++
 ...ed-report.zip => js-icinga-detailed-report.zip} |  Bin 20487 -> 20487 bytes
 3 files changed, 87 insertions(+), 2 deletions(-)

diff --git a/AvailReportParser/Makefile.in b/AvailReportParser/Makefile.in
index 1187fa6..516b754 100644
--- a/AvailReportParser/Makefile.in
+++ b/AvailReportParser/Makefile.in
@@ -53,6 +53,34 @@ none:
 	@echo "  make js-import"
 	@echo "     - This imports the reports into your JasperServer"
 	@echo ""
+	@echo ""
+	@echo ""
+	@echo "*** Support Notes *******************************************"
+	@echo ""
+	@echo "If you have questions about configuring or running Icinga,"
+	@echo "please make sure that you:"
+	@echo ""
+	@echo "     - Look at the sample config files"
+	@echo ""
+	@echo "before you post a question to one of the mailing lists at"
+	@echo "http://www.icinga.org/community/ or at Icinga Portal:"
+	@echo "http://www.icinga-portal.org"
+	@echo ""
+	@echo "Also make sure to include pertinent information that could"
+	@echo "help others help you.  This might include:"
+	@echo ""
+	@echo "     - What version of Icinga you are using"
+	@echo "     - What version of the jasper server you are using"
+	@echo "     - Relevant error messages from the Icinga log file"
+	@echo ""
+	@echo "For more information on obtaining support for Icinga, visit:"
+	@echo ""
+	@echo "       http://www.icinga.org/community/"
+	@echo ""
+	@echo "*************************************************************"
+	@echo ""
+	@echo "Enjoy."
+	@echo ""
 
 clean:
 	cd $(SRC_MODULE) && $(MAKE) $@
@@ -60,6 +88,11 @@ clean:
 	rm -f Makefile
 	rm -f config.log config.status
 
+distclean: clean
+	rm -f /tmp/js-icinga-detailed-report.zip
+	rm -f ../${PACKAGE_TARNAME}-${PACKAGE_VERSION}.tar.gz
+	rm -f ../${PACKAGE_TARNAME}-${PACKAGE_VERSION}.tar.gz.md5
+	
 install:
 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
@@ -72,7 +105,29 @@ install:
 
 js-import:
 	@if [ x$(JASPER_SERVER) != xno ]; then \
-		$(JASPER_SERVER)/buildomatic/js-import.sh --input-zip ./jasperreports/package/icinga-detailed-report.zip ;\
+		$(JASPER_SERVER)/buildomatic/js-import.sh --input-zip ./jasperreports/package/js-icinga-detailed-report.zip ;\
+	fi
+
+	@if [ x$(JASPER_SERVER) = xno ]; then \
+		echo "" ;\
+		echo "Sorry, but no supported JasperServer installation found!" ;\
+		echo "" ;\
+	else \
+		echo "" ;\
+		echo "*** Japser Reports imported ***" ;\
+		echo "" ;\
+	fi
+
+js-export:
+	@if [ x$(JASPER_SERVER) != xno ]; then \
+		$(JASPER_SERVER)/buildomatic/js-export.sh --uris \
+			/Icinga/reports/service/ServiceDetailedAvailabilityReport, \
+			/Icinga/templates/sub/other/logentries, \
+			/Icinga/templates/sub/service/allStateBreakdowns, \
+			/Icinga/templates/sub/service/pieChartStates, \
+			/Icinga/templates/sub/service/stateBreakdown, \
+			/Icinga/templates/sub/service/summaryState \
+			--output-zip /tmp/js-icinga-detailed-report.zip ;\
 	fi
 
 	@if [ x$(JASPER_SERVER) = xno ]; then \
@@ -81,7 +136,8 @@ js-import:
 		echo "" ;\
 	else \
 		echo "" ;\
-		echo "*** Japser Reports imported**" ;\
+		echo "New report package exported to /tmp/js-icinga-detailed-report.zip" ;\
+		echo "*** Japser Reports exported ***" ;\
 		echo "" ;\
 	fi
 
diff --git a/AvailReportParser/configure b/AvailReportParser/configure
index a1c55ab..9440a46 100755
--- a/AvailReportParser/configure
+++ b/AvailReportParser/configure
@@ -559,6 +559,7 @@ PACKAGE_URL=''
 ac_default_prefix=/usr/local/icinga-reports
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+JASPER_SERVER
 LOGDIR
 INSTALL_OPTS
 icinga_grp
@@ -638,6 +639,7 @@ enable_option_checking
 with_icinga_user
 with_icinga_group
 with_log_dir
+with_jasper_server
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1266,6 +1268,8 @@ Optional Packages:
   --with-icinga-group=<grp>
                           sets group name to run icinga
   --with-log-dir=<path>   sets path to logging directory
+  --with-jasper-server=<path>
+                          sets path to jasper server directory
 
 Report bugs to <michael_luebben at web.de>.
 _ACEOF
@@ -2346,6 +2350,31 @@ if test x$LOGDIR = xno; then
 fi
 
 
+JASPER_SERVER=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for jasperserver" >&5
+$as_echo_n "checking for jasperserver... " >&6; }
+
+# Check whether --with-jasper_server was given.
+if test "${with_jasper_server+set}" = set; then :
+  withval=$with_jasper_server; JASPER_SERVER=$withval
+else
+  JASPER_SERVER=no
+fi
+
+if test x$JASPER_SERVER = xno; then
+	if  test -d /opt/jasperreports-server-cp-4.0.0 ; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }; JASPER_SERVER="/opt/jasperreports-server-cp-4.0.0"; break;
+elif  test -d /opt/jasperreports-server-cp-4.1.0 ; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }; JASPER_SERVER="/opt/jasperreports-server-cp-4.1.0"; break;
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+fi
+fi
+
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
diff --git a/AvailReportParser/jasperreports/package/icinga-detailed-report.zip b/AvailReportParser/jasperreports/package/js-icinga-detailed-report.zip
similarity index 100%
rename from AvailReportParser/jasperreports/package/icinga-detailed-report.zip
rename to AvailReportParser/jasperreports/package/js-icinga-detailed-report.zip





More information about the icinga-checkins mailing list