Skip to content
This repository has been archived by the owner on Jan 15, 2019. It is now read-only.

Commit

Permalink
Workaround for missing initial states in API (refs #3844)
Browse files Browse the repository at this point in the history 
* COALESCE for the essential vars so that the postprocessor
  will rewrite the status information correctly
  • Loading branch information
@lazyfrosch
lazyfrosch committed Mar 13, 2013
1 parent 44442fb commit 9f92627
Showing 1 changed file with 21 additions and 7 deletions.
28 changes: 21 additions & 7 deletions app/modules/Api/models/Store/LegacyLayer/TargetModifierModel.class.php
View file
Expand Up @@ -173,7 +173,9 @@ public function resolveColumnAlias($alias) {
'HOST_OUTPUT' => 'hs.output',
'HOST_LONG_OUTPUT' => 'hs.long_output',
'HOST_PERFDATA' => 'hs.perfdata',
'HOST_CURRENT_STATE' => 'hs.current_state',
// Workaround for missing initial states #3844
//'HOST_CURRENT_STATE' => 'hs.current_state',
'HOST_CURRENT_STATE' => 'COALESCE(hs.current_state,0)',
'HOST_CURRENT_CHECK_ATTEMPT' => 'hs.current_check_attempt',
'HOST_MAX_CHECK_ATTEMPTS' => 'hs.max_check_attempts',
'HOST_LAST_CHECK' => 'hs.last_check',
Expand All @@ -182,7 +184,9 @@ public function resolveColumnAlias($alias) {
'HOST_LATENCY' => 'hs.latency',
'HOST_EXECUTION_TIME' => 'hs.execution_time',
'HOST_NEXT_CHECK' => 'hs.next_check',
'HOST_HAS_BEEN_CHECKED' => 'hs.has_been_checked',
// Workaround for missing initial states #3844
//'HOST_HAS_BEEN_CHECKED' => 'hs.has_been_checked',
'HOST_HAS_BEEN_CHECKED' => 'COALESCE(hs.has_been_checked,0)',
'HOST_LAST_HARD_STATE_CHANGE' => 'hs.last_hard_state_change',
'HOST_LAST_NOTIFICATION' => 'hs.last_notification',
'HOST_PROCESS_PERFORMANCE_DATA' => 'h.process_performance_data',
Expand All @@ -194,7 +198,9 @@ public function resolveColumnAlias($alias) {
'HOST_STATUS_UPDATE_TIME' => 'hs.status_update_time',
'HOST_ALL' => 'h.*',
'HOST_STATUS_ALL' => 'hs.*',
'HOST_STATE' => 'hs.current_state',
// Workaround for missing initial states #3844
//'HOST_STATE' => 'hs.current_state',
'HOST_STATE' => 'COALESCE(hs.current_state,0)',
'HOST_STATE_COUNT' => 'count(hs.current_state)',
'HOST_OBJECT_COUNT' => 'count(DISTINCT h.host_object_id)',
'HOST_PARENT_OBJECT_ID' => 'ohp.object_id',
Expand All @@ -204,7 +210,9 @@ public function resolveColumnAlias($alias) {
'HOST_CUSTOMVARIABLE_NAME' => 'cvsh.varname',
'HOST_CUSTOMVARIABLE_VALUE' => 'cvsh.varvalue',
'HOST_CURRENT_PROBLEM_STATE' => '(hs.current_state*(hs.problem_has_been_acknowledged-1)*(hs.scheduled_downtime_depth-1))',
'HOST_IS_PENDING' => '(hs.has_been_checked-1)*-1',
// Workaround for missing initial states #3844
//'HOST_IS_PENDING' => '(hs.has_been_checked-1)*-1',
'HOST_IS_PENDING' => '(CASE WHEN hs.has_been_checked IS NULL THEN 1 ELSE (hs.has_been_checked-1)*-1 END)',
// Service data

'SERVICE_ID' => 's.service_id',
Expand Down Expand Up @@ -232,7 +240,9 @@ public function resolveColumnAlias($alias) {
'SERVICE_LONG_OUTPUT' => 'ss.long_output',
'SERVICE_PERFDATA' => 'ss.perfdata',
'SERVICE_PROCESS_PERFORMANCE_DATA' => 's.process_performance_data',
'SERVICE_CURRENT_STATE' => 'ss.current_state',
// Workaround for missing initial states #3844
//'SERVICE_CURRENT_STATE' => 'ss.current_state',
'SERVICE_CURRENT_STATE' => 'COALESCE(ss.current_state,0)',
'SERVICE_CURRENT_CHECK_ATTEMPT'=>'ss.current_check_attempt',
'SERVICE_MAX_CHECK_ATTEMPTS'=> 'ss.max_check_attempts',
'SERVICE_LAST_CHECK' => 'ss.last_check',
Expand All @@ -241,7 +251,9 @@ public function resolveColumnAlias($alias) {
'SERVICE_LATENCY' => 'ss.latency',
'SERVICE_EXECUTION_TIME' => 'ss.execution_time',
'SERVICE_NEXT_CHECK' => 'ss.next_check',
'SERVICE_HAS_BEEN_CHECKED'=> 'ss.has_been_checked',
// Workaround for missing initial states #3844
//'SERVICE_HAS_BEEN_CHECKED'=> 'ss.has_been_checked',
'SERVICE_HAS_BEEN_CHECKED'=> 'COALESCE(ss.has_been_checked,0)',
'SERVICE_LAST_HARD_STATE'=> 'ss.last_hard_state',
'SERVICE_LAST_HARD_STATE_CHANGE'=>'ss.last_hard_state_change',
'SERVICE_LAST_NOTIFICATION'=> 'ss.last_notification',
Expand All @@ -258,7 +270,9 @@ public function resolveColumnAlias($alias) {
'SERVICE_STATE_COUNT' => 'count(ss.current_state)',
'SERVICE_OBJECT_COUNT' => 'count(DISTINCT s.service_object_id)',
'SERVICE_CURRENT_PROBLEM_STATE' => '(ss.current_state*(ss.problem_has_been_acknowledged-1)*(ss.scheduled_downtime_depth-1))',
'SERVICE_IS_PENDING' => '(ss.has_been_checked-1)*-1',
// Workaround for missing initial states #3844
//'SERVICE_IS_PENDING' => '(ss.has_been_checked-1)*-1',
'SERVICE_IS_PENDING' => '(CASE WHEN ss.has_been_checked IS NULL THEN 1 ELSE (ss.has_been_checked-1)*-1 END)',

// Config vars
'CONFIG_VAR_ID' => 'cfv.configfilevariable_id',
Expand Down

0 comments on commit 9f92627

Please sign in to comment.