From 826a56ba20bfc7bcae6e82619c8082187cf30586 Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Tue, 24 Sep 2013 13:25:38 +0200
Subject: [PATCH] Update type validators.

---
 lib/icinga/icinga-type.conf | 115 ++----------------------------------
 1 file changed, 5 insertions(+), 110 deletions(-)

diff --git a/lib/icinga/icinga-type.conf b/lib/icinga/icinga-type.conf
index 33c67e03d..f8e249290 100644
--- a/lib/icinga/icinga-type.conf
+++ b/lib/icinga/icinga-type.conf
@@ -41,106 +41,19 @@ type Host {
 				%attribute name(Service) "*"
 			},
 
-/*			%attribute string "short_name",
-			%attribute string "display_name",
-
-			%attribute dictionary "macros" {
-				%attribute string "*"
-			},
-
-			%attribute dictionary "custom" {
-				%attribute string "*"
-			},
-
-			%attribute name(CheckCommand) "check_command",
-
-			%attribute name(TimePeriod) "check_period",
-			%attribute number "check_interval",
-			%attribute number "retry_interval",
-
-			%attribute number "enable_notifications",
-			%attribute number "notification_interval",
-			%attribute name(TimePeriod) "notification_period",
-
-			%attribute number "enable_flapping",
-			%attribute number "flapping_threshold",
-
-			%attribute array "servicegroups" {
-				%attribute name(ServiceGroup) "*"
-			},
-			%attribute array "checkers" {
-				%attribute string "*"
-			},
-			%attribute array "hostdependencies" {
-				%attribute name(Host) "*"
-			},
-			%attribute array "servicedependencies" {
-				%attribute dictionary "*" {
-					%require "host",
-					%attribute name(Host) "host",
-
-					%require "service",
-					%attribute string "service"
-				}
-			},
-
-			%attribute dictionary "notifications" {
-				%attribute dictionary "*" {
-					%attribute array "templates" {
-						%attribute name(Notification) "*"
-					},
-
-					%attribute dictionary "macros" {
-						%attribute string "*"
-					},
-
-					%attribute array "users" {
-						%attribute name(User) "*"
-					},
-					%attribute array "groups" {
-						%attribute name(UserGroup) "*"
-					},
-
-					%attribute dictionary "times" {
-						%attribute number "begin",
-						%attribute number "end",
-					},
-
-					%attribute number "notification_type_filter",
-					%attribute number "notification_state_filter",
-					%attribute name(TimePeriod) "notification_period"
-				}
-			},*/
+			%attribute any "*"
 		}
 	},
 
-/*	%attribute dictionary "notifications" {
+	%attribute dictionary "notifications" {
 		%attribute dictionary "*" {
 			%attribute array "templates" {
 				%attribute name(Notification) "*"
 			},
 
-			%attribute dictionary "macros" {
-				%attribute string "*"
-			},
-
-			%attribute array "users" {
-				%attribute name(User) "*"
-			},
-			%attribute array "groups" {
-				%attribute name(UserGroup) "*"
-			},
-
-			%attribute dictionary "times" {
-				%attribute number "begin",
-				%attribute number "end",
-			},
-
-			%attribute number "notification_type_filter",
-			%attribute number "notification_state_filter",
-			%attribute name(TimePeriod) "notification_period"
+			%attribute any "*"
 		}
-	},*/
+	},
 
 	/* service attributes */
 	%attribute number "max_check_attempts",
@@ -242,25 +155,7 @@ type Service {
 				%attribute name(Notification) "*"
 			},
 
-/*			%attribute dictionary "macros" {
-				%attribute string "*"
-			},
-
-			%attribute array "users" {
-				%attribute name(User) "*"
-			},
-			%attribute array "groups" {
-				%attribute name(UserGroup) "*"
-			},
-
-			%attribute dictionary "times" {
-				%attribute number "begin",
-				%attribute number "end",
-			},
-
-			%attribute number "notification_type_filter",
-			%attribute number "notification_state_filter",
-			%attribute name(TimePeriod) "notification_period"*/
+			%attribute any "*"
 		}
 	}
 }
-- 
2.40.0