From ec48dae331e19d1bfe0c98d8433054325f0af3cd Mon Sep 17 00:00:00 2001 From: Chris Malton Date: Wed, 18 Jun 2025 16:55:31 +0100 Subject: [PATCH 1/2] Correct a problem with expiry times not being passed through to AcknowledgeProblem --- lib/icinga/externalcommandprocessor.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/icinga/externalcommandprocessor.cpp b/lib/icinga/externalcommandprocessor.cpp index fbc0432a4..33831a491 100644 --- a/lib/icinga/externalcommandprocessor.cpp +++ b/lib/icinga/externalcommandprocessor.cpp @@ -657,7 +657,7 @@ void ExternalCommandProcessor::AcknowledgeSvcProblemExpire(double, const std::ve << "Setting timed acknowledgement for service '" << service->GetName() << "'" << (notify ? "" : ". Disabled notification"); Comment::AddComment(service, CommentAcknowledgement, arguments[6], arguments[7], persistent, timestamp, sticky); - service->AcknowledgeProblem(arguments[6], arguments[7], sticky ? AcknowledgementSticky : AcknowledgementNormal, notify, persistent, timestamp); + service->AcknowledgeProblem(arguments[6], arguments[7], sticky ? AcknowledgementSticky : AcknowledgementNormal, notify, persistent, Utility::GetTime(), timestamp); } void ExternalCommandProcessor::RemoveSvcAcknowledgement(double, const std::vector& arguments) @@ -731,7 +731,7 @@ void ExternalCommandProcessor::AcknowledgeHostProblemExpire(double, const std::v } Comment::AddComment(host, CommentAcknowledgement, arguments[5], arguments[6], persistent, timestamp, sticky); - host->AcknowledgeProblem(arguments[5], arguments[6], sticky ? AcknowledgementSticky : AcknowledgementNormal, notify, persistent, timestamp); + host->AcknowledgeProblem(arguments[5], arguments[6], sticky ? AcknowledgementSticky : AcknowledgementNormal, notify, persistent, Utility::GetTime(), timestamp); } void ExternalCommandProcessor::RemoveHostAcknowledgement(double, const std::vector& arguments) From 035f13090170c25227d5cdf2190da1dc90afa49b Mon Sep 17 00:00:00 2001 From: Chris Malton Date: Mon, 23 Jun 2025 09:17:45 +0100 Subject: [PATCH 2/2] Update AUTHORS --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 6b648735c..484c8dd1d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -48,6 +48,7 @@ C C Magnus Gustavsson Carlos Cesario Carsten Köbke Chris Boot +Chris Malton Christian Birk Christian Gut Christian Harke