tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-23 13:45:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Drop CompatUtility::GetCheckResultPerfdata()

Browse Source
This commit is contained in:
Michael Friedrich 2017-12-06 17:03:56 +01:00
parent 906c1accaa
commit 87b99c17b5
8 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/compat/statusdatawriter.cpp
View File

@ -28,6 +28,7 @@
#include "icinga/timeperiod.hpp" #include "icinga/timeperiod.hpp"
#include "icinga/notificationcommand.hpp" #include "icinga/notificationcommand.hpp"
#include "icinga/compatutility.hpp" #include "icinga/compatutility.hpp"
#include "icinga/pluginutility.hpp"
#include "icinga/dependency.hpp" #include "icinga/dependency.hpp"
#include "base/configtype.hpp" #include "base/configtype.hpp"
#include "base/objectlock.hpp" #include "base/objectlock.hpp"
@ -366,13 +367,12 @@ void StatusDataWriter::DumpCheckableStatusAttrs(std::ostream& fp, const Checkabl
} }
fp << "\t" "state_type=" << checkable->GetStateType() << "\n" fp << "\t" "state_type=" << checkable->GetStateType() << "\n"
"\t" "plugin_output=" << CompatUtility::GetCheckResultOutput(cr) << "\n" "\t" "last_check=" << static_cast<long>(host->GetLastCheck()) << "\n";
"\t" "long_plugin_output=" << CompatUtility::GetCheckResultLongOutput(cr) << "\n"
"\t" "performance_data=" << CompatUtility::GetCheckResultPerfdata(cr) << "\n";
if (cr) { if (cr) {
fp << "\t" << "check_source=" << cr->GetCheckSource() << "\n" fp << "\t" "plugin_output=" << CompatUtility::GetCheckResultOutput(cr) << "\n"
"\t" "last_check=" << static_cast<long>(cr->GetScheduleEnd()) << "\n"; "\t" "long_plugin_output=" << CompatUtility::GetCheckResultLongOutput(cr) << "\n"
"\t" "performance_data=" << PluginUtility::FormatPerfdata(cr->GetPerformanceData()) << "\n"
} }
fp << "\t" << "next_check=" << static_cast<long>(checkable->GetNextCheck()) << "\n" fp << "\t" << "next_check=" << static_cast<long>(checkable->GetNextCheck()) << "\n"

3
lib/db_ido/dbevents.cpp
View File

