Skip to content

Commit

Permalink
cmd/icingadb-migrate: ignore icinga_downtimehistory#was_started=0 rows
Browse files Browse the repository at this point in the history
Such appear e.g. for scheduled but never triggered flexible Downtimes.
Not triggered = no events.
  • Loading branch information
Al2Klimov committed Jul 27, 2023
1 parent 5ea6831 commit 78327c1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion cmd/icingadb-migrate/convert.go
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ type downtimeRow = struct {
Duration int64
ScheduledStartTime sql.NullInt64
ScheduledEndTime int64
WasStarted uint8
ActualStartTime int64
ActualStartTimeUsec uint32
ActualEndTime int64
Expand All @@ -246,7 +247,7 @@ func convertDowntimeRows(
for _, row := range idoRows {
checkpoint = row.DowntimehistoryId

if !row.ScheduledStartTime.Valid {
if !row.ScheduledStartTime.Valid || row.WasStarted == 0 {
continue
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/icingadb-migrate/embed/downtime_query.sql
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SELECT dh.downtimehistory_id, UNIX_TIMESTAMP(dh.entry_time) entry_time, dh.author_name, dh.comment_data,
dh.is_fixed, dh.duration, UNIX_TIMESTAMP(dh.scheduled_start_time) scheduled_start_time,
COALESCE(UNIX_TIMESTAMP(dh.scheduled_end_time), 0) scheduled_end_time,
COALESCE(UNIX_TIMESTAMP(dh.scheduled_end_time), 0) scheduled_end_time, dh.was_started,
COALESCE(UNIX_TIMESTAMP(dh.actual_start_time), 0) actual_start_time, dh.actual_start_time_usec,
COALESCE(UNIX_TIMESTAMP(dh.actual_end_time), 0) actual_end_time, dh.actual_end_time_usec, dh.was_cancelled,
COALESCE(UNIX_TIMESTAMP(dh.trigger_time), 0) trigger_time, dh.name, o.objecttype_id,
Expand Down

0 comments on commit 78327c1

Please sign in to comment.