]> granicus.if.org Git - icinga2/commitdiff
Remove duplicate last_check runtime macro
authorMichael Friedrich <michael.friedrich@netways.de>
Thu, 16 Jun 2016 15:39:59 +0000 (17:39 +0200)
committerMichael Friedrich <michael.friedrich@netways.de>
Thu, 16 Jun 2016 15:39:59 +0000 (17:39 +0200)
Already available as {host,service}.last_check attribute.

refs #11483

lib/icinga/host.cpp
lib/icinga/service.cpp

index dd166aa3b7a239dea144862f8fa24ab507cc84e4..af6cab8e0cc593bfdbbe2ea74e7fa6996d3174d6 100644 (file)
@@ -300,9 +300,6 @@ bool Host::ResolveMacro(const String& macro, const CheckResult::Ptr&, Value *res
                } else if (macro == "perfdata") {
                        *result = PluginUtility::FormatPerfdata(cr->GetPerformanceData());
                        return true;
-               } else if (macro == "last_check") {
-                       *result = cr->GetScheduleStart();
-                       return true;
                } else if (macro == "check_source") {
                        *result = cr->GetCheckSource();
                        return true;
index fd233f0b2f80081bbc91b89962ddb9756b7069f3..80f166f7ec322236b954588f3567c599a4da71cf 100644 (file)
@@ -230,9 +230,6 @@ bool Service::ResolveMacro(const String& macro, const CheckResult::Ptr& cr, Valu
                } else if (macro == "perfdata") {
                        *result = PluginUtility::FormatPerfdata(cr->GetPerformanceData());
                        return true;
-               } else if (macro == "last_check") {
-                       *result = cr->GetExecutionEnd();
-                       return true;
                } else if (macro == "check_source") {
                        *result = cr->GetCheckSource();
                        return true;