tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-31 01:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2723 from Icinga/bugfix/hide-check-attempt-for-hard-states-2718

Browse Source 
Show check attempts only for soft state changes

(cherry picked from commit 9c8da456f134076fd062e9495fc9582e8638427a)
Signed-off-by: Eric Lippmann <eric.lippmann@icinga.com>
This commit is contained in:
Eric Lippmann 2017-02-10 12:45:21 +01:00
parent de80b8093b
commit 38e276d11f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatehistoryQuery.php
View File

@ -65,7 +65,7 @@ class HoststatehistoryQuery extends IdoQuery
'host_name' => 'ho.name1', 'host_name' => 'ho.name1',
'object_id' => 'hh.object_id', 'object_id' => 'hh.object_id',
'object_type' => '(\'host\')', 'object_type' => '(\'host\')',
'output' => "('[ ' || hh.current_check_attempt || '/' || hh.max_check_attempts || ' ] ' || hh.output)", 'output' => '(CASE WHEN hh.state_type = 1 THEN hh.output ELSE \'[ \' || hh.current_check_attempt || \'/\' || hh.max_check_attempts || \' ] \' || hh.output END)',
'state' => 'hh.state', 'state' => 'hh.state',
'timestamp' => 'UNIX_TIMESTAMP(hh.state_time)', 'timestamp' => 'UNIX_TIMESTAMP(hh.state_time)',
'type' => "(CASE WHEN hh.state_type = 1 THEN 'hard_state' ELSE 'soft_state' END)" 'type' => "(CASE WHEN hh.state_type = 1 THEN 'hard_state' ELSE 'soft_state' END)"

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatehistoryQuery.php
View File

@ -62,7 +62,7 @@ class ServicestatehistoryQuery extends IdoQuery
'host_name' => 'so.name1', 'host_name' => 'so.name1',
'object_id' => 'sh.object_id', 'object_id' => 'sh.object_id',
'object_type' => '(\'service\')', 'object_type' => '(\'service\')',
'output' => "('[ ' || sh.current_check_attempt || '/' || sh.max_check_attempts || ' ] ' || sh.output)", 'output' => '(CASE WHEN sh.state_type = 1 THEN sh.output ELSE \'[ \' || sh.current_check_attempt || \'/\' || sh.max_check_attempts || \' ] \' || sh.output END)',
'service' => 'so.name2 COLLATE latin1_general_ci', 'service' => 'so.name2 COLLATE latin1_general_ci',
'service_description' => 'so.name2', 'service_description' => 'so.name2',
'service_host' => 'so.name1 COLLATE latin1_general_ci', 'service_host' => 'so.name1 COLLATE latin1_general_ci',