tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-24 06:05:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10486 from cjsoftuk/10485-checkable-expiry-time

Browse Source 
Fix expiry times not applying correctly to Acknowledgements
This commit is contained in:
Julian Brost 2025-07-02 10:25:42 +02:00 committed by GitHub
commit 464bf7eab4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -48,6 +48,7 @@ C C Magnus Gustavsson <magnus@gustavsson.se>
Carlos Cesario <carloscesario@gmail.com> Carlos Cesario <carloscesario@gmail.com>
Carsten Köbke <carsten.koebke@gmx.de> Carsten Köbke <carsten.koebke@gmx.de>
Chris Boot <crb@tiger-computing.co.uk> Chris Boot <crb@tiger-computing.co.uk>
Chris Malton <chris@deltav-tech.co.uk>
Christian Birk <mail@birkc.de> Christian Birk <mail@birkc.de>
Christian Gut <cycloon@is-root.org> Christian Gut <cycloon@is-root.org>
Christian Harke <ch.harke@gmail.com> Christian Harke <ch.harke@gmail.com>

4
lib/icinga/externalcommandprocessor.cpp
View File

@ -657,7 +657,7 @@ void ExternalCommandProcessor::AcknowledgeSvcProblemExpire(double, const std::ve
<< "Setting timed acknowledgement for service '" << service->GetName() << "'" << (notify ? "" : ". Disabled notification"); << "Setting timed acknowledgement for service '" << service->GetName() << "'" << (notify ? "" : ". Disabled notification");
Comment::AddComment(service, CommentAcknowledgement, arguments[6], arguments[7], persistent, timestamp, sticky); 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<String>& arguments) void ExternalCommandProcessor::RemoveSvcAcknowledgement(double, const std::vector<String>& arguments)
@ -731,7 +731,7 @@ void ExternalCommandProcessor::AcknowledgeHostProblemExpire(double, const std::v
} }
Comment::AddComment(host, CommentAcknowledgement, arguments[5], arguments[6], persistent, timestamp, sticky); 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<String>& arguments) void ExternalCommandProcessor::RemoveHostAcknowledgement(double, const std::vector<String>& arguments)