mirror of
https://github.com/Icinga/icinga2.git
synced 2025-07-22 13:14:32 +02:00
Change command type 'notification_command' with 'NotificationCommand'
This commit is contained in:
parent
26685a9360
commit
96c34528a0
@ -593,7 +593,7 @@ Dictionary::Ptr ApiActions::ExecuteCommand(const ConfigObject::Ptr& object,
|
|||||||
command_type = HttpUtility::GetLastParameter(params, "command_type");
|
command_type = HttpUtility::GetLastParameter(params, "command_type");
|
||||||
|
|
||||||
/* Validate command_type */
|
/* Validate command_type */
|
||||||
if (command_type != "event_command" && command_type != "check_command" && command_type != "notification_command")
|
if (command_type != "event_command" && command_type != "check_command" && command_type != "NotificationCommand")
|
||||||
return ApiActions::CreateResult(400, "Invalid command_type '" + command_type + "'.");
|
return ApiActions::CreateResult(400, "Invalid command_type '" + command_type + "'.");
|
||||||
|
|
||||||
Checkable::Ptr checkable = dynamic_pointer_cast<Checkable>(object);
|
Checkable::Ptr checkable = dynamic_pointer_cast<Checkable>(object);
|
||||||
@ -653,7 +653,7 @@ Dictionary::Ptr ApiActions::ExecuteCommand(const ConfigObject::Ptr& object,
|
|||||||
command = "$check_command$";
|
command = "$check_command$";
|
||||||
} else if (command_type == "event_command") {
|
} else if (command_type == "event_command") {
|
||||||
command = "$event_command$";
|
command = "$event_command$";
|
||||||
} else if (command_type == "notification_command") {
|
} else if (command_type == "NotificationCommand") {
|
||||||
command = "$notification_command$";
|
command = "$notification_command$";
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -688,7 +688,7 @@ Dictionary::Ptr ApiActions::ExecuteCommand(const ConfigObject::Ptr& object,
|
|||||||
return ApiActions::CreateResult(404, "Can't find a valid " + command_type + " for '" + resolved_command + "'.");
|
return ApiActions::CreateResult(404, "Can't find a valid " + command_type + " for '" + resolved_command + "'.");
|
||||||
else
|
else
|
||||||
cmd->Execute(checkable, execMacros, false);
|
cmd->Execute(checkable, execMacros, false);
|
||||||
} else if (command_type == "notification_command") {
|
} else if (command_type == "NotificationCommand") {
|
||||||
NotificationCommand::Ptr cmd = GetSingleObjectByNameUsingPermissions(NotificationCommand::GetTypeName(), resolved_command, ActionsHandler::AuthenticatedApiUser);
|
NotificationCommand::Ptr cmd = GetSingleObjectByNameUsingPermissions(NotificationCommand::GetTypeName(), resolved_command, ActionsHandler::AuthenticatedApiUser);
|
||||||
if (!cmd)
|
if (!cmd)
|
||||||
return ApiActions::CreateResult(404, "Can't find a valid " + command_type + " for '" + resolved_command + "'.");
|
return ApiActions::CreateResult(404, "Can't find a valid " + command_type + " for '" + resolved_command + "'.");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user