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 branch 'bugfix/read-hard_state-and-last_hard_state-only-once'

Browse source
This commit is contained in:
Alexander A. Klimov 2019-11-11 15:29:45 +01:00
commit 52c4defe6a
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configobject/objecttypes/host/hoststate/hoststate.go
View file

@ -48,7 +48,6 @@ type HostState struct {
EnvId string `json:"environment_id"`
StateType float32 `json:"state_type"`
SoftState float32 `json:"state"`
HardState float32 `json:"last_hard_state"`
PreviousHardState float32 `json:"previous_hard_state"`
Attempt float32 `json:"check_attempt"`
Severity float32 `json:"severity"`
@ -95,7 +94,7 @@ func (h *HostState) UpdateValues() []interface{} {
utils.EncodeChecksum(h.EnvId),
utils.IcingaStateTypeToString(h.StateType),
h.SoftState,
h.HardState,
h.LastHardState,
h.PreviousHardState,
h.Attempt,
h.Severity,

3
configobject/objecttypes/service/servicestate/servicestate.go
View file

@ -48,7 +48,6 @@ type ServiceState struct {
EnvId string `json:"environment_id"`
StateType float32 `json:"state_type"`
SoftState float32 `json:"state"`
HardState float32 `json:"last_hard_state"`
PreviousHardState float32 `json:"previous_hard_state"`
Attempt float32 `json:"check_attempt"`
Severity float32 `json:"severity"`
@ -95,7 +94,7 @@ func (s *ServiceState) UpdateValues() []interface{} {
utils.EncodeChecksum(s.EnvId),
utils.IcingaStateTypeToString(s.StateType),
s.SoftState,
s.HardState,
s.LastHardState,
s.PreviousHardState,
s.Attempt,
s.Severity,