Allow strings in state and type filters (config, API)

fixes #11445

lib/db_ido/userdbobject.cpp

@@ -53,16 +53,16 @@ Dictionary::Ptr UserDbObject::GetConfigFields(void) const
 	int typeFilter = user->GetTypeFilter();
 	int stateFilter = user->GetStateFilter();
 
-	fields->Set("notify_service_recovery", (typeFilter & (1 << NotificationRecovery)) != 0);
+	fields->Set("notify_service_recovery", (typeFilter & NotificationRecovery) != 0);
 	fields->Set("notify_service_warning", (stateFilter & StateFilterWarning) != 0);
 	fields->Set("notify_service_unknown", (stateFilter & StateFilterUnknown) != 0);
 	fields->Set("notify_service_critical", (stateFilter & StateFilterCritical) != 0);
-	fields->Set("notify_service_flapping", (typeFilter & ((1 << NotificationFlappingStart) | (1 << NotificationFlappingEnd))) != 0);
+	fields->Set("notify_service_flapping", (typeFilter & (NotificationFlappingStart | NotificationFlappingEnd)) != 0);
-	fields->Set("notify_service_downtime", (typeFilter & ((1 << NotificationDowntimeStart) | (1 << NotificationDowntimeEnd) | (1 << NotificationDowntimeRemoved))) != 0);
+	fields->Set("notify_service_downtime", (typeFilter & (NotificationDowntimeStart | NotificationDowntimeEnd | NotificationDowntimeRemoved)) != 0);
-	fields->Set("notify_host_recovery", (typeFilter & (1 << NotificationRecovery)) != 0);
+	fields->Set("notify_host_recovery", (typeFilter & NotificationRecovery) != 0);
 	fields->Set("notify_host_down", (stateFilter & StateFilterDown) != 0);
-	fields->Set("notify_host_flapping", (typeFilter & ((1 << NotificationFlappingStart) | (1 << NotificationFlappingEnd))) != 0);
+	fields->Set("notify_host_flapping", (typeFilter & (NotificationFlappingStart | NotificationFlappingEnd)) != 0);
-	fields->Set("notify_host_downtime", (typeFilter & ((1 << NotificationDowntimeStart) | (1 << NotificationDowntimeEnd) | (1 << NotificationDowntimeRemoved))) != 0);
+	fields->Set("notify_host_downtime", (typeFilter & (NotificationDowntimeStart | NotificationDowntimeEnd | NotificationDowntimeRemoved)) != 0);
 
 	return fields;
 }

lib/icinga/compatutility.cpp

