[icinga-checkins] icinga.org: icinga2/master: Updated validation rules for service dependencies.

git at icinga.org git at icinga.org
Fri Feb 8 16:09:51 CET 2013


Module: icinga2
Branch: master
Commit: b5f59dc882c33bbff8a046695c5dccf52b5ff91a
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=b5f59dc882c33bbff8a046695c5dccf52b5ff91a

Author: Gunnar Beutner <gunnar.beutner at netways.de>
Date:   Fri Feb  8 16:09:42 2013 +0100

Updated validation rules for service dependencies.

---

 itl/types.conf |   27 ++++++++++++++++++++++++---
 1 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/itl/types.conf b/itl/types.conf
index 6ddc8e0..343e79a 100644
--- a/itl/types.conf
+++ b/itl/types.conf
@@ -58,7 +58,14 @@ type Host {
 		%attribute string "*"
 	},
 	%attribute dictionary "servicedependencies" {
-		%attribute string "*"
+		%attribute string "*",
+		%attribute dictionary "*" {
+			%require "host",
+			%attribute string "host",
+
+			%require "service",
+			%attribute string "service"
+		}
 	},
 	%attribute dictionary "services" {
 		%validator "native::ValidateServiceDictionary",
@@ -84,7 +91,14 @@ type Host {
 				%attribute string "*"
 			},
 			%attribute dictionary "servicedependencies" {
-				%attribute string "*"
+				%attribute string "*",
+				%attribute dictionary "*" {
+					%require "host",
+					%attribute string "host",
+
+					%require "service",
+					%attribute string "service"
+				}
 			}
 		}
 	},
@@ -138,7 +152,14 @@ type Service {
 		%attribute string "*"
 	},
 	%attribute dictionary "servicedependencies" {
-		%attribute string "*"
+		%attribute string "*",
+		%attribute dictionary "*" {
+			%require "host",
+			%attribute string "host",
+
+			%require "service",
+			%attribute string "service"
+		}
 	},
 	%attribute dictionary "servicegroups" {
 		%attribute string "*"





More information about the icinga-checkins mailing list