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 #2960 from Icinga/bugfix/host-severity-order-2926 

Adjust host severity
This commit is contained in:
lippserd 2017-09-25 17:11:36 +02:00 committed by GitHub
parent e276dfc517 0b30fbd15d
commit 624fab8194
2 changed files with 40 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,37 +117,28 @@ class HoststatusQuery extends IdoQuery
'host_process_performance_data' => 'hs.process_performance_data',
'host_retry_check_interval' => 'hs.retry_check_interval',
'host_scheduled_downtime_depth' => 'hs.scheduled_downtime_depth',
'host_severity' => 'CASE WHEN hs.current_state = 0
THEN
CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL
THEN 16
ELSE 0
END
+
CASE WHEN hs.problem_has_been_acknowledged = 1
THEN 2
ELSE
CASE WHEN hs.scheduled_downtime_depth > 0
THEN 1
ELSE 4
'host_severity' => '
CASE
WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL
THEN 16
ELSE
CASE
WHEN hs.current_state = 0
THEN 1
ELSE
CASE
WHEN hs.current_state = 1 THEN 64
WHEN hs.current_state = 2 THEN 32
ELSE 256
END
END
ELSE
CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 16
WHEN hs.current_state = 1 THEN 64
WHEN hs.current_state = 2 THEN 32
ELSE 256
END
+
CASE WHEN hs.problem_has_been_acknowledged = 1
THEN 2
ELSE
CASE WHEN hs.scheduled_downtime_depth > 0
THEN 1
ELSE 4
+
CASE
WHEN hs.problem_has_been_acknowledged = 1 THEN 2
WHEN hs.scheduled_downtime_depth > 0 THEN 1
ELSE 256
END
END
END',
END
END',
'host_state' => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE hs.current_state END',
'host_state_type' => 'hs.state_type',
'host_status_update_time' => 'hs.status_update_time',

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

@ -101,37 +101,28 @@ class ServicestatusQuery extends IdoQuery
'host_process_performance_data' => 'hs.process_performance_data',
'host_retry_check_interval' => 'hs.retry_check_interval',
'host_scheduled_downtime_depth' => 'hs.scheduled_downtime_depth',
'host_severity' => 'CASE WHEN hs.current_state = 0
THEN
CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL
THEN 16
ELSE 0
END
+
CASE WHEN hs.problem_has_been_acknowledged = 1
THEN 2
ELSE
CASE WHEN hs.scheduled_downtime_depth > 0
THEN 1
ELSE 4
'host_severity' => '
CASE
WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL
THEN 16
ELSE
CASE
WHEN hs.current_state = 0
THEN 1
ELSE
CASE
WHEN hs.current_state = 1 THEN 64
WHEN hs.current_state = 2 THEN 32
ELSE 256
END
END
ELSE
CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 16
WHEN hs.current_state = 1 THEN 32
WHEN hs.current_state = 2 THEN 64
ELSE 256
END
+
CASE WHEN hs.problem_has_been_acknowledged = 1
THEN 2
ELSE
CASE WHEN hs.scheduled_downtime_depth > 0
THEN 1
ELSE 4
+
CASE
WHEN hs.problem_has_been_acknowledged = 1 THEN 2
WHEN hs.scheduled_downtime_depth > 0 THEN 1
ELSE 256
END
END
END',
END
END',
'host_state' => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE hs.current_state END',
'host_state_type' => 'hs.state_type',
'host_status_update_time' => 'hs.status_update_time',