@ -32,6 +32,7 @@
#include "icinga/eventcommand.hpp" #include "icinga/eventcommand.hpp"
#include "icinga/externalcommandprocessor.hpp" #include "icinga/externalcommandprocessor.hpp"
#include "icinga/compatutility.hpp" #include "icinga/compatutility.hpp"
#include "icinga/pluginutility.hpp"
#include "icinga/icingaapplication.hpp" #include "icinga/icingaapplication.hpp"
#include <boost/algorithm/string/join.hpp> #include <boost/algorithm/string/join.hpp>
@ -1411,7 +1412,7 @@ void DbEvents::AddCheckableCheckHistory(const Checkable::Ptr& checkable, const C
fields1->Set("return_code", cr->GetExitStatus()); fields1->Set("return_code", cr->GetExitStatus());
fields1->Set("output", CompatUtility::GetCheckResultOutput(cr)); fields1->Set("output", CompatUtility::GetCheckResultOutput(cr));
fields1->Set("long_output", CompatUtility::GetCheckResultLongOutput(cr)); fields1->Set("long_output", CompatUtility::GetCheckResultLongOutput(cr));
fields1->Set("perfdata", CompatUtility::GetCheckResultPerfdata(cr)); fields1->Set("perfdata", PluginUtility::FormatPerfdata(cr->GetPerformanceData()));
fields1->Set("instance_id", 0); /* DbConnection class fills in real ID */ fields1->Set("instance_id", 0); /* DbConnection class fills in real ID */

3
lib/db_ido/hostdbobject.cpp
View File

@ -29,6 +29,7 @@
#include "icinga/checkcommand.hpp" #include "icinga/checkcommand.hpp"
#include "icinga/eventcommand.hpp" #include "icinga/eventcommand.hpp"
#include "icinga/compatutility.hpp" #include "icinga/compatutility.hpp"
#include "icinga/pluginutility.hpp"
#include "base/convert.hpp" #include "base/convert.hpp"
#include "base/objectlock.hpp" #include "base/objectlock.hpp"
#include "base/logger.hpp" #include "base/logger.hpp"
@ -127,7 +128,7 @@ Dictionary::Ptr HostDbObject::GetStatusFields() const
if (cr) { if (cr) {
fields->Set("output", CompatUtility::GetCheckResultOutput(cr)); fields->Set("output", CompatUtility::GetCheckResultOutput(cr));
fields->Set("long_output", CompatUtility::GetCheckResultLongOutput(cr)); fields->Set("long_output", CompatUtility::GetCheckResultLongOutput(cr));
fields->Set("perfdata", CompatUtility::GetCheckResultPerfdata(cr)); fields->Set("perfdata", PluginUtility::FormatPerfdata(cr->GetPerformanceData()));
fields->Set("check_source", cr->GetCheckSource()); fields->Set("check_source", cr->GetCheckSource());
} }

3
lib/db_ido/servicedbobject.cpp
View File

@ -28,6 +28,7 @@
#include "icinga/eventcommand.hpp" #include "icinga/eventcommand.hpp"
#include "icinga/externalcommandprocessor.hpp" #include "icinga/externalcommandprocessor.hpp"
#include "icinga/compatutility.hpp" #include "icinga/compatutility.hpp"
#include "icinga/pluginutility.hpp"
#include "icinga/icingaapplication.hpp" #include "icinga/icingaapplication.hpp"
#include "remote/endpoint.hpp" #include "remote/endpoint.hpp"
#include "base/convert.hpp" #include "base/convert.hpp"
@ -114,7 +115,7 @@ Dictionary::Ptr ServiceDbObject::GetStatusFields() const
if (cr) { if (cr) {
fields->Set("output", CompatUtility::GetCheckResultOutput(cr)); fields->Set("output", CompatUtility::GetCheckResultOutput(cr));
fields->Set("long_output", CompatUtility::GetCheckResultLongOutput(cr)); fields->Set("long_output", CompatUtility::GetCheckResultLongOutput(cr));
fields->Set("perfdata", CompatUtility::GetCheckResultPerfdata(cr)); fields->Set("perfdata", PluginUtility::FormatPerfdata(cr->GetPerformanceData()));
fields->Set("check_source", cr->GetCheckSource()); fields->Set("check_source", cr->GetCheckSource());
} }

8
lib/icinga/compatutility.cpp
View File

@ -485,14 +485,6 @@ String CompatUtility::GetCheckResultLongOutput(const CheckResult::Ptr& cr)
return Empty; return Empty;
} }
String CompatUtility::GetCheckResultPerfdata(const CheckResult::Ptr& cr)
{
if (!cr)
return String();
return PluginUtility::FormatPerfdata(cr->GetPerformanceData());
}
String CompatUtility::EscapeString(const String& str) String CompatUtility::EscapeString(const String& str)
{ {
String result = str; String result = str;

1
lib/icinga/compatutility.hpp
View File

@ -81,7 +81,6 @@ public:
/* check result */ /* check result */
static String GetCheckResultOutput(const CheckResult::Ptr& cr); static String GetCheckResultOutput(const CheckResult::Ptr& cr);
static String GetCheckResultLongOutput(const CheckResult::Ptr& cr); static String GetCheckResultLongOutput(const CheckResult::Ptr& cr);
static String GetCheckResultPerfdata(const CheckResult::Ptr& cr);
/* misc */ /* misc */
static String EscapeString(const String& str); static String EscapeString(const String& str);

7
lib/livestatus/hoststable.cpp
View File

@ -29,6 +29,7 @@
#include "icinga/macroprocessor.hpp" #include "icinga/macroprocessor.hpp"
#include "icinga/icingaapplication.hpp" #include "icinga/icingaapplication.hpp"
#include "icinga/compatutility.hpp" #include "icinga/compatutility.hpp"
#include "icinga/pluginutility.hpp"
#include "base/configtype.hpp" #include "base/configtype.hpp"
#include "base/objectlock.hpp" #include "base/objectlock.hpp"
#include "base/json.hpp" #include "base/json.hpp"
@ -407,10 +408,10 @@ Value HostsTable::PerfDataAccessor(const Value& row)
String perfdata; String perfdata;
CheckResult::Ptr cr = host->GetLastCheckResult(); CheckResult::Ptr cr = host->GetLastCheckResult();
if (cr) if (!cr)
perfdata = CompatUtility::GetCheckResultPerfdata(cr); return Empty;
return perfdata; return PluginUtility::FormatPerfdata(cr->GetPerformanceData());
} }
Value HostsTable::IconImageAccessor(const Value& row) Value HostsTable::IconImageAccessor(const Value& row)

7
lib/livestatus/servicestable.cpp
View File

@ -31,6 +31,7 @@
#include "icinga/macroprocessor.hpp" #include "icinga/macroprocessor.hpp"
#include "icinga/icingaapplication.hpp" #include "icinga/icingaapplication.hpp"
#include "icinga/compatutility.hpp" #include "icinga/compatutility.hpp"
#include "icinga/pluginutility.hpp"
#include "base/configtype.hpp" #include "base/configtype.hpp"
#include "base/objectlock.hpp" #include "base/objectlock.hpp"
#include "base/json.hpp" #include "base/json.hpp"
@ -342,10 +343,10 @@ Value ServicesTable::PerfDataAccessor(const Value& row)
String perfdata; String perfdata;
CheckResult::Ptr cr = service->GetLastCheckResult(); CheckResult::Ptr cr = service->GetLastCheckResult();
if (cr) if (!cr)
perfdata = CompatUtility::GetCheckResultPerfdata(cr); return Empty;
return perfdata; return PluginUtility::FormatPerfdata(cr->GetPerformanceData());
} }
Value ServicesTable::CheckPeriodAccessor(const Value& row) Value ServicesTable::CheckPeriodAccessor(const Value& row)