ClusterZoneCheckTask::ScriptFunc(): take CheckResultProducer::Ptr

This commit is contained in:
Alexander A. Klimov 2025-04-02 13:17:50 +02:00
parent 34cf122c8e
commit bb4a9d1192
2 changed files with 7 additions and 7 deletions

View File

@ -12,10 +12,10 @@
using namespace icinga; using namespace icinga;
REGISTER_FUNCTION_NONCONST(Internal, ClusterZoneCheck, &ClusterZoneCheckTask::ScriptFunc, "checkable:cr:resolvedMacros:useResolvedMacros"); REGISTER_FUNCTION_NONCONST(Internal, ClusterZoneCheck, &ClusterZoneCheckTask::ScriptFunc, "checkable:cr:producer:resolvedMacros:useResolvedMacros");
void ClusterZoneCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, void ClusterZoneCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr,
const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros) const CheckResultProducer::Ptr& producer, const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros)
{ {
REQUIRE_NOT_NULL(checkable); REQUIRE_NOT_NULL(checkable);
REQUIRE_NOT_NULL(cr); REQUIRE_NOT_NULL(cr);
@ -42,7 +42,7 @@ void ClusterZoneCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const Che
cr->SetCommand(commandName); cr->SetCommand(commandName);
cr->SetOutput(output); cr->SetOutput(output);
cr->SetState(state); cr->SetState(state);
checkable->ProcessCheckResult(cr); checkable->ProcessCheckResult(cr, producer);
} }
return; return;
@ -97,7 +97,7 @@ void ClusterZoneCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const Che
cr->SetCommand(commandName); cr->SetCommand(commandName);
cr->SetOutput(output); cr->SetOutput(output);
cr->SetState(state); cr->SetState(state);
checkable->ProcessCheckResult(cr); checkable->ProcessCheckResult(cr, producer);
} }
return; return;
@ -123,7 +123,7 @@ void ClusterZoneCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const Che
cr->SetCommand(commandName); cr->SetCommand(commandName);
cr->SetOutput(output); cr->SetOutput(output);
cr->SetState(state); cr->SetState(state);
checkable->ProcessCheckResult(cr); checkable->ProcessCheckResult(cr, producer);
} }
return; return;
} }
@ -213,6 +213,6 @@ void ClusterZoneCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const Che
new PerfdataValue("sum_bytes_received_per_second", bytesReceivedPerSecond) new PerfdataValue("sum_bytes_received_per_second", bytesReceivedPerSecond)
})); }));
checkable->ProcessCheckResult(cr); checkable->ProcessCheckResult(cr, producer);
} }
} }

View File

@ -17,7 +17,7 @@ class ClusterZoneCheckTask
{ {
public: public:
static void ScriptFunc(const Checkable::Ptr& service, const CheckResult::Ptr& cr, static void ScriptFunc(const Checkable::Ptr& service, const CheckResult::Ptr& cr,
const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros); const CheckResultProducer::Ptr& producer, const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros);
private: private:
ClusterZoneCheckTask(); ClusterZoneCheckTask();