tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

StatusDataWriter: Fix wrong host notification filters 

fixes #8387
refs #8192
This commit is contained in:
Michael Friedrich 2015-02-07 22:46:34 +01:00
parent ea2ac81003
commit 9302a6d03c
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/icinga/compatutility.cpp
View File

@ -544,6 +544,11 @@ String CompatUtility::GetCheckableNotificationNotificationPeriod(const Checkable
String CompatUtility::GetCheckableNotificationNotificationOptions(const Checkable::Ptr& checkable)
{
Host::Ptr host;
Service::Ptr service;
tie(host, service) = GetHostService(checkable);
unsigned long notification_type_filter = 0;
unsigned long notification_state_filter = 0;
@ -555,14 +560,20 @@ String CompatUtility::GetCheckableNotificationNotificationOptions(const Checkabl
std::vector<String> notification_options;
/* notification state filters */
if (notification_state_filter & (1<<ServiceWarning)) {
notification_options.push_back("w");
}
if (notification_state_filter & (1<<ServiceUnknown)) {
notification_options.push_back("u");
}
if (notification_state_filter & (1<<ServiceCritical)) {
notification_options.push_back("c");
if (service) {
if (notification_state_filter & (1<<ServiceWarning)) {
notification_options.push_back("w");
}
if (notification_state_filter & (1<<ServiceUnknown)) {
notification_options.push_back("u");
}
if (notification_state_filter & (1<<ServiceCritical)) {
notification_options.push_back("c");
}
} else {
if (notification_state_filter & (1<<HostDown)) {
notification_options.push_back("d");
}
}
/* notification type filters */