monitoring/commands: Support 'DISABLE_NOTIFICATIONS_EXPIRE_TIME'

refs #6593
Icinga · Sep 12, 2014 · 1d54c7f · 1d54c7f
1 parent 3f216f2
commit 1d54c7f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/...s/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php b/...s/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
@@ -66,7 +66,7 @@ public function onSuccess(Request $request)
     {
         $disableNotifications = new DisableNotificationsExpireCommand();
         $disableNotifications
-            ->setExpireTime($this->getElement('expire_time')->getValue());
+            ->setExpireTime($this->getElement('expire_time')->getValue()->getTimestamp());
         $this->getTransport($request)->send($disableNotifications);
         Notification::success(mt('monitoring', 'Disabling host and service notifications..'));
         return true;

diff --git a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
@@ -2,6 +2,7 @@
 
 namespace Icinga\Module\Monitoring\Command\Renderer;
 
+use Icinga\Module\Monitoring\Command\Instance\DisableNotificationsExpireCommand;
 use Icinga\Module\Monitoring\Command\Object\AcknowledgeProblemCommand;
 use Icinga\Module\Monitoring\Command\Object\AddCommentCommand;
 use Icinga\Module\Monitoring\Command\Object\DeleteCommentCommand;
@@ -386,4 +387,13 @@ public function renderRemoveAcknowledgement(RemoveAcknowledgementCommand $comman
         }
         return $commandString;
     }
+
+    public function renderDisableNotificationsExpire(DisableNotificationsExpireCommand $command)
+    {
+        return sprintf(
+            '%s;%u',
+            'DISABLE_NOTIFICATIONS_EXPIRE_TIME',
+            $command->getExpireTime()
+        );
+    }
 }