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

Forward the execute command through the zones

Browse Source
This commit is contained in:
Mattia Codato 2020-08-03 21:09:57 +02:00
parent c2f8d6df44
commit 951388797a
2 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/icinga/apiactions.cpp
View File

@ -806,6 +806,7 @@ Dictionary::Ptr ApiActions::ExecuteCommand(const ConfigObject::Ptr& object,
execParams->Set("source", uuid); execParams->Set("source", uuid);
execParams->Set("deadline", deadline); execParams->Set("deadline", deadline);
execParams->Set("macros", execMacros); execParams->Set("macros", execMacros);
execParams->Set("endpoint", resolved_endpoint);
/* Execute command */ /* Execute command */
bool local = endpointPtr == Endpoint::GetLocalEndpoint(); bool local = endpointPtr == Endpoint::GetLocalEndpoint();
@ -817,7 +818,7 @@ Dictionary::Ptr ApiActions::ExecuteCommand(const ConfigObject::Ptr& object,
execMessage->Set("method", "event::ExecuteCommand"); execMessage->Set("method", "event::ExecuteCommand");
execMessage->Set("params", execParams); execMessage->Set("params", execParams);
listener->SyncSendMessage(endpointPtr, execMessage); listener->RelayMessage(origin, checkable, execMessage, true);
} }
Dictionary::Ptr result = new Dictionary(); Dictionary::Ptr result = new Dictionary();

38
lib/icinga/clusterevents.cpp
View File

@ -619,7 +619,29 @@ Value ClusterEvents::AcknowledgementClearedAPIHandler(const MessageOrigin::Ptr&
Value ClusterEvents::ExecuteCommandAPIHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params) Value ClusterEvents::ExecuteCommandAPIHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params)
{ {
ApiListener::Ptr listener = ApiListener::GetInstance();
if (!listener)
return Empty;
Endpoint::Ptr execEndpoint = Endpoint::GetByName(params->Get("endpoint"));
if (execEndpoint != Endpoint::GetLocalEndpoint()) {
Zone::Ptr endpointZone = execEndpoint->GetZone();
Zone::Ptr localZone = Zone::GetLocalZone();
if (!endpointZone->IsChildOf(localZone)) {
return Empty;
}
Dictionary::Ptr execMessage = new Dictionary();
execMessage->Set("jsonrpc", "2.0");
execMessage->Set("method", "event::ExecuteCommand");
execMessage->Set("params", params);
listener->RelayMessage(origin, endpointZone, execMessage, true);
} else {
EnqueueCheck(origin, params); EnqueueCheck(origin, params);
}
return Empty; return Empty;
} }
@ -1084,5 +1106,21 @@ Value ClusterEvents::UpdateExecutionsAPIHandler(const MessageOrigin::Ptr& origin
newExecutions->CopyTo(executions); newExecutions->CopyTo(executions);
checkable->SetExecutions(executions); checkable->SetExecutions(executions);
ApiListener::Ptr listener = ApiListener::GetInstance();
if (!listener)
return Empty;
Dictionary::Ptr updateMessage = new Dictionary();
updateMessage->Set("jsonrpc", "2.0");
updateMessage->Set("method", "event::UpdateExecutions");
updateMessage->Set("params", params);
Zone::Ptr localZone = Zone::GetLocalZone();
Zone::Ptr parentZone = localZone->GetParent();
if (localZone != parentZone) {
listener->RelayMessage(origin, parentZone, updateMessage, true);
}
return Empty; return Empty;
} }