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

Get checakble name from params

Browse Source
This commit is contained in:
Mattia Codato 2020-07-20 12:46:22 +02:00
parent f59c60f85f
commit c6d4a9ac47
1 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/icinga/clusterevents-check.cpp
View File

@ -104,42 +104,20 @@ void ClusterEvents::ExecuteCheckFromQueue(const MessageOrigin::Ptr& origin, cons
if (params->Contains("source")) { if (params->Contains("source")) {
String uuid = params->Get("source"); String uuid = params->Get("source");
Host::Ptr host = new Host(); String checkableName = params->Get("host");
Dictionary::Ptr attrs = new Dictionary();
attrs->Set("__name", params->Get("host"));
attrs->Set("type", "Host");
/*
* Override the check timeout if the parent caller provided the value. Compatible with older versions not
* passing this inside the cluster message.
* This happens with host/service command_endpoint agents and the 'check_timeout' attribute being specified.
*/
if (params->Contains("check_timeout"))
attrs->Set("check_timeout", params->Get("check_timeout"));
Deserialize(host, attrs, false, FAConfig);
if (params->Contains("service")) if (params->Contains("service"))
host->SetExtension("agent_service_name", params->Get("service")); checkableName += "!" + params->Get("service");
attrs->Set(params->Get("command_type"), params->Get("command"));
attrs->Set("command_endpoint", sourceEndpoint->GetName());
Deserialize(host, attrs, false, FAConfig);
Checkable::Ptr checkable = host;
ObjectLock oLock (checkable);
/* Check deadline */ /* Check deadline */
double deadline = params->Get("deadline"); double deadline = params->Get("deadline");
if (Utility::GetTime() > deadline) { if (Utility::GetTime() > deadline) {\
Log(LogNotice, "ApiListener") Log(LogNotice, "ApiListener")
<< "Discarding 'ExecuteCheckFromQueue' event for checkable '" << checkable->GetName() << "Discarding 'ExecuteCheckFromQueue' event for checkable '" << checkableName
<< "' from '" << origin->FromClient->GetIdentity() << "': Deadline has expired."; << "' from '" << origin->FromClient->GetIdentity() << "': Deadline has expired.";
return; return;
} }
Checkable::ExecuteCommandProcessFinishedHandler = [checkable, listener, sourceEndpoint, origin, params] (const Value& commandLine, const ProcessResult& pr) { Checkable::ExecuteCommandProcessFinishedHandler = [checkableName, listener, sourceEndpoint, origin, params] (const Value& commandLine, const ProcessResult& pr) {
if (params->Get("command_type") == "check_command") { if (params->Get("command_type") == "check_command") {
Checkable::CurrentConcurrentChecks.fetch_sub(1); Checkable::CurrentConcurrentChecks.fetch_sub(1);
Checkable::DecreasePendingChecks(); Checkable::DecreasePendingChecks();
@ -148,7 +126,7 @@ void ClusterEvents::ExecuteCheckFromQueue(const MessageOrigin::Ptr& origin, cons
if (pr.ExitStatus > 3) { if (pr.ExitStatus > 3) {
Process::Arguments parguments = Process::PrepareCommand(commandLine); Process::Arguments parguments = Process::PrepareCommand(commandLine);
Log(LogWarning, "ApiListener") Log(LogWarning, "ApiListener")
<< "Command for object '" << checkable->GetName() << "' (PID: " << pr.PID << "Command for object '" << checkableName << "' (PID: " << pr.PID
<< ", arguments: " << Process::PrettyPrintArguments(parguments) << ") terminated with exit code " << ", arguments: " << Process::PrettyPrintArguments(parguments) << ") terminated with exit code "
<< pr.ExitStatus << ", output: " << pr.Output; << pr.ExitStatus << ", output: " << pr.Output;
} }