tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-29 08:34:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove the uncheckable state.

Browse Source
This commit is contained in:
Gunnar Beutner 2013-10-01 13:12:04 +02:00
parent 5a6b7ffb78
commit 400fe5e13c
4 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
itl/constants.conf
View File

@ -21,7 +21,6 @@ set StateOK = (0)
set StateWarning = (1) set StateWarning = (1)
set StateCritical = (2) set StateCritical = (2)
set StateUnknown = (3) set StateUnknown = (3)
set StateUncheckable = (4)
/* /*
* Converting states to their filter values: 1<<state * Converting states to their filter values: 1<<state
@ -30,7 +29,6 @@ set StateFilterOK = (1<<StateOK)
set StateFilterWarning = (1<<StateWarning) set StateFilterWarning = (1<<StateWarning)
set StateFilterCritical = (1<<StateCritical) set StateFilterCritical = (1<<StateCritical)
set StateFilterUnknown = (1<<StateUnknown) set StateFilterUnknown = (1<<StateUnknown)
set StateFilterUncheckable = (1<<StateUncheckable)
set NotificationDowntimeStart = (0) set NotificationDowntimeStart = (0)
set NotificationDowntimeEnd = (1) set NotificationDowntimeEnd = (1)

4
lib/icinga/compatutility.cpp
View File

@ -119,10 +119,6 @@ Dictionary::Ptr CompatUtility::GetHostConfigAttributes(const Host::Ptr& host)
attr->Set("notify_on_down", 1); attr->Set("notify_on_down", 1);
notification_options.push_back("d"); notification_options.push_back("d");
} }
if (notification_state_filter & (1<<StateUncheckable)) {
attr->Set("notify_on_unreachable", 1);
notification_options.push_back("u");
}
/* notification type filters */ /* notification type filters */
if (notification_type_filter & (1<<NotificationRecovery)) { if (notification_type_filter & (1<<NotificationRecovery)) {

3
lib/icinga/host.h
View File

@ -53,8 +53,7 @@ enum ServiceState
StateOK = 0, StateOK = 0,
StateWarning = 1, StateWarning = 1,
StateCritical = 2, StateCritical = 2,
StateUnknown = 3, StateUnknown = 3
StateUncheckable = 4,
}; };
/** /**

4
lib/icinga/service-check.cpp
View File

@ -659,8 +659,6 @@ ServiceState Service::StateFromString(const String& state)
return StateWarning; return StateWarning;
else if (state == "CRITICAL") else if (state == "CRITICAL")
return StateCritical; return StateCritical;
else if (state == "UNCHECKABLE")
return StateUncheckable;
else else
return StateUnknown; return StateUnknown;
} }
@ -674,8 +672,6 @@ String Service::StateToString(ServiceState state)
return "WARNING"; return "WARNING";
case StateCritical: case StateCritical:
return "CRITICAL"; return "CRITICAL";
case StateUncheckable:
return "UNCHECKABLE";
case StateUnknown: case StateUnknown:
default: default:
return "UNKNOWN"; return "UNKNOWN";