From 0b5620d2b58fed900188c7f4183567b4e3cf1628 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
Date: Wed, 18 Jul 2018 15:42:34 +0200
Subject: [PATCH] Fetch check_interval property of monitored objects, too

---
 .../library/Monitoring/Backend/Ido/Query/HoststatusQuery.php     | 1 +
 .../library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php  | 1 +
 modules/monitoring/library/Monitoring/Object/Host.php            | 1 +
 modules/monitoring/library/Monitoring/Object/Service.php         | 1 +
 4 files changed, 4 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
index 09c4f624f..99921ed7e 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -38,6 +38,7 @@ class HoststatusQuery extends IdoQuery
             'host_address'          => 'h.address',
             'host_address6'         => 'h.address6',
             'host_alias'            => 'h.alias',
+            'host_check_interval'   => '(h.check_interval * 60)',
             'host_display_name'     => 'h.display_name COLLATE latin1_general_ci',
             'host_icon_image'       => 'h.icon_image',
             'host_icon_image_alt'   => 'h.icon_image_alt',
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
index 5e002ed0e..21ae2af2d 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
@@ -138,6 +138,7 @@ class ServicestatusQuery extends IdoQuery
             'object_type'               => '(\'service\')',
             'service'                   => 'so.name2 COLLATE latin1_general_ci',
             'service_action_url'        => 's.action_url',
+            'service_check_interval'    => '(s.check_interval * 60)',
             'service_description'       => 'so.name2',
             'service_display_name'      => 's.display_name COLLATE latin1_general_ci',
             'service_host'              => 'so.name1 COLLATE latin1_general_ci',
diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php
index f96f2fa8a..798158fbd 100644
--- a/modules/monitoring/library/Monitoring/Object/Host.php
+++ b/modules/monitoring/library/Monitoring/Object/Host.php
@@ -100,6 +100,7 @@ class Host extends MonitoredObject
             'host_attempt',
             'host_check_command',
             'host_check_execution_time',
+            'host_check_interval',
             'host_check_latency',
             'host_check_source',
             'host_check_timeperiod',
diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index c712beeb1..268a30f3e 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -135,6 +135,7 @@ class Service extends MonitoredObject
             'service_attempt',
             'service_check_command',
             'service_check_execution_time',
+            'service_check_interval',
             'service_check_latency',
             'service_check_source',
             'service_check_timeperiod',