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

Use NodeName instead of GetFQDN() in embedded checks

Browse Source 
fixes #10818
This commit is contained in:
Michael Friedrich 2015-12-10 15:27:49 +01:00
parent 0813e69a41
commit dc85b1c6fb
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/methods/nullchecktask.cpp
View File

@ -22,6 +22,7 @@
#endif /* _WIN32 */ #endif /* _WIN32 */
#include "methods/nullchecktask.hpp" #include "methods/nullchecktask.hpp"
#include "icinga/perfdatavalue.hpp" #include "icinga/perfdatavalue.hpp"
#include "icinga/icingaapplication.hpp"
#include "base/utility.hpp" #include "base/utility.hpp"
#include "base/convert.hpp" #include "base/convert.hpp"
#include "base/function.hpp" #include "base/function.hpp"
@ -38,7 +39,7 @@ void NullCheckTask::ScriptFunc(const Checkable::Ptr& service, const CheckResult:
return; return;
String output = "Hello from "; String output = "Hello from ";
output += Utility::GetFQDN(); output += IcingaApplication::GetInstance()->GetNodeName();
Array::Ptr perfdata = new Array(); Array::Ptr perfdata = new Array();
perfdata->Add(new PerfdataValue("time", Convert::ToDouble(Utility::GetTime()))); perfdata->Add(new PerfdataValue("time", Convert::ToDouble(Utility::GetTime())));

3
lib/methods/randomchecktask.cpp
View File

@ -22,6 +22,7 @@
#endif /* _WIN32 */ #endif /* _WIN32 */
#include "methods/randomchecktask.hpp" #include "methods/randomchecktask.hpp"
#include "icinga/perfdatavalue.hpp" #include "icinga/perfdatavalue.hpp"
#include "icinga/icingaapplication.hpp"
#include "base/utility.hpp" #include "base/utility.hpp"
#include "base/convert.hpp" #include "base/convert.hpp"
#include "base/function.hpp" #include "base/function.hpp"
@ -38,7 +39,7 @@ void RandomCheckTask::ScriptFunc(const Checkable::Ptr& service, const CheckResul
return; return;
String output = "Hello from "; String output = "Hello from ";
output += Utility::GetFQDN(); output += IcingaApplication::GetInstance()->GetNodeName();
Array::Ptr perfdata = new Array(); Array::Ptr perfdata = new Array();
perfdata->Add(new PerfdataValue("time", Convert::ToDouble(Utility::GetTime()))); perfdata->Add(new PerfdataValue("time", Convert::ToDouble(Utility::GetTime())));