[icinga-checkins] icinga.org: icinga-core/master: move ido2db process checks to contrib/ checks, install to objects but don't include by default

git at icinga.org git at icinga.org
Wed Nov 9 16:44:44 CET 2011


Module: icinga-core
Branch: master
Commit: 6ef32119eb7fd8125395d0882ac638fafbddf44c
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=6ef32119eb7fd8125395d0882ac638fafbddf44c

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Fri Nov  4 09:40:53 2011 +0100

move ido2db process checks to contrib/checks, install to objects but don't include by default

refs #1870

---

 .../checks}/ido2db_check_proc.cfg                  |    0 
 module/idoutils/Makefile.in                        |    2 +-
 sample-config/icinga.cfg.in                        |    2 ++
 3 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/module/idoutils/config/ido2db_check_proc.cfg b/contrib/checks/ido2db_check_proc.cfg
similarity index 100%
rename from module/idoutils/config/ido2db_check_proc.cfg
rename to contrib/checks/ido2db_check_proc.cfg
diff --git a/module/idoutils/Makefile.in b/module/idoutils/Makefile.in
index 3d0e279..7f5fcb1 100644
--- a/module/idoutils/Makefile.in
+++ b/module/idoutils/Makefile.in
@@ -48,5 +48,5 @@ install:
 	$(INSTALL) -m 664 $(INSTALL_OPTS) config/ido2db.cfg-sample $(DESTDIR)$(CFGDIR)
 	$(INSTALL) -m 664 $(INSTALL_OPTS) config/idomod.cfg-sample $(DESTDIR)$(CFGDIR)
 	$(INSTALL) -m 664 $(INSTALL_OPTS) config/idoutils.cfg-sample $(DESTDIR)$(CFGDIR)/modules
-	$(INSTALL) -m 664 $(INSTALL_OPTS) config/ido2db_check_proc.cfg $(DESTDIR)$(CFGDIR)/modules
+	$(INSTALL) -b -m 664 $(INSTALL_OPTS) contrib/checks/ido2db_check_proc.cfg $(DESTDIR)$(CFGDIR)/objects/ido2db_check_proc.cfg
 
diff --git a/sample-config/icinga.cfg.in b/sample-config/icinga.cfg.in
index 9eba565..c4c2dc1 100644
--- a/sample-config/icinga.cfg.in
+++ b/sample-config/icinga.cfg.in
@@ -42,6 +42,8 @@ cfg_file=@sysconfdir@/objects/localhost.cfg
 # Definitions for monitoring a network printer
 #cfg_file=@sysconfdir@/objects/printer.cfg
 
+# Definitions for ido2db process checks
+#cfg_file=@sysconfdir@/objects/ido2db_check_proc.cfg
 
 # You can also tell Icinga to process all config files (with a .cfg
 # extension) in a particular directory by using the cfg_dir





More information about the icinga-checkins mailing list