tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3532 from Icinga/bugfix/ido-check_interval 

Fetch check_interval property of monitored objects, too
This commit is contained in:
Eric Lippmann 2018-07-18 16:32:37 +02:00 committed by GitHub
parent a2c2246256 0b5620d2b5
commit 424f687f5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
View File

@ -38,6 +38,7 @@ class HoststatusQuery extends IdoQuery
'host_address' => 'h.address', 'host_address' => 'h.address',
'host_address6' => 'h.address6', 'host_address6' => 'h.address6',
'host_alias' => 'h.alias', 'host_alias' => 'h.alias',
'host_check_interval' => '(h.check_interval * 60)',
'host_display_name' => 'h.display_name COLLATE latin1_general_ci', 'host_display_name' => 'h.display_name COLLATE latin1_general_ci',
'host_icon_image' => 'h.icon_image', 'host_icon_image' => 'h.icon_image',
'host_icon_image_alt' => 'h.icon_image_alt', 'host_icon_image_alt' => 'h.icon_image_alt',

1
modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
View File

@ -138,6 +138,7 @@ class ServicestatusQuery extends IdoQuery
'object_type' => '(\'service\')', 'object_type' => '(\'service\')',
'service' => 'so.name2 COLLATE latin1_general_ci', 'service' => 'so.name2 COLLATE latin1_general_ci',
'service_action_url' => 's.action_url', 'service_action_url' => 's.action_url',
'service_check_interval' => '(s.check_interval * 60)',
'service_description' => 'so.name2', 'service_description' => 'so.name2',
'service_display_name' => 's.display_name COLLATE latin1_general_ci', 'service_display_name' => 's.display_name COLLATE latin1_general_ci',
'service_host' => 'so.name1 COLLATE latin1_general_ci', 'service_host' => 'so.name1 COLLATE latin1_general_ci',

1
modules/monitoring/library/Monitoring/Object/Host.php
View File

@ -100,6 +100,7 @@ class Host extends MonitoredObject
'host_attempt', 'host_attempt',
'host_check_command', 'host_check_command',
'host_check_execution_time', 'host_check_execution_time',
'host_check_interval',
'host_check_latency', 'host_check_latency',
'host_check_source', 'host_check_source',
'host_check_timeperiod', 'host_check_timeperiod',

1
modules/monitoring/library/Monitoring/Object/Service.php
View File

@ -135,6 +135,7 @@ class Service extends MonitoredObject
'service_attempt', 'service_attempt',
'service_check_command', 'service_check_command',
'service_check_execution_time', 'service_check_execution_time',
'service_check_interval',
'service_check_latency', 'service_check_latency',
'service_check_source', 'service_check_source',
'service_check_timeperiod', 'service_check_timeperiod',