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

monitoring: Take status_update_time into account when is_currently_running is 1 

fixes #8210
This commit is contained in:
Eric Lippmann 2015-01-16 17:02:35 +01:00
parent a6861789bb
commit dae3ccd90c
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php
View File

@ -11,17 +11,27 @@ class ProgramstatusQuery extends IdoQuery
{
protected $columnMap = array(
'programstatus' => array(
'id' => 'programstatus_id',
'status_update_time' => 'UNIX_TIMESTAMP(status_update_time)',
'program_start_time' => 'UNIX_TIMESTAMP(program_start_time)',
'program_end_time' => 'UNIX_TIMESTAMP(program_end_time)',
'is_currently_running' => 'is_currently_running',
'id' => 'programstatus_id',
'status_update_time' => 'UNIX_TIMESTAMP(programstatus.status_update_time)',
'program_start_time' => 'UNIX_TIMESTAMP(programstatus.program_start_time)',
'program_end_time' => 'UNIX_TIMESTAMP(programstatus.program_end_time)',
'is_currently_running' => 'CASE WHEN (programstatus.is_currently_running = 0)
THEN
0
ELSE
CASE WHEN (UNIX_TIMESTAMP(programstatus.status_update_time) + 60 > UNIX_TIMESTAMP(NOW()))
THEN
1
ELSE
0
END
END',
'process_id' => 'process_id',
'daemon_mode' => 'daemon_mode',
'last_command_check' => 'UNIX_TIMESTAMP(last_command_check)',
'last_log_rotation' => 'UNIX_TIMESTAMP(last_log_rotation)',
'last_command_check' => 'UNIX_TIMESTAMP(programstatus.last_command_check)',
'last_log_rotation' => 'UNIX_TIMESTAMP(programstatus.last_log_rotation)',
'notifications_enabled' => 'notifications_enabled',
'disable_notif_expire_time' => 'UNIX_TIMESTAMP(disable_notif_expire_time)',
'disable_notif_expire_time' => 'UNIX_TIMESTAMP(programstatus.disable_notif_expire_time)',
'active_service_checks_enabled' => 'active_service_checks_enabled',
'passive_service_checks_enabled' => 'passive_service_checks_enabled',
'active_host_checks_enabled' => 'active_host_checks_enabled',