upstream/icingadb
1
0
Fork 0
mirror of https://github.com/Icinga/icingadb.git synced 2026-05-28 04:35:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #959 from Icinga/LastHardState

Browse source 
Don't unconditionally migrate icinga_statehistory.last_hard_state (IDO) -> state_history.hard_state
This commit is contained in:
Alvar 2025-05-27 14:36:53 +00:00 committed by GitHub
commit 23634db333
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cmd/icingadb-migrate/convert.go
View file

@ -790,6 +790,11 @@ func convertStateRows(
hostId := calcObjectId(env, row.Name1)
serviceId := calcServiceId(env, row.Name1, row.Name2)
hardState := row.LastHardState // in case of soft state, the "current" hard state is the last one
if icingadbTypes.StateType(row.StateType) == icingadbTypes.StateHard {
hardState = row.State
}
stateHistory = append(stateHistory, &history.StateHistory{
HistoryTableEntity: history.HistoryTableEntity{
EntityWithoutChecksum: v1.EntityWithoutChecksum{
@ -805,7 +810,7 @@ func convertStateRows(
EventTime: ts,
StateType: icingadbTypes.StateType(row.StateType),
SoftState: row.State,
HardState: row.LastHardState,
HardState: hardState,
PreviousSoftState: row.LastState,
PreviousHardState: previousHardState,
CheckAttempt: row.CurrentCheckAttempt,
@ -845,7 +850,7 @@ func convertStateRows(
},
EventTime: ts,
StateType: icingadbTypes.StateType(row.StateType),
HardState: row.LastHardState,
HardState: hardState,
PreviousHardState: previousHardState,
})
}