From b4c56e5f475dcc296cb2aba1c0fcf56059f1dc90 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Thu, 16 Jun 2016 17:39:59 +0200 Subject: [PATCH] Remove duplicate last_check runtime macro Already available as {host,service}.last_check attribute. refs #11483 --- lib/icinga/host.cpp | 3 --- lib/icinga/service.cpp | 3 --- 2 files changed, 6 deletions(-) diff --git a/lib/icinga/host.cpp b/lib/icinga/host.cpp index dd166aa3b..af6cab8e0 100644 --- a/lib/icinga/host.cpp +++ b/lib/icinga/host.cpp @@ -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; diff --git a/lib/icinga/service.cpp b/lib/icinga/service.cpp index fd233f0b2..80f166f7e 100644 --- a/lib/icinga/service.cpp +++ b/lib/icinga/service.cpp @@ -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; -- 2.40.0