Skip to content

Commit b424b55

Browse files
ServicestatusQuery: Fix that timestamp columns work with relative time filter
1 parent ff04a2e commit b424b55

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ class ServicestatusQuery extends IdoQuery
142142
END',
143143
'host_state' => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE hs.current_state END',
144144
'host_state_type' => 'hs.state_type',
145-
'host_status_update_time' => 'hs.status_update_time',
145+
'host_status_update_time' => 'UNIX_TIMESTAMP(hs.status_update_time)',
146146
'host_unhandled' => 'CASE WHEN (hs.problem_has_been_acknowledged + hs.scheduled_downtime_depth) = 0 THEN 1 ELSE 0 END'
147147

148148
),
@@ -202,10 +202,10 @@ class ServicestatusQuery extends IdoQuery
202202
'service_last_notification' => 'UNIX_TIMESTAMP(ss.last_notification)',
203203
'service_last_state_change' => 'UNIX_TIMESTAMP(ss.last_state_change)',
204204
'service_last_state_change_ts' => 'ss.last_state_change',
205-
'service_last_time_critical' => 'ss.last_time_critical',
206-
'service_last_time_ok' => 'ss.last_time_ok',
207-
'service_last_time_unknown' => 'ss.last_time_unknown',
208-
'service_last_time_warning' => 'ss.last_time_warning',
205+
'service_last_time_critical' => 'UNIX_TIMESTAMP(ss.last_time_critical)',
206+
'service_last_time_ok' => 'UNIX_TIMESTAMP(ss.last_time_ok)',
207+
'service_last_time_unknown' => 'UNIX_TIMESTAMP(ss.last_time_unknown)',
208+
'service_last_time_warning' => 'UNIX_TIMESTAMP(ss.last_time_warning)',
209209
'service_long_output' => 'ss.long_output',
210210
'service_max_check_attempts' => 'ss.max_check_attempts',
211211
'service_modified_service_attributes' => 'ss.modified_service_attributes',
@@ -279,7 +279,7 @@ class ServicestatusQuery extends IdoQuery
279279
END',
280280
'service_state' => 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 99 ELSE ss.current_state END',
281281
'service_state_type' => 'ss.state_type',
282-
'service_status_update_time' => 'ss.status_update_time',
282+
'service_status_update_time' => 'UNIX_TIMESTAMP(ss.status_update_time)',
283283
'service_unhandled' => 'CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) = 0 THEN 1 ELSE 0 END',
284284
'problems' => 'CASE WHEN COALESCE(ss.current_state, 0) = 0 THEN 0 ELSE 1 END'
285285
)

0 commit comments

Comments
 (0)