[icinga-checkins] icinga.org: icinga-core/dev/cgis: Fix config and cache for host urgency stuff

git at icinga.org git at icinga.org
Sat Feb 25 15:43:47 CET 2012


Module: icinga-core
Branch: dev/cgis
Commit: bf87d3d81cb8a6df98e083d7dbb3daf1c35c18de
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=bf87d3d81cb8a6df98e083d7dbb3daf1c35c18de

Author: Alexander Wirt <formorer at debian.org>
Date:   Fri Feb 24 20:45:37 2012 +0100

Fix config and cache for host urgency stuff

---

 t/etc/hosturgencies.cfg           |    7 +++++++
 t/etc/icinga-hosturgencies.cfg    |    4 ++--
 t/var/objects.cache.hosturgencies |    6 ++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/t/etc/hosturgencies.cfg b/t/etc/hosturgencies.cfg
index 169489c..1555297 100644
--- a/t/etc/hosturgencies.cfg
+++ b/t/etc/hosturgencies.cfg
@@ -54,3 +54,10 @@ define service {
 	notification_period	none
 	contacts	icingaadmin
 }
+
+define hostgroup {
+    hostgroup_name  all
+        alias           all
+        members         host1,host2,host3,host4
+}
+
diff --git a/t/etc/icinga-hosturgencies.cfg b/t/etc/icinga-hosturgencies.cfg
index e8ea7d1..edc0d85 100644
--- a/t/etc/icinga-hosturgencies.cfg
+++ b/t/etc/icinga-hosturgencies.cfg
@@ -28,7 +28,7 @@ log_file=var/icinga.log
 
 # Note: A relative path here is relative to the location of the overall icinga.cfg file,
 # not relative to the current directory
-cfg_file=hosturgencies.cfg
+cfg_file=etc/hosturgencies.cfg
 
 # You can also tell Icinga to process all config files (with a .cfg
 # extension) in a particular directory by using the cfg_dir
@@ -1159,7 +1159,7 @@ illegal_macro_output_chars=`~$&|'"<>
 # group names/descriptions in some fields of various object types.
 # Values: 1 = enable regexp matching, 0 = disable regexp matching
 
-use_regexp_matching=0
+use_regexp_matching=1
 
 
 
diff --git a/t/var/objects.cache.hosturgencies b/t/var/objects.cache.hosturgencies
index d0cb77f..3feeaca 100644
--- a/t/var/objects.cache.hosturgencies
+++ b/t/var/objects.cache.hosturgencies
@@ -327,3 +327,9 @@ define service {
 	retain_nonstatus_information	1
 	}
 
+define hostgroup {
+    hostgroup_name  all
+        alias   All Servers
+        members host1,host2,host3,host4
+}
+





More information about the icinga-checkins mailing list