Introduce Checkable#next_update

diff --git a/lib/icinga/checkable.cpp b/lib/icinga/checkable.cpp
index 04e462951b675e32245dfed4859fbb9492cf3cfa..0ab090284b76cb35260aed5c8d36a68542d4b28b 100644 (file)
--- a/lib/icinga/checkable.cpp
+++ b/lib/icinga/checkable.cpp
@@ -168,6 +168,19 @@ bool Checkable::GetHandled() const
        return GetProblem() && (IsInDowntime() || IsAcknowledged());
 }
 
+Timestamp Checkable::GetNextUpdate() const
+{
+       auto cr (GetLastCheckResult());
+
+       if (cr) {
+               return GetNextCheck()
+                       + (GetProblem() && GetStateType() == StateTypeSoft ? GetRetryInterval() : GetCheckInterval())
+                       + 2 * (cr->GetExecutionEnd() - cr->GetScheduleStart());
+       } else {
+               return GetNextCheck() + GetCheckInterval();
+       }
+}
+
 void Checkable::NotifyFixedDowntimeStart(const Downtime::Ptr& downtime)
 {
        if (!downtime->GetFixed())

diff --git a/lib/icinga/checkable.hpp b/lib/icinga/checkable.hpp
index caddd63f45fad3e368b64298e3ddfa693b66efc6..032910adba2ca63c29ca3e5bbbf7f1e3c1d715e4 100644 (file)
--- a/lib/icinga/checkable.hpp
+++ b/lib/icinga/checkable.hpp
@@ -91,6 +91,7 @@ public:
        int GetSeverity() const override;
        bool GetProblem() const override;
        bool GetHandled() const override;
+       Timestamp GetNextUpdate() const override;
 
        /* Checks */
        intrusive_ptr<CheckCommand> GetCheckCommand() const;

diff --git a/lib/icinga/checkable.ti b/lib/icinga/checkable.ti
index 7969d6f46695cfa9881f91292e715714b0497abf..a920d2589a17fdac50616be0986586975a7d7bd9 100644 (file)
--- a/lib/icinga/checkable.ti
+++ b/lib/icinga/checkable.ti
@@ -132,6 +132,9 @@ abstract class Checkable : CustomVarObject
        [no_storage] bool handled {
                get;
        };
+       [no_storage] Timestamp next_update {
+               get;
+       };
 
        [state] bool force_next_check;
        [state] int acknowledgement (AcknowledgementRaw) {