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

IcingaDB#SendSentNotification(): make stream deterministic via CheckResult#previous_hard_state 

Now it gets everything from one source, the CheckResult.

refs #9132
This commit is contained in:
Alexander A. Klimov 2022-01-10 19:18:11 +01:00
parent db9825cbaf
commit 1fee3f1b12
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/icinga/checkable-check.cpp
View File

@ -326,6 +326,8 @@ void Checkable::ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrig
SetLastSoftStatesRaw(GetLastSoftStatesRaw() / 100u + new_state * 100u);
}
cr->SetPreviousHardState(ServiceState(GetLastHardStatesRaw() % 100u));
if (!IsStateOK(new_state))
TriggerDowntimes(cr->GetExecutionEnd());

1
lib/icinga/checkresult.ti
View File

@ -53,6 +53,7 @@ class CheckResult
[state] int exit_status;
[state, enum] ServiceState "state";
[state, enum] ServiceState previous_hard_state;
[state] String output;
[state] Array::Ptr performance_data;

2
lib/icingadb/icingadb-objects.cpp
View File

@ -1732,7 +1732,7 @@ void IcingaDB::SendSentNotification(
"host_id", GetObjectIdentifier(host),
"type", Convert::ToString(type),
"state", Convert::ToString(cr ? service ? Convert::ToLong(cr->GetState()) : Convert::ToLong(Host::CalculateState(cr->GetState())) : 99),
"previous_hard_state", Convert::ToString(GetPreviousState(checkable, service, StateTypeHard)),
"previous_hard_state", Convert::ToString(cr ? Convert::ToLong(service ? cr->GetPreviousHardState() : Host::CalculateState(cr->GetPreviousHardState())) : 99),
"author", Utility::ValidateUTF8(author),
"text", Utility::ValidateUTF8(finalText),
"users_notified", Convert::ToString(usersAmount),