From e5ff81aa8472b1bd19858254ea30bd7b3f3a4c90 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 4 Sep 2015 16:20:23 +0200
Subject: [PATCH] monitoring/hoststatus: Add columns host_next_update and
 host_next_update_is_late

refs #8378
---
 .../Backend/Ido/Query/HoststatusQuery.php     | 33 +++++++++++++++++++
 .../Backend/Ido/Query/ServicestatusQuery.php  |  2 +-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
index d3d4cfcb8..2cfa6c129 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -77,6 +77,39 @@ class HoststatusQuery extends IdoQuery
             'host_modified_host_attributes'         => 'hs.modified_host_attributes',
             'host_next_check'                       => 'CASE hs.should_be_scheduled WHEN 1 THEN UNIX_TIMESTAMP(hs.next_check) ELSE NULL END',
             'host_next_notification'                => 'UNIX_TIMESTAMP(hs.next_notification)',
+            'host_next_update'                      => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL
+            THEN
+                NULL
+            ELSE
+                UNIX_TIMESTAMP(hs.last_check)
+                + CASE WHEN
+                    COALESCE(hs.current_state, 0) = 0
+                THEN
+                    hs.normal_check_interval
+                ELSE
+                    hs.retry_check_interval
+                END * 60
+                + FLOOR(hs.execution_time) * 2
+            END',
+            // TODO(el): Remove column once we support host_next_update>now
+            'host_next_update_is_late'              => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL
+            THEN
+                0
+            ELSE
+                CASE WHEN (UNIX_TIMESTAMP(hs.last_check)
+                    + CASE WHEN COALESCE(hs.current_state, 0) = 0
+                    THEN
+                        hs.normal_check_interval
+                    ELSE
+                        hs.retry_check_interval
+                    END * 60
+                    + FLOOR(hs.execution_time) * 2) > CURRENT_TIMESTAMP()
+                THEN
+                    1
+                ELSE
+                    0
+                END
+            END',
             'host_no_more_notifications'            => 'hs.no_more_notifications',
             'host_normal_check_interval'            => 'hs.normal_check_interval',
             'host_notifications_enabled'            => 'hs.notifications_enabled',
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
index 3d2c0447c..68854ef4e 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
@@ -208,7 +208,7 @@ class ServicestatusQuery extends IdoQuery
                 END * 60
                 + FLOOR(ss.execution_time) * 2
             END',
-            // TODO(el): Remove column once we support service_expected_update>now
+            // TODO(el): Remove column once we support service_next_update>now
             'service_next_update_is_late'               => 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL
             THEN
                 0