Move CompatUtility::GetCheckableCheckType() into IDO/Livestatus features

It is just boolean mapping to numbers, each modules does that in a sort of different way.

DB IDO automatically transforms boolean to numbers.
Livestatus would return JSON which keeps true booleans, but requires a number (just a guess,
there is no spec for this message format).

diff --git a/lib/db_ido/dbevents.cpp b/lib/db_ido/dbevents.cpp
index ab2ba3e2b06173be20b2526df88d8f683af95a8b..6f4e567dc2849f920e98717200d40bbf878f24c8 100644 (file)
--- a/lib/db_ido/dbevents.cpp
+++ b/lib/db_ido/dbevents.cpp
@@ -1395,7 +1395,7 @@ void DbEvents::AddCheckableCheckHistory(const Checkable::Ptr& checkable, const C
        query1.Category = DbCatCheck;
 
        Dictionary::Ptr fields1 = new Dictionary();
-       fields1->Set("check_type", CompatUtility::GetCheckableCheckType(checkable));
+       fields1->Set("check_type", !checkable->GetEnableActiveChecks()); /* 0 .. active, 1 .. passive */
        fields1->Set("current_check_attempt", checkable->GetCheckAttempt());
        fields1->Set("max_check_attempts", checkable->GetMaxCheckAttempts());
        fields1->Set("state_type", checkable->GetStateType());

diff --git a/lib/db_ido/hostdbobject.cpp b/lib/db_ido/hostdbobject.cpp
index 28343d48c9365f0116f64f26fc8cbaeb6da63334..dc9271416dac619df5a62684523991ccc58dfd4c 100644 (file)
--- a/lib/db_ido/hostdbobject.cpp
+++ b/lib/db_ido/hostdbobject.cpp
@@ -141,7 +141,7 @@ Dictionary::Ptr HostDbObject::GetStatusFields() const
                fields->Set("last_check", DbValue::FromTimestamp(cr->GetScheduleEnd()));
 
        fields->Set("next_check", DbValue::FromTimestamp(host->GetNextCheck()));
-       fields->Set("check_type", CompatUtility::GetCheckableCheckType(host));
+       fields->Set("check_type", !host->GetEnableActiveChecks()); /* 0 .. active, 1 .. passive */
        fields->Set("last_state_change", DbValue::FromTimestamp(host->GetLastStateChange()));
        fields->Set("last_hard_state_change", DbValue::FromTimestamp(host->GetLastHardStateChange()));
        fields->Set("last_hard_state", host->GetLastHardState());

diff --git a/lib/db_ido/servicedbobject.cpp b/lib/db_ido/servicedbobject.cpp
index 2c82e8b23f72edc0392b51bd8b1c7e72057c7107..048122f13d97e4bd8f285b2803784df1e98a6245 100644 (file)
--- a/lib/db_ido/servicedbobject.cpp
+++ b/lib/db_ido/servicedbobject.cpp
@@ -128,7 +128,7 @@ Dictionary::Ptr ServiceDbObject::GetStatusFields() const
                fields->Set("last_check", DbValue::FromTimestamp(cr->GetScheduleEnd()));
 
        fields->Set("next_check", DbValue::FromTimestamp(service->GetNextCheck()));
-       fields->Set("check_type", CompatUtility::GetCheckableCheckType(service));
+       fields->Set("check_type", !service->GetEnableActiveChecks()); /* 0 .. active, 1 .. passive */
        fields->Set("last_state_change", DbValue::FromTimestamp(service->GetLastStateChange()));
        fields->Set("last_hard_state_change", DbValue::FromTimestamp(service->GetLastHardStateChange()));
        fields->Set("last_hard_state", service->GetLastHardState());

diff --git a/lib/icinga/compatutility.cpp b/lib/icinga/compatutility.cpp
index f4b0e6fce9ffc733643f3dfb20c3d37a408e0213..bea2dc1ecc46070d4e1058a27a9043db1b433b87 100644 (file)
--- a/lib/icinga/compatutility.cpp
+++ b/lib/icinga/compatutility.cpp
@@ -183,11 +183,6 @@ String CompatUtility::GetCheckableCommandArgs(const Checkable::Ptr& checkable)
        return Empty;
 }
 
-int CompatUtility::GetCheckableCheckType(const Checkable::Ptr& checkable)
-{
-       return (checkable->GetEnableActiveChecks() ? 0 : 1);
-}
-
 double CompatUtility::GetCheckableCheckInterval(const Checkable::Ptr& checkable)
 {
        return checkable->GetCheckInterval() / 60.0;

diff --git a/lib/icinga/compatutility.hpp b/lib/icinga/compatutility.hpp
index 62c437c1927f5c79929c768ffe61df8586762056..d6408534bc06fceedb152bbd069d5f9cc6aeb8d3 100644 (file)
--- a/lib/icinga/compatutility.hpp
+++ b/lib/icinga/compatutility.hpp
@@ -51,7 +51,6 @@ public:
 
        /* service */
        static String GetCheckableCommandArgs(const Checkable::Ptr& checkable);
-       static int GetCheckableCheckType(const Checkable::Ptr& checkable);
        static double GetCheckableCheckInterval(const Checkable::Ptr& checkable);
        static double GetCheckableRetryInterval(const Checkable::Ptr& checkable);
        static String GetCheckableCheckPeriod(const Checkable::Ptr& checkable);

diff --git a/lib/livestatus/hoststable.cpp b/lib/livestatus/hoststable.cpp
index a3c99d12345b05fc4ccb0e6c38581bccaabf9725..e2b920134d33119f2d4d44520e87cd6066562bc2 100644 (file)
--- a/lib/livestatus/hoststable.cpp
+++ b/lib/livestatus/hoststable.cpp
@@ -522,7 +522,7 @@ Value HostsTable::CheckTypeAccessor(const Value& row)
        if (!host)
                return Empty;
 
-       return CompatUtility::GetCheckableCheckType(host);
+       return (host->GetEnableActiveChecks() ? 0 : 1); /* 0 .. active, 1 .. passive */
 }
 
 Value HostsTable::LastStateAccessor(const Value& row)

diff --git a/lib/livestatus/servicestable.cpp b/lib/livestatus/servicestable.cpp
index 6c15efe4d06cb364d85b318b2a428fa6e5d3a406..d3ecee4cb1c39ddc1aa689da56656f069fd4641a 100644 (file)
--- a/lib/livestatus/servicestable.cpp
+++ b/lib/livestatus/servicestable.cpp
@@ -549,7 +549,7 @@ Value ServicesTable::CheckTypeAccessor(const Value& row)
        if (!service)
                return Empty;
 
-       return CompatUtility::GetCheckableCheckType(service);
+       return (service->GetEnableActiveChecks() ? 0 : 1); /* 0 .. active, 1 .. passive */
 }
 
 Value ServicesTable::AcknowledgedAccessor(const Value& row)