Move CompatUtility::GetCheckableInCheckPeriod() into Livestatus feature

[icinga2] / lib / livestatus / servicestable.cpp

diff --git a/lib/livestatus/servicestable.cpp b/lib/livestatus/servicestable.cpp
index d88c3a90633c06bf023ebbe6b34547f5d90b685c..00b11616ca5abb4e3d628b7214e24df482d8d8f5 100644 (file)
--- a/lib/livestatus/servicestable.cpp
+++ b/lib/livestatus/servicestable.cpp
@@ -31,6 +31,7 @@
 #include "icinga/macroprocessor.hpp"
 #include "icinga/icingaapplication.hpp"
 #include "icinga/compatutility.hpp"
+#include "icinga/pluginutility.hpp"
 #include "base/configtype.hpp"
 #include "base/objectlock.hpp"
 #include "base/json.hpp"
@@ -342,10 +343,10 @@ Value ServicesTable::PerfDataAccessor(const Value& row)
        String perfdata;
        CheckResult::Ptr cr = service->GetLastCheckResult();
 
-       if (cr)
-               perfdata = CompatUtility::GetCheckResultPerfdata(cr);
+       if (!cr)
+               return Empty;
 
-       return perfdata;
+       return PluginUtility::FormatPerfdata(cr->GetPerformanceData());
 }
 
 Value ServicesTable::CheckPeriodAccessor(const Value& row)
@@ -894,7 +895,13 @@ Value ServicesTable::InCheckPeriodAccessor(const Value& row)
        if (!service)
                return Empty;
 
-       return CompatUtility::GetCheckableInCheckPeriod(service);
+       TimePeriod::Ptr timeperiod = service->GetCheckPeriod();
+
+       /* none set means always checked */
+       if (!timeperiod)
+               return 1;
+
+       return Convert::ToLong(timeperiod->IsInside(Utility::GetTime()));
 }
 
 Value ServicesTable::InNotificationPeriodAccessor(const Value& row)
@@ -1043,7 +1050,7 @@ Value ServicesTable::CustomVariableNamesAccessor(const Value& row)
 
        {
                ObjectLock olock(service);
-               vars = CompatUtility::GetCustomAttributeConfig(service);
+               vars = service->GetVars();
        }
 
        Array::Ptr cv = new Array();
@@ -1070,7 +1077,7 @@ Value ServicesTable::CustomVariableValuesAccessor(const Value& row)
 
        {
                ObjectLock olock(service);
-               vars = CompatUtility::GetCustomAttributeConfig(service);
+               vars = service->GetVars();
        }
 
        Array::Ptr cv = new Array();
@@ -1100,7 +1107,7 @@ Value ServicesTable::CustomVariablesAccessor(const Value& row)
 
        {
                ObjectLock olock(service);
-               vars = CompatUtility::GetCustomAttributeConfig(service);
+               vars = service->GetVars();
        }
 
        Array::Ptr cv = new Array();
@@ -1135,7 +1142,7 @@ Value ServicesTable::CVIsJsonAccessor(const Value& row)
 
        {
                ObjectLock olock(service);
-               vars = CompatUtility::GetCustomAttributeConfig(service);
+               vars = service->GetVars();
        }
 
        if (!vars)