Don't increment check attempt counter on OK->NOT-OK transition

refs #7287

Signed-off-by: Michael Friedrich <michael.friedrich@netways.de>

diff --git a/lib/icinga/checkable-check.cpp b/lib/icinga/checkable-check.cpp
index a4da0c31dadfd7f96a21987634bb94f079f75b42..0688e93fbaac48bd5800f07b926c8ef11c070556 100644 (file)
--- a/lib/icinga/checkable-check.cpp
+++ b/lib/icinga/checkable-check.cpp
@@ -338,9 +338,12 @@ void Checkable::ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrig
        } else {
                if (old_attempt >= GetMaxCheckAttempts()) {
                        SetStateType(StateTypeHard);
-               } else if (old_stateType == StateTypeSoft || old_state == ServiceOK) {
+               } else if (old_stateType == StateTypeSoft && old_state != ServiceOK) {
                        SetStateType(StateTypeSoft);
-                       attempt = old_attempt + 1;
+                       attempt = old_attempt + 1; //NOT-OK -> NOT-OK counter
+               } else if (old_state == ServiceOK) {
+                       SetStateType(StateTypeSoft);
+                       attempt = 1; //OK -> NOT-OK transition, reset the counter
                } else {
                        attempt = old_attempt;
                }