From f6edad93361427f104007db769b1dc5b581ddae3 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Thu, 14 May 2020 13:58:19 +0200 Subject: [PATCH] Transmit the user who clears an acknowledgement --- .../forms/Command/Object/RemoveAcknowledgementCommandForm.php | 1 + .../Monitoring/Command/Object/RemoveAcknowledgementCommand.php | 2 ++ .../Monitoring/Command/Renderer/IcingaApiCommandRenderer.php | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php b/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php index 7d6672225..e45a055a8 100644 --- a/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php @@ -107,6 +107,7 @@ class RemoveAcknowledgementCommandForm extends ObjectsCommandForm /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */ $removeAck = new RemoveAcknowledgementCommand(); $removeAck->setObject($object); + $removeAck->setAuthor($this->Auth()->getUser()->getUsername()); $this->getTransport($this->request)->send($removeAck); } Notification::success(mtp( diff --git a/modules/monitoring/library/Monitoring/Command/Object/RemoveAcknowledgementCommand.php b/modules/monitoring/library/Monitoring/Command/Object/RemoveAcknowledgementCommand.php index eb2b95ec2..31c81807d 100644 --- a/modules/monitoring/library/Monitoring/Command/Object/RemoveAcknowledgementCommand.php +++ b/modules/monitoring/library/Monitoring/Command/Object/RemoveAcknowledgementCommand.php @@ -8,6 +8,8 @@ namespace Icinga\Module\Monitoring\Command\Object; */ class RemoveAcknowledgementCommand extends ObjectCommand { + use CommandAuthor; + /** * (non-PHPDoc) * @see \Icinga\Module\Monitoring\Command\Object\ObjectCommand::$allowedObjects For the property documentation. diff --git a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaApiCommandRenderer.php b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaApiCommandRenderer.php index 7c22ef549..9557db3c4 100644 --- a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaApiCommandRenderer.php +++ b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaApiCommandRenderer.php @@ -257,7 +257,7 @@ class IcingaApiCommandRenderer implements IcingaCommandRendererInterface public function renderRemoveAcknowledgement(RemoveAcknowledgementCommand $command) { $endpoint = 'actions/remove-acknowledgement'; - $data = array(); + $data = ['author' => $command->getAuthor()]; $this->applyFilter($data, $command->getObject()); return IcingaApiCommand::create($endpoint, $data); }