From: Michael Friedrich <michael.friedrich@netways.de>
Date: Thu, 10 Dec 2015 14:27:49 +0000 (+0100)
Subject: Use NodeName instead of GetFQDN() in embedded checks
X-Git-Tag: v2.4.2~150
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e623394af18464299e804efb8f1be3052f299a91;p=icinga2

Use NodeName instead of GetFQDN() in embedded checks

fixes #10818
---

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())));