tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-25 14:44:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Checkable#ProcessCheckResult(): don't overwrite check source

Browse Source 
... set by passive check results.

refs #7948
This commit is contained in:
Alexander A. Klimov 2021-01-25 16:05:03 +01:00
parent ef23ae5f3c
commit c3eba7e88d
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,14 +118,16 @@ void Checkable::ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrig
if (cr->GetExecutionEnd() == 0) if (cr->GetExecutionEnd() == 0)
cr->SetExecutionEnd(now); cr->SetExecutionEnd(now);
if (!origin || origin->IsLocal())
cr->SetCheckSource(IcingaApplication::GetInstance()->GetNodeName());
Endpoint::Ptr command_endpoint = GetCommandEndpoint(); Endpoint::Ptr command_endpoint = GetCommandEndpoint();
if (cr->GetCheckSource().IsEmpty()) {
if ((!origin || origin->IsLocal()))
cr->SetCheckSource(IcingaApplication::GetInstance()->GetNodeName());
/* override check source if command_endpoint was defined */ /* override check source if command_endpoint was defined */
if (command_endpoint && !GetExtension("agent_check")) if (command_endpoint && !GetExtension("agent_check"))
cr->SetCheckSource(command_endpoint->GetName()); cr->SetCheckSource(command_endpoint->GetName());
}
/* agent checks go through the api */ /* agent checks go through the api */
if (command_endpoint && GetExtension("agent_check")) { if (command_endpoint && GetExtension("agent_check")) {