From e623394af18464299e804efb8f1be3052f299a91 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Thu, 10 Dec 2015 15:27:49 +0100 Subject: [PATCH] Use NodeName instead of GetFQDN() in embedded checks fixes #10818 --- lib/methods/nullchecktask.cpp | 3 ++- lib/methods/randomchecktask.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/methods/nullchecktask.cpp b/lib/methods/nullchecktask.cpp index cbbe27467..78d849ee2 100644 --- a/lib/methods/nullchecktask.cpp +++ b/lib/methods/nullchecktask.cpp @@ -22,6 +22,7 @@ #endif /* _WIN32 */ #include "methods/nullchecktask.hpp" #include "icinga/perfdatavalue.hpp" +#include "icinga/icingaapplication.hpp" #include "base/utility.hpp" #include "base/convert.hpp" #include "base/function.hpp" @@ -38,7 +39,7 @@ void NullCheckTask::ScriptFunc(const Checkable::Ptr& service, const CheckResult: return; String output = "Hello from "; - output += Utility::GetFQDN(); + output += IcingaApplication::GetInstance()->GetNodeName(); Array::Ptr perfdata = new Array(); perfdata->Add(new PerfdataValue("time", Convert::ToDouble(Utility::GetTime()))); diff --git a/lib/methods/randomchecktask.cpp b/lib/methods/randomchecktask.cpp index 095c60f1b..0af8928ff 100644 --- a/lib/methods/randomchecktask.cpp +++ b/lib/methods/randomchecktask.cpp @@ -22,6 +22,7 @@ #endif /* _WIN32 */ #include "methods/randomchecktask.hpp" #include "icinga/perfdatavalue.hpp" +#include "icinga/icingaapplication.hpp" #include "base/utility.hpp" #include "base/convert.hpp" #include "base/function.hpp" @@ -38,7 +39,7 @@ void RandomCheckTask::ScriptFunc(const Checkable::Ptr& service, const CheckResul return; String output = "Hello from "; - output += Utility::GetFQDN(); + output += IcingaApplication::GetInstance()->GetNodeName(); Array::Ptr perfdata = new Array(); perfdata->Add(new PerfdataValue("time", Convert::ToDouble(Utility::GetTime()))); -- 2.40.0