@@ -109,8 +109,8 @@ int CompatUtility::GetHostNotifyOnDown(const Host::Ptr& host)
 {
 	unsigned long notification_state_filter = GetCheckableNotificationStateFilter(host);
 
-	if (notification_state_filter & (1<<ServiceCritical) ||
+	if ((notification_state_filter & ServiceCritical) ||
-	    notification_state_filter & (1<<ServiceWarning))
+	    (notification_state_filter & ServiceWarning))
 		return 1;
 
 	return 0;
@@ -120,7 +120,7 @@ int CompatUtility::GetHostNotifyOnUnreachable(const Host::Ptr& host)
 {
 	unsigned long notification_state_filter = GetCheckableNotificationStateFilter(host);
 
-	if (notification_state_filter & (1<<ServiceUnknown))
+	if (notification_state_filter & ServiceUnknown)
 		return 1;
 
 	return 0;
@@ -477,32 +477,32 @@ String CompatUtility::GetCheckableNotificationNotificationOptions(const Checkabl
 
 	/* notification state filters */
 	if (service) {
-		if (notification_state_filter & (1<<ServiceWarning)) {
+		if (notification_state_filter & ServiceWarning) {
 			notification_options.push_back("w");
 		}
-		if (notification_state_filter & (1<<ServiceUnknown)) {
+		if (notification_state_filter & ServiceUnknown) {
 			notification_options.push_back("u");
 		}
-		if (notification_state_filter & (1<<ServiceCritical)) {
+		if (notification_state_filter & ServiceCritical) {
 			notification_options.push_back("c");
 		}
 	} else {
-		if (notification_state_filter & (1<<HostDown)) {
+		if (notification_state_filter & HostDown) {
 			notification_options.push_back("d");
 		}
 	}
 
 	/* notification type filters */
-	if (notification_type_filter & (1<<NotificationRecovery)) {
+	if (notification_type_filter & NotificationRecovery) {
 		notification_options.push_back("r");
 	}
-	if (notification_type_filter & (1<<NotificationFlappingStart) ||
+	if ((notification_type_filter & NotificationFlappingStart) ||
-			notification_type_filter & (1<<NotificationFlappingEnd)) {
+	    (notification_type_filter & NotificationFlappingEnd)) {
 		notification_options.push_back("f");
 	}
-	if (notification_type_filter & (1<<NotificationDowntimeStart) ||
+	if ((notification_type_filter & NotificationDowntimeStart) ||
-			notification_type_filter & (1<<NotificationDowntimeEnd) ||
+	    (notification_type_filter & NotificationDowntimeEnd) ||
-			notification_type_filter & (1<<NotificationDowntimeRemoved)) {
+	    (notification_type_filter & NotificationDowntimeRemoved)) {
 		notification_options.push_back("s");
 	}
 
@@ -537,7 +537,7 @@ int CompatUtility::GetCheckableNotificationStateFilter(const Checkable::Ptr& che
 
 int CompatUtility::GetCheckableNotifyOnWarning(const Checkable::Ptr& checkable)
 {
-	if (GetCheckableNotificationStateFilter(checkable) & (1<<ServiceWarning))
+	if (GetCheckableNotificationStateFilter(checkable) & ServiceWarning)
 		return 1;
 
 	return 0;
@@ -545,7 +545,7 @@ int CompatUtility::GetCheckableNotifyOnWarning(const Checkable::Ptr& checkable)
 
 int CompatUtility::GetCheckableNotifyOnCritical(const Checkable::Ptr& checkable)
 {
-	if (GetCheckableNotificationStateFilter(checkable) & (1<<ServiceCritical))
+	if (GetCheckableNotificationStateFilter(checkable) & ServiceCritical)
 		return 1;
 
 	return 0;
@@ -553,7 +553,7 @@ int CompatUtility::GetCheckableNotifyOnCritical(const Checkable::Ptr& checkable)
 
 int CompatUtility::GetCheckableNotifyOnUnknown(const Checkable::Ptr& checkable)
 {
-	if (GetCheckableNotificationStateFilter(checkable) & (1<<ServiceUnknown))
+	if (GetCheckableNotificationStateFilter(checkable) & ServiceUnknown)
 		return 1;
 
 	return 0;
@@ -561,7 +561,7 @@ int CompatUtility::GetCheckableNotifyOnUnknown(const Checkable::Ptr& checkable)
 
 int CompatUtility::GetCheckableNotifyOnRecovery(const Checkable::Ptr& checkable)
 {
-	if (GetCheckableNotificationTypeFilter(checkable) & (1<<NotificationRecovery))
+	if (GetCheckableNotificationTypeFilter(checkable) & NotificationRecovery)
 		return 1;
 
 	return 0;
@@ -571,8 +571,8 @@ int CompatUtility::GetCheckableNotifyOnFlapping(const Checkable::Ptr& checkable)
 {
 	unsigned long notification_type_filter = GetCheckableNotificationTypeFilter(checkable);
 
-	if (notification_type_filter & (1<<NotificationFlappingStart) ||
+	if ((notification_type_filter & NotificationFlappingStart) ||
-	    notification_type_filter & (1<<NotificationFlappingEnd))
+	    (notification_type_filter & NotificationFlappingEnd))
 		return 1;
 
 	return 0;
@@ -582,9 +582,9 @@ int CompatUtility::GetCheckableNotifyOnDowntime(const Checkable::Ptr& checkable)
 {
 	unsigned long notification_type_filter = GetCheckableNotificationTypeFilter(checkable);
 
-	if (notification_type_filter & (1<<NotificationDowntimeStart) ||
+	if ((notification_type_filter & NotificationDowntimeStart) ||
-	    notification_type_filter & (1<<NotificationDowntimeEnd) ||
+	    (notification_type_filter & NotificationDowntimeEnd) ||
-	    notification_type_filter & (1<<NotificationDowntimeRemoved))
+	    (notification_type_filter & NotificationDowntimeRemoved))
 		return 1;
 
 	return 0;

lib/icinga/customvarobject.cpp

@@ -33,3 +33,34 @@ void CustomVarObject::ValidateVars(const Dictionary::Ptr& value, const Validatio
 {
 	MacroProcessor::ValidateCustomVars(this, value);
 }
+
+int icinga::FilterArrayToInt(const Array::Ptr& typeFilters, const std::map<String, int>& filterMap, int defaultValue)
+{
+	Value resultTypeFilter;
+
+	if (!typeFilters)
+		return defaultValue;
+
+	resultTypeFilter = 0;
+
+	ObjectLock olock(typeFilters);
+	BOOST_FOREACH(const Value& typeFilter, typeFilters) {
+		if (typeFilter.IsNumber()) {
+			resultTypeFilter = resultTypeFilter | typeFilter;
+			continue;
+		}
+
+		if (!typeFilter.IsString())
+			return -1;
+
+		std::map<String, int>::const_iterator it = filterMap.find(typeFilter);
+
+		if (it == filterMap.end())
+			return -1;
+
+		resultTypeFilter = resultTypeFilter | it->second;
+	}
+
+	return resultTypeFilter;
+}
+

lib/icinga/customvarobject.hpp

@@ -41,6 +41,8 @@ public:
 	virtual void ValidateVars(const Dictionary::Ptr& value, const ValidationUtils& utils) override;
 };
 
+I2_ICINGA_API int FilterArrayToInt(const Array::Ptr& typeFilters, const std::map<String, int>& filterMap, int defaultValue);
+
 }
 
 #endif /* CUSTOMVAROBJECT_H */

lib/icinga/dependency.cpp

@@ -77,7 +77,7 @@ void Dependency::OnConfigLoaded(void)
 	else
 		defaultFilter = StateFilterOK | StateFilterWarning;
 
-	SetStateFilter(FilterArrayToInt(GetStates(), defaultFilter));
+	SetStateFilter(FilterArrayToInt(GetStates(), Notification::GetStateFilterMap(), defaultFilter));
 }
 
 void Dependency::OnAllConfigLoaded(void)
@@ -224,7 +224,7 @@ void Dependency::ValidateStates(const Array::Ptr& value, const ValidationUtils&
 {
 	ObjectImpl<Dependency>::ValidateStates(value, utils);
 
-	int sfilter = FilterArrayToInt(value, 0);
+	int sfilter = FilterArrayToInt(value, Notification::GetStateFilterMap(), 0);
 
 	if (GetParentServiceName().IsEmpty() && (sfilter & ~(StateFilterUp | StateFilterDown)) != 0)
 		BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("states"), "State filter is invalid for host dependency."));

lib/icinga/notification.cpp

@@ -37,6 +37,9 @@ using namespace icinga;
 REGISTER_TYPE(Notification);
 INITIALIZE_ONCE(&Notification::StaticInitialize);
 
+std::map<String, int> Notification::m_StateFilterMap;
+std::map<String, int> Notification::m_TypeFilterMap;
+
 boost::signals2::signal<void (const Notification::Ptr&, const MessageOrigin::Ptr&)> Notification::OnNextNotificationChanged;
 
 String NotificationNameComposer::MakeName(const String& shortName, const Object::Ptr& context) const
@@ -79,30 +82,47 @@ Dictionary::Ptr NotificationNameComposer::ParseName(const String& name) const
 
 void Notification::StaticInitialize(void)
 {
-	ScriptGlobal::Set("OK", StateFilterOK);
+	ScriptGlobal::Set("OK", "OK");
-	ScriptGlobal::Set("Warning", StateFilterWarning);
+	ScriptGlobal::Set("Warning", "Warning");
-	ScriptGlobal::Set("Critical", StateFilterCritical);
+	ScriptGlobal::Set("Critical", "Critical");
-	ScriptGlobal::Set("Unknown", StateFilterUnknown);
+	ScriptGlobal::Set("Unknown", "Unknown");
-	ScriptGlobal::Set("Up", StateFilterUp);
+	ScriptGlobal::Set("Up", "Up");
-	ScriptGlobal::Set("Down", StateFilterDown);
+	ScriptGlobal::Set("Down", "Down");
 
-	ScriptGlobal::Set("DowntimeStart", 1 << NotificationDowntimeStart);
+	ScriptGlobal::Set("DowntimeStart", "DowntimeStart");
-	ScriptGlobal::Set("DowntimeEnd", 1 << NotificationDowntimeEnd);
+	ScriptGlobal::Set("DowntimeEnd", "DowntimeEnd");
-	ScriptGlobal::Set("DowntimeRemoved", 1 << NotificationDowntimeRemoved);
+	ScriptGlobal::Set("DowntimeRemoved", "DowntimeRemoved");
-	ScriptGlobal::Set("Custom", 1 << NotificationCustom);
+	ScriptGlobal::Set("Custom", "Custom");
-	ScriptGlobal::Set("Acknowledgement", 1 << NotificationAcknowledgement);
+	ScriptGlobal::Set("Acknowledgement", "Acknowledgement");
-	ScriptGlobal::Set("Problem", 1 << NotificationProblem);
+	ScriptGlobal::Set("Problem", "Problem");
-	ScriptGlobal::Set("Recovery", 1 << NotificationRecovery);
+	ScriptGlobal::Set("Recovery", "Recovery");
-	ScriptGlobal::Set("FlappingStart", 1 << NotificationFlappingStart);
+	ScriptGlobal::Set("FlappingStart", "FlappingStart");
-	ScriptGlobal::Set("FlappingEnd", 1 << NotificationFlappingEnd);
+	ScriptGlobal::Set("FlappingEnd", "FlappingEnd");
+
+	m_StateFilterMap["OK"] = StateFilterOK;
+	m_StateFilterMap["Warning"] = StateFilterWarning;
+	m_StateFilterMap["Critical"] = StateFilterCritical;
+	m_StateFilterMap["Unknown"] = StateFilterUnknown;
+	m_StateFilterMap["Up"] = StateFilterUp;
+	m_StateFilterMap["Down"] = StateFilterDown;
+
+	m_TypeFilterMap["DowntimeStart"] = NotificationDowntimeStart;
+	m_TypeFilterMap["DowntimeEnd"] = NotificationDowntimeEnd;
+	m_TypeFilterMap["DowntimeRemoved"] = NotificationDowntimeRemoved;
+	m_TypeFilterMap["Custom"] = NotificationCustom;
+	m_TypeFilterMap["Acknowledgement"] = NotificationAcknowledgement;
+	m_TypeFilterMap["Problem"] = NotificationProblem;
+	m_TypeFilterMap["Recovery"] = NotificationRecovery;
+	m_TypeFilterMap["FlappingStart"] = NotificationFlappingStart;
+	m_TypeFilterMap["FlappingEnd"] = NotificationFlappingEnd;
 }
 
 void Notification::OnConfigLoaded(void)
 {
 	ObjectImpl<Notification>::OnConfigLoaded();
 
-	SetTypeFilter(FilterArrayToInt(GetTypes(), ~0));
+	SetTypeFilter(FilterArrayToInt(GetTypes(), GetTypeFilterMap(), ~0));
-	SetStateFilter(FilterArrayToInt(GetStates(), ~0));
+	SetStateFilter(FilterArrayToInt(GetStates(), GetStateFilterMap(), ~0));
 }
 
 void Notification::OnAllConfigLoaded(void)
@@ -280,18 +300,18 @@ void Notification::BeginExecuteNotification(NotificationType type, const CheckRe
 			}
 		}
 
-		unsigned long ftype = 1 << type;
+		unsigned long ftype = type;
 
 		Log(LogDebug, "Notification")
 		    << "Type '" << NotificationTypeToStringInternal(type)
-		    << "', TypeFilter " << NotificationFilterToString(GetTypeFilter())
+		    << "', TypeFilter: " << NotificationFilterToString(GetTypeFilter(), GetTypeFilterMap())
 		    << " (FType=" << ftype << ", TypeFilter=" << GetTypeFilter() << ")";
 
 		if (!(ftype & GetTypeFilter())) {
 			Log(LogNotice, "Notification")
 			    << "Not sending notifications for notification object '" << GetName() << "': type '"
-			    << NotificationTypeToStringInternal(type) << "' does not match type filter '"
+			    << NotificationTypeToStringInternal(type) << "' does not match type filter: "
-			    << NotificationFilterToString(GetTypeFilter()) << ".";
+			    << NotificationFilterToString(GetTypeFilter(), GetTypeFilterMap()) << ".";
 			return;
 		}
 
@@ -313,13 +333,13 @@ void Notification::BeginExecuteNotification(NotificationType type, const CheckRe
 			}
 
 			Log(LogDebug, "Notification")
-			    << "State '" << stateStr << "', StateFilter " << NotificationFilterToString(GetStateFilter())
+			    << "State '" << stateStr << "', StateFilter: " << NotificationFilterToString(GetStateFilter(), GetStateFilterMap())
 			    << " (FState=" << fstate << ", StateFilter=" << GetStateFilter() << ")";
 
 			if (!(fstate & GetStateFilter())) {
 				Log(LogNotice, "Notification")
 				    << "Not sending notifications for notification object '" << GetName() << "': state '" << stateStr
-				    << "' does not match state filter " << NotificationFilterToString(GetStateFilter()) << ".";
+				    << "' does not match state filter: " << NotificationFilterToString(GetStateFilter(), GetStateFilterMap()) << ".";
 				return;
 			}
 		}
@@ -412,11 +432,11 @@ bool Notification::CheckNotificationUserFilters(NotificationType type, const Use
 			return false;
 		}
 
-		unsigned long ftype = 1 << type;
+		unsigned long ftype = type;
 
 		Log(LogDebug, "Notification")
 		    << "User notification, Type '" << NotificationTypeToStringInternal(type)
-		    << "', TypeFilter " << NotificationFilterToString(user->GetTypeFilter())
+		    << "', TypeFilter: " << NotificationFilterToString(user->GetTypeFilter(), GetTypeFilterMap())
 		    << " (FType=" << ftype << ", TypeFilter=" << GetTypeFilter() << ")";
 
 
@@ -424,8 +444,8 @@ bool Notification::CheckNotificationUserFilters(NotificationType type, const Use
 			Log(LogNotice, "Notification")
 			    << "Not sending notifications for notification object '"
 			    << GetName() << " and user '" << user->GetName() << "': type '"
-			    << NotificationTypeToStringInternal(type) << "' does not match type filter "
+			    << NotificationTypeToStringInternal(type) << "' does not match type filter: "
-			    << NotificationFilterToString(user->GetTypeFilter()) << ".";
+			    << NotificationFilterToString(user->GetTypeFilter(), GetTypeFilterMap()) << ".";
 			return false;
 		}
 
@@ -448,15 +468,15 @@ bool Notification::CheckNotificationUserFilters(NotificationType type, const Use
 			}
 
 			Log(LogDebug, "Notification")
-			    << "User notification, State '" << stateStr << "', StateFilter "
+			    << "User notification, State '" << stateStr << "', StateFilter: "
-			    << NotificationFilterToString(user->GetStateFilter())
+			    << NotificationFilterToString(user->GetStateFilter(), GetStateFilterMap())
 			    << " (FState=" << fstate << ", StateFilter=" << user->GetStateFilter() << ")";
 
 			if (!(fstate & user->GetStateFilter())) {
 				Log(LogNotice, "Notification")
 				    << "Not sending notifications for notification object '"
 				    << GetName() << " and user '" << user->GetName() << "': state '" << stateStr
-				    << "' does not match state filter " << NotificationFilterToString(user->GetStateFilter()) << ".";
+				    << "' does not match state filter: " << NotificationFilterToString(user->GetStateFilter(), GetStateFilterMap()) << ".";
 				return false;
 			}
 		}
@@ -520,62 +540,17 @@ int icinga::HostStateToFilter(HostState state)
 	}
 }
 
-int icinga::FilterArrayToInt(const Array::Ptr& typeFilters, int defaultValue)
+String Notification::NotificationFilterToString(int filter, const std::map<String, int>& filterMap)
 {
-	Value resultTypeFilter;
+	std::vector<String> sFilters;
 
-	if (!typeFilters)
+	typedef std::pair<String, int> kv_pair;
-		return defaultValue;
+	BOOST_FOREACH(const kv_pair& kv, filterMap) {
-
+		if (filter & kv.second)
-	resultTypeFilter = 0;
+			sFilters.push_back(kv.first);
-
-	ObjectLock olock(typeFilters);
-	BOOST_FOREACH(const Value& typeFilter, typeFilters) {
-		resultTypeFilter = resultTypeFilter | typeFilter;
 	}
 
-	return resultTypeFilter;
+	return Utility::NaturalJoin(sFilters);
-}
-
-std::vector<String> icinga::FilterIntToArray(int iFilter)
-{
-	std::vector<String> filter;
-
-	if (iFilter & StateFilterOK)
-		filter.push_back("OK");
-	if (iFilter & StateFilterWarning)
-		filter.push_back("Warning");
-	if (iFilter & StateFilterUnknown)
-		filter.push_back("Unknown");
-	if (iFilter & StateFilterUp)
-		filter.push_back("Up");
-	if (iFilter & StateFilterDown)
-		filter.push_back("Down");
-	if (iFilter & NotificationDowntimeStart)
-		filter.push_back("DowntimeStart");
-	if (iFilter & NotificationDowntimeEnd)
-		filter.push_back("DowntimeEnd");
-	if (iFilter & NotificationDowntimeRemoved)
-		filter.push_back("DowntimeRemoved");
-	if (iFilter & NotificationCustom)
-		filter.push_back("Custom");
-	if (iFilter & NotificationAcknowledgement)
-		filter.push_back("Acknowledgement");
-	if (iFilter & NotificationProblem)
-		filter.push_back("Problem");
-	if (iFilter & NotificationRecovery)
-		filter.push_back("Recovery");
-	if (iFilter & NotificationFlappingStart)
-		filter.push_back("FlappingStart");
-	if (iFilter & NotificationFlappingEnd)
-		filter.push_back("FlappingEnd");
-
-	return filter;
-}
-
-String Notification::NotificationFilterToString(int filter)
-{
-	return Utility::NaturalJoin(FilterIntToArray(filter));
 }
 
 /* internal for logging */
@@ -651,12 +626,12 @@ void Notification::ValidateStates(const Array::Ptr& value, const ValidationUtils
 {
 	ObjectImpl<Notification>::ValidateStates(value, utils);
 
-	int sfilter = FilterArrayToInt(value, 0);
+	int filter = FilterArrayToInt(value, GetStateFilterMap(), 0);
 
-	if (GetServiceName().IsEmpty() && (sfilter & ~(StateFilterUp | StateFilterDown)) != 0)
+	if (GetServiceName().IsEmpty() && (filter == -1 || (filter & ~(StateFilterUp | StateFilterDown)) != 0))
 		BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("states"), "State filter is invalid."));
 
-	if (!GetServiceName().IsEmpty() && (sfilter & ~(StateFilterOK | StateFilterWarning | StateFilterCritical | StateFilterUnknown)) != 0)
+	if (!GetServiceName().IsEmpty() && (filter == -1 || (filter & ~(StateFilterOK | StateFilterWarning | StateFilterCritical | StateFilterUnknown)) != 0))
 		BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("types"), "State filter is invalid."));
 }
 
@@ -664,11 +639,11 @@ void Notification::ValidateTypes(const Array::Ptr& value, const ValidationUtils&
 {
 	ObjectImpl<Notification>::ValidateTypes(value, utils);
 
-	int tfilter = FilterArrayToInt(value, 0);
+	int filter = FilterArrayToInt(value, GetTypeFilterMap(), 0);
 
-	if ((tfilter & ~(1 << NotificationDowntimeStart | 1 << NotificationDowntimeEnd | 1 << NotificationDowntimeRemoved |
+	if (filter == -1 || (filter & ~(NotificationDowntimeStart | NotificationDowntimeEnd | NotificationDowntimeRemoved |
-	    1 << NotificationCustom | 1 << NotificationAcknowledgement | 1 << NotificationProblem | 1 << NotificationRecovery |
+	    NotificationCustom | NotificationAcknowledgement | NotificationProblem | NotificationRecovery |
-	    1 << NotificationFlappingStart | 1 << NotificationFlappingEnd)) != 0)
+	    NotificationFlappingStart | NotificationFlappingEnd)) != 0)
 		BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("types"), "Type filter is invalid."));
 }
 
@@ -677,3 +652,12 @@ Endpoint::Ptr Notification::GetCommandEndpoint(void) const
 	return Endpoint::GetByName(GetCommandEndpointRaw());
 }
 
+const std::map<String, int>& Notification::GetStateFilterMap(void)
+{
+	return m_StateFilterMap;
+}
+
+const std::map<String, int>& Notification::GetTypeFilterMap(void)
+{
+	return m_TypeFilterMap;
+}

lib/icinga/notification.hpp

@@ -55,15 +55,15 @@ enum NotificationFilter
  */
 enum NotificationType
 {
-	NotificationDowntimeStart = 0,
+	NotificationDowntimeStart = 1,
-	NotificationDowntimeEnd = 1,
+	NotificationDowntimeEnd = 2,
-	NotificationDowntimeRemoved = 2,
+	NotificationDowntimeRemoved = 4,
-	NotificationCustom = 3,
+	NotificationCustom = 8,
-	NotificationAcknowledgement = 4,
+	NotificationAcknowledgement = 16,
-	NotificationProblem = 5,
+	NotificationProblem = 32,
-	NotificationRecovery = 6,
+	NotificationRecovery = 64,
-	NotificationFlappingStart = 7 ,
+	NotificationFlappingStart = 128,
-	NotificationFlappingEnd = 8,
+	NotificationFlappingEnd = 256
 };
 
 class NotificationCommand;
@@ -101,7 +101,7 @@ public:
 	Endpoint::Ptr GetCommandEndpoint(void) const;
 
 	static String NotificationTypeToString(NotificationType type);
-	static String NotificationFilterToString(int filter);
+	static String NotificationFilterToString(int filter, const std::map<String, int>& filterMap);
 
 	static boost::signals2::signal<void (const Notification::Ptr&, const MessageOrigin::Ptr&)> OnNextNotificationChanged;
 
@@ -115,6 +115,9 @@ public:
 	static void EvaluateApplyRules(const intrusive_ptr<Host>& host);
 	static void EvaluateApplyRules(const intrusive_ptr<Service>& service);
 
+	static const std::map<String, int>& GetStateFilterMap(void);
+	static const std::map<String, int>& GetTypeFilterMap(void);
+
 protected:
 	virtual void OnConfigLoaded(void) override;
 	virtual void OnAllConfigLoaded(void) override;
@@ -132,12 +135,13 @@ private:
 	static String NotificationTypeToStringInternal(NotificationType type);
 	static String NotificationServiceStateToString(ServiceState state);
 	static String NotificationHostStateToString(HostState state);
+
+	static std::map<String, int> m_StateFilterMap;
+	static std::map<String, int> m_TypeFilterMap;
 };
 
 I2_ICINGA_API int ServiceStateToFilter(ServiceState state);
 I2_ICINGA_API int HostStateToFilter(HostState state);
-I2_ICINGA_API int FilterArrayToInt(const Array::Ptr& typeFilters, int defaultValue);
-I2_ICINGA_API std::vector<String> FilterIntToArray(int iFilter);
 
 }
 

lib/icinga/notification.ti

@@ -56,9 +56,9 @@ class Notification : CustomVarObject < NotificationNameComposer
 	[config, protected] array(name(User)) users (UsersRaw);
 	[config, protected] array(name(UserGroup)) user_groups (UserGroupsRaw);
 	[config] Dictionary::Ptr times;
-	[config] array(double) types;
+	[config] array(Value) types;
 	int type_filter_real (TypeFilter);
-	[config] array(double) states;
+	[config] array(Value) states;
 	int state_filter_real (StateFilter);
 	[config, protected, required, navigation(host)] name(Host) host_name {
 		navigate {{{

lib/icinga/user.cpp

@@ -34,8 +34,8 @@ void User::OnConfigLoaded(void)
 {
 	ObjectImpl<User>::OnConfigLoaded();
 
-	SetTypeFilter(FilterArrayToInt(GetTypes(), ~0));
+	SetTypeFilter(FilterArrayToInt(GetTypes(), Notification::GetTypeFilterMap(), ~0));
-	SetStateFilter(FilterArrayToInt(GetStates(), ~0));
+	SetStateFilter(FilterArrayToInt(GetStates(), Notification::GetStateFilterMap(), ~0));
 }
 
 void User::OnAllConfigLoaded(void)
@@ -102,22 +102,20 @@ void User::ValidateStates(const Array::Ptr& value, const ValidationUtils& utils)
 {
 	ObjectImpl<User>::ValidateStates(value, utils);
 
-	int sfilter = FilterArrayToInt(value, 0);
+	int filter = FilterArrayToInt(value, Notification::GetStateFilterMap(), 0);
 
-	if ((sfilter & ~(StateFilterUp | StateFilterDown | StateFilterOK | StateFilterWarning | StateFilterCritical | StateFilterUnknown)) != 0) {
+	if (filter == -1 || (filter & ~(StateFilterUp | StateFilterDown | StateFilterOK | StateFilterWarning | StateFilterCritical | StateFilterUnknown)) != 0)
 		BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("states"), "State filter is invalid."));
-	}
 }
 
 void User::ValidateTypes(const Array::Ptr& value, const ValidationUtils& utils)
 {
 	ObjectImpl<User>::ValidateTypes(value, utils);
 
-	int tfilter = FilterArrayToInt(value, 0);
+	int filter = FilterArrayToInt(value, Notification::GetTypeFilterMap(), 0);
 
-	if ((tfilter & ~(1 << NotificationDowntimeStart | 1 << NotificationDowntimeEnd | 1 << NotificationDowntimeRemoved |
+	if (filter == -1 || (filter & ~(NotificationDowntimeStart | NotificationDowntimeEnd | NotificationDowntimeRemoved |
-	    1 << NotificationCustom | 1 << NotificationAcknowledgement | 1 << NotificationProblem | 1 << NotificationRecovery |
+	    NotificationCustom | NotificationAcknowledgement | NotificationProblem | NotificationRecovery |
-	    1 << NotificationFlappingStart | 1 << NotificationFlappingEnd)) != 0) {
+	    NotificationFlappingStart | NotificationFlappingEnd)) != 0)
 		BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("types"), "Type filter is invalid."));
-	}
 }

lib/icinga/user.ti

@@ -44,9 +44,9 @@ class User : CustomVarObject
 		}}}
 	};
 
-	[config] array(double) types;
+	[config] array(Value) types;
 	int type_filter_real (TypeFilter);
-	[config] array(double) states;
+	[config] array(Value) states;
 	int state_filter_real (StateFilter);
 
 	[config] String email;