[icinga-checkins] icinga.org: icinga-reports/mluebben/default: Cleanup documentation

git at icinga.org git at icinga.org
Tue Aug 23 14:26:34 CEST 2011


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

Author: Michael Lübben <michael_luebben at web.de>
Date:   Tue Aug 23 14:26:21 2011 +0200

Cleanup documentation

---

 AvailReportParser/Makefile.in  |   12 ++++++++++++
 AvailReportParser/README       |   19 +++++++++++++++++++
 AvailReportParser/configure    |   12 ------------
 AvailReportParser/configure.in |    2 --
 AvailReportParser/doc/Install  |    4 ++--
 5 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/AvailReportParser/Makefile.in b/AvailReportParser/Makefile.in
index 9a87431..b72ec13 100644
--- a/AvailReportParser/Makefile.in
+++ b/AvailReportParser/Makefile.in
@@ -45,6 +45,18 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
 none:
 	@echo "Please supply a command line argument (i.e. 'make install')."
 
+all:
+	@echo ""
+	@echo "*** Compile finished ***"
+	@echo ""
+	@echo "If the main program compiled without any errors, you can"
+	@echo "continue with installing Icinga as follows (type 'make'"
+	@echo "without any arguments for a list of all possible options):"
+	@echo ""
+	@echo "  make install"
+	@echo "     - This installs the main program (Icinga Reports)"
+	@echo ""
+
 clean:
 	cd $(SRC_MODULE) && $(MAKE) $@
 
diff --git a/AvailReportParser/README b/AvailReportParser/README
index e69de29..891b230 100644
--- a/AvailReportParser/README
+++ b/AvailReportParser/README
@@ -0,0 +1,19 @@
+--------------------------------------------------------
+
+Icinga-Reports
+
+This is a new report availabilty parser for Icinga.
+It is an official part of the Icinga project.
+
+For detailed information about installation, legal and all
+other, please take a look into ./doc
+
+Visit the Icinga homepage at http://www.icinga.org for online
+documentation, new releases, bug reports, information on the mailing
+lists, etc.
+
+Regards,
+
+  The Icinga Development Team
+
+--------------------------------------------------------
diff --git a/AvailReportParser/configure b/AvailReportParser/configure
index ed34b56..a1c55ab 100755
--- a/AvailReportParser/configure
+++ b/AvailReportParser/configure
@@ -637,7 +637,6 @@ ac_user_opts='
 enable_option_checking
 with_icinga_user
 with_icinga_group
-with_table_prefix
 with_log_dir
 '
       ac_precious_vars='build_alias
@@ -1266,8 +1265,6 @@ Optional Packages:
                           sets user name to run icinga
   --with-icinga-group=<grp>
                           sets group name to run icinga
-  --with-table_prefix=<table_prefix>
-                          sets prefix for database tables
   --with-log-dir=<path>   sets path to logging directory
 
 Report bugs to <michael_luebben at web.de>.
@@ -2335,15 +2332,6 @@ INSTALL_OPTS="-o $icinga_user -g $icinga_grp"
 
 
 
-# Check whether --with-table_prefix was given.
-if test "${with_table_prefix+set}" = set; then :
-  withval=$with_table_prefix; table_prefix=$withval
-else
-  table_prefix=reporting
-fi
-
-
-
 LOGDIR=no
 
 # Check whether --with-log-dir was given.
diff --git a/AvailReportParser/configure.in b/AvailReportParser/configure.in
index 3c7c470..3a2394a 100644
--- a/AvailReportParser/configure.in
+++ b/AvailReportParser/configure.in
@@ -36,8 +36,6 @@ AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$icinga_grp",[group name to run nagios]
 INSTALL_OPTS="-o $icinga_user -g $icinga_grp"
 AC_SUBST(INSTALL_OPTS)
 
-AC_ARG_WITH(table_prefix,AC_HELP_STRING([--with-table_prefix=<table_prefix>],[sets prefix for database tables]),table_prefix=$withval,table_prefix=reporting)
-
 
 dnl ################
 dnl LOG DIRS
diff --git a/AvailReportParser/doc/Install b/AvailReportParser/doc/Install
index fe2e79a..ebb73c9 100644
--- a/AvailReportParser/doc/Install
+++ b/AvailReportParser/doc/Install
@@ -11,6 +11,6 @@ This perl script parse and import a completly service availability report in a d
 
 Thats it!!!!
 
-For debugging have a look at /tmp/report_avail.log
+For debugging have a look at <Your Path>/icinga-reports/var/log/
 
-For more documentation use perldoc modulname. As example perldoc ./Modules/Reporting/Availability.pm
+For more documentation use perldoc modulname. As example perldoc ./include/modules/Reporting/Availability.pm





More information about the icinga-checkins mailing list