tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Export last hard/soft state dummies

This commit is contained in:
Jean Flach 2018-11-29 15:42:46 +01:00 committed by Michael Friedrich
parent e2caa47f18
commit 6ce4612cd7
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/redis/rediswriter-objects.cpp
View File

@ -632,15 +632,16 @@ Dictionary::Ptr RedisWriter::SerializeState(const Checkable::Ptr& checkable)
attrs->Set("env_id", CalculateCheckSumString(GetEnvironment())); attrs->Set("env_id", CalculateCheckSumString(GetEnvironment()));
attrs->Set("state_type", checkable->GetStateType()); attrs->Set("state_type", checkable->GetStateType());
if (service) // TODO: last_hard/soft_state should be "previous".
if (service) {
attrs->Set("state", service->GetState()); attrs->Set("state", service->GetState());
else attrs->Set("last_soft_state", service->GetState());
attrs->Set("state", host->GetState());
if (service)
attrs->Set("last_hard_state", service->GetLastHardState()); attrs->Set("last_hard_state", service->GetLastHardState());
else } else {
attrs->Set("state", host->GetState());
attrs->Set("last_soft_state", host->GetState());
attrs->Set("last_hard_state", host->GetLastHardState()); attrs->Set("last_hard_state", host->GetLastHardState());
}
attrs->Set("check_attempt", checkable->GetCheckAttempt()); attrs->Set("check_attempt", checkable->GetCheckAttempt());
@ -691,8 +692,6 @@ Dictionary::Ptr RedisWriter::SerializeState(const Checkable::Ptr& checkable)
attrs->Set("last_update", Utility::GetTime()); attrs->Set("last_update", Utility::GetTime());
attrs->Set("last_state_change", checkable->GetLastStateChange()); attrs->Set("last_state_change", checkable->GetLastStateChange());
//attrs->Set("last_soft_state", TODO: We want "previous");
//attrs->Set("last_hard_state", TODO: We want "previous");
attrs->Set("next_check", checkable->GetNextCheck()); attrs->Set("next_check", checkable->GetNextCheck());
return attrs; return attrs;