Clear sticky ack on soft recovery, fix sticky=2, normal=1|0.

Fixes #5365

diff --git a/lib/icinga/externalcommandprocessor.cpp b/lib/icinga/externalcommandprocessor.cpp
index e752707c4b38cd7ef18156536e54cfe2a4915d1d..764b32f122b5db07acb10b9036193c61f8ef1617 100644 (file)
--- a/lib/icinga/externalcommandprocessor.cpp
+++ b/lib/icinga/externalcommandprocessor.cpp
@@ -616,7 +616,7 @@ void ExternalCommandProcessor::AcknowledgeSvcProblem(double, const std::vector<S
        if (arguments.size() < 7)
                BOOST_THROW_EXCEPTION(std::invalid_argument("Expected 7 arguments."));
 
-       bool sticky = Convert::ToBool(arguments[2]);
+       bool sticky = (Convert::ToLong(arguments[2]) == 2 ? true : false);
 
        Service::Ptr service = Service::GetByNamePair(arguments[0], arguments[1]);
 
@@ -637,7 +637,7 @@ void ExternalCommandProcessor::AcknowledgeSvcProblemExpire(double, const std::ve
        if (arguments.size() < 8)
                BOOST_THROW_EXCEPTION(std::invalid_argument("Expected 8 arguments."));
 
-       bool sticky = Convert::ToBool(arguments[2]);
+       bool sticky = (Convert::ToLong(arguments[2]) == 2 ? true : false);
        double timestamp = Convert::ToDouble(arguments[5]);
 
        Service::Ptr service = Service::GetByNamePair(arguments[0], arguments[1]);
@@ -679,7 +679,7 @@ void ExternalCommandProcessor::AcknowledgeHostProblem(double, const std::vector<
        if (arguments.size() < 6)
                BOOST_THROW_EXCEPTION(std::invalid_argument("Expected 6 arguments."));
 
-       bool sticky = Convert::ToBool(arguments[1]);
+       bool sticky = (Convert::ToLong(arguments[1]) == 2 ? true : false);
 
        Host::Ptr host = Host::GetByName(arguments[0]);
 
@@ -702,7 +702,7 @@ void ExternalCommandProcessor::AcknowledgeHostProblemExpire(double, const std::v
        if (arguments.size() < 7)
                BOOST_THROW_EXCEPTION(std::invalid_argument("Expected 7 arguments."));
 
-       bool sticky = Convert::ToBool(arguments[1]);
+       bool sticky = (Convert::ToLong(arguments[1]) == 2 ? true : false);
        double timestamp = Convert::ToDouble(arguments[4]);
 
        Host::Ptr host = Host::GetByName(arguments[0]);

diff --git a/lib/icinga/service-check.cpp b/lib/icinga/service-check.cpp
index f3b87bdcf47278b779f2ed778a1f2b90455d470d..67a1b512fc84aad3ab673e5871d1b469fafd7a03 100644 (file)
--- a/lib/icinga/service-check.cpp
+++ b/lib/icinga/service-check.cpp
@@ -319,7 +319,7 @@ void Service::ProcessCheckResult(const CheckResult::Ptr& cr, const String& autho
 
                /* remove acknowledgements */
                if (GetAcknowledgement() == AcknowledgementNormal ||
-                   (GetAcknowledgement() == AcknowledgementSticky && GetStateType() == StateTypeHard && GetState() == StateOK)) {
+                   (GetAcknowledgement() == AcknowledgementSticky && GetState() == StateOK)) {
                        ClearAcknowledgement();
                }