Add end time and comment options to settings section for host/service downtime dialog

[hostdowntime_end_fixed], [hostdowntime_end_flexible], [hostdowntime_flexible_duration], [servicedowntime_end_fixed], [servicedwontime_end_flexible],
[servicedowntime_flexible_duration] and [comment_text] options added to [settings] section in config.ini file used in  host/service downtime dialog.

modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php

@@ -3,6 +3,7 @@
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
+use DateInterval;
 use DateTime;
 use Icinga\Application\Config;
 use Icinga\Module\Monitoring\Command\Object\PropagateHostDowntimeCommand;
@@ -15,6 +16,29 @@ use Icinga\Web\Notification;
  */
 class ScheduleHostDowntimeCommandForm extends ScheduleServiceDowntimeCommandForm
 {
+    /** @var bool */
+    protected $hostDowntimeAllServices;
+
+    public function init()
+    {
+        $this->start = new DateTime();
+        $config = Config::module('monitoring');
+        $this->commentText = $config->get('settings', 'hostdowntime_comment_text');
+
+        $this->hostDowntimeAllServices = (bool) $config->get('settings', 'hostdowntime_all_services', false);
+
+        $fixedEnd = clone $this->start;
+        $fixed = $config->get('settings', 'hostdowntime_end_fixed', 'PT1H');
+        $this->fixedEnd = $fixedEnd->add(new DateInterval($fixed));
+
+        $flexibleEnd = clone $this->start;
+        $flexible = $config->get('settings', 'hostdowntime_end_flexible', 'PT1H');
+        $this->flexibleEnd = $flexibleEnd->add(new DateInterval($flexible));
+
+        $flexibleDuration = $config->get('settings', 'hostdowntime_flexible_duration', 'PT2H');
+        $this->flexibleDuration = new DateInterval($flexibleDuration);
+    }
+
     /**
      * (non-PHPDoc)
      * @see \Icinga\Web\Form::createElements() For the method documentation.
@@ -23,8 +47,6 @@ class ScheduleHostDowntimeCommandForm extends ScheduleServiceDowntimeCommandForm
     {
         parent::createElements($formData);
 
-        $config = Config::module('monitoring');
-
         $this->addElement(
             'checkbox',
             'all_services',
@@ -33,7 +55,7 @@ class ScheduleHostDowntimeCommandForm extends ScheduleServiceDowntimeCommandForm
                     'Schedule downtime for all services on the hosts and the hosts themselves.'
                 ),
                 'label'         => $this->translate('All Services'),
-                'value'         => (bool) $config->get('settings', 'hostdowntime_all_services', false)
+                'value'         => $this->hostDowntimeAllServices
             )
         );
 

modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php

@@ -5,6 +5,7 @@ namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
 use DateTime;
 use DateInterval;
+use Icinga\Application\Config;
 use Icinga\Module\Monitoring\Command\Object\ScheduleServiceDowntimeCommand;
 use Icinga\Web\Notification;
 use Icinga\Web\Request;
@@ -24,18 +25,41 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
      */
     const FLEXIBLE = 'flexible';
 
+    /** @var DateTime downtime start */
+    protected $start;
+
+    /** @var DateTime fixed downtime end */
+    protected $fixedEnd;
+
+    /** @var DateTime flexible downtime end */
+    protected $flexibleEnd;
+
+    /** @var DateInterval flexible downtime duration */
+    protected $flexibleDuration;
+
+    /** @var mixed Comment text */
+    protected $commentText;
+
     /**
      * Initialize this form
      */
     public function init()
     {
-        $this->addDescription($this->translate(
+        $this->start = new DateTime();
-            'This command is used to schedule host and service downtimes. During the specified downtime,'
+
-            . ' Icinga will not send notifications out about the hosts and services. When the scheduled'
+        $config = Config::module('monitoring');
-            . ' downtime expires, Icinga will send out notifications for the hosts and services as it'
+
-            . ' normally would. Scheduled downtimes are preserved across program shutdowns and'
+        $this->commentText = $config->get('settings', 'servicedowntime_comment_text');
-            . ' restarts.'
+        $fixedEnd = clone $this->start;
-        ));
+        $fixed = $config->get('settings', 'servicedowntime_end_fixed', 'PT1H');
+        $this->fixedEnd = $fixedEnd->add(new DateInterval($fixed));
+
+        $flexibleEnd = clone $this->start;
+        $flexible = $config->get('settings', 'servicedowntime_end_flexible', 'PT1H');
+        $this->flexibleEnd = $flexibleEnd->add(new DateInterval($flexible));
+
+        $flexibleDuration = $config->get('settings', 'servicedowntime_flexible_duration', 'PT2H');
+        $this->flexibleDuration = new DateInterval($flexibleDuration);
     }
 
     /**
@@ -53,9 +77,16 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
      */
     public function createElements(array $formData = array())
     {
-        $start = new DateTime;
+        $this->addDescription($this->translate(
-        $end = clone $start;
+            'This command is used to schedule host and service downtimes. During the specified downtime,'
-        $end->add(new DateInterval('PT1H'));
+            . ' Icinga will not send notifications out about the hosts and services. When the scheduled'
+            . ' downtime expires, Icinga will send out notifications for the hosts and services as it'
+            . ' normally would. Scheduled downtimes are preserved across program shutdowns and'
+            . ' restarts.'
+        ));
+
+        $isFlexible = (bool) isset($formData['type']) && $formData['type'] === self::FLEXIBLE;
+
         $this->addElements(array(
             array(
                 'textarea',
@@ -68,7 +99,8 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
                         . ' the host or service that is having problems. Make sure you enter a brief description of'
                         . ' what you are doing.'
                     ),
-                    'attribs'       => array('class' => 'autofocus')
+                    'attribs'       => array('class' => 'autofocus'),
+                    'value'         => $this->commentText
                 )
             ),
             array(
@@ -78,7 +110,7 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
                     'required'        => true,
                     'label'           => $this->translate('Start Time'),
                     'description'     => $this->translate('Set the start date and time for the downtime.'),
-                    'value'         => $start
+                    'value'           => $this->start
                 )
             ),
             array(
@@ -88,7 +120,8 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
                     'required'        => true,
                     'label'           => $this->translate('End Time'),
                     'description'     => $this->translate('Set the end date and time for the downtime.'),
-                    'value'         => $end
+                    'preserveDefault' => true,
+                    'value'           => $isFlexible ? $this->flexibleEnd : $this->fixedEnd
                 )
             ),
             array(
@@ -128,7 +161,7 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
                 )
             )
         );
-        if (isset($formData['type']) && $formData['type'] === self::FLEXIBLE) {
+        if ($isFlexible) {
             $this->addElements(array(
                 array(
                     'number',
@@ -136,7 +169,7 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
                     array(
                         'required'  => true,
                         'label'     => $this->translate('Hours'),
-                        'value'     => 2,
+                        'value'     => $this->flexibleDuration->h,
                         'min'       => -1
                     )
                 ),
@@ -146,7 +179,7 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
                     array(
                         'required'  => true,
                         'label'     => $this->translate('Minutes'),
-                        'value'     => 0,
+                        'value'     => $this->flexibleDuration->m,
                         'min'       => -1
                     )
                 )

modules/monitoring/doc/03-Configuration.md

@@ -20,17 +20,24 @@ by this module.
 ### Default Settings <a id="monitoring-module-configuration-settings"></a>
 
 Option                            | Description
-------------------------------|-----------------------------------------------
+----------------------------------|-----------------------------------------------
 acknowledge_expire                | **Optional.** Check "Use Expire Time" in Acknowledgement dialog by default. Defaults to **0 (false)**.
 acknowledge_expire_time           | **Optional.** Set default value for "Expire Time" in Acknowledgement dialog, its calculated as now + this setting. Format is a [PHP Dateinterval](http://www.php.net/manual/en/dateinterval.construct.php). Defaults to **1 hour (PT1H)**.
 acknowledge_notify                | **Optional.** Check "Send Notification" in Acknowledgement dialog by default. Defaults to **1 (true)**.
 acknowledge_persistent            | **Optional.** Check "Persistent Comment" in Acknowledgement dialog by default. Defaults to **0 (false)**.
 acknowledge_sticky                | **Optional.** Check "Sticky Acknowledgement" in Acknowledgement dialog by default. Defaults to **0 (false)**.
 comment_expire                    | **Optional.** Check "Use Expire Time" in Comment dialog by default. Defaults to **0 (false)**.
+hostdowntime_comment_text         | **Optional.** Set default text for "Comment" in Host Downtime dialog by default.
+servicedowntime_comment_text      | **Optional.** Set default text for "Comment" in Service Downtime dialog by default.
 comment_expire_time               | **Optional.** Set default value for "Expire Time" in Comment dialog, its calculated as now + this setting. Format is a [PHP Dateinterval](http://www.php.net/manual/en/dateinterval.construct.php). Defaults to **1 hour (PT1H)**.
 custom_notification_forced        | **Optional.** Check "Forced" in Custom Notification dialog by default. Defaults to **0 (false)**.
 hostcheck_all_services            | **Optional.** Check "All Services" in Schedule Host Check dialog by default. Defaults to **0 (false)**.
-hostdowntime_all_services     | **Optional.** Check "All Services" in Schedule Host Downtime dialog by default. Defaults to **0 (false)**.
+hostdowntime_end_fixed            | **Optional.** Set default value for "End Time" in Schedule Host Downtime dialog for **Fixed** downtime, its calculated as now + this setting. Format is a [PHP Dateinterval](http://www.php.net/manual/en/dateinterval.construct.php). Defaults to **1 hour (PT1H)**.
+hostdowntime_end_flexible         | **Optional.** Set default value for "End Time" in Schedule Host Downtime dialog for **Flexible** downtime, its calculated as now + this setting. Format is a [PHP Dateinterval](http://www.php.net/manual/en/dateinterval.construct.php). Defaults to **1 hour (PT1H)**.
+hostdowntime_flexible_duration    | **Optional.** Set default value for "Flexible Duration" in Schedule Host Downtime dialog for **Flexible** downtime. Format is a [PHP Dateinterval](http://www.php.net/manual/en/dateinterval.construct.php). Defaults to **2 hour (PT2H)**.
+servicedowntime_end_fixed         | **Optional.** Set default value for "End Time" in Schedule Service Downtime dialog for **Fixed** downtime, its calculated as now + this setting. Format is a [PHP Dateinterval](http://www.php.net/manual/en/dateinterval.construct.php). Defaults to **1 hour (PT1H)**.
+servicedowntime_end_flexible      | **Optional.** Set default value for "End Time" in Schedule Service Downtime dialog for **Flexible** downtime, its calculated as now + this setting. Format is a [PHP Dateinterval](http://www.php.net/manual/en/dateinterval.construct.php). Defaults to **1 hour (PT1H)**.
+servicedowntime_flexible_duration | **Optional.** Set default value for "Flexible Duration" in Schedule Service Downtime dialog for **Flexible** downtime. Format is a [PHP Dateinterval](http://www.php.net/manual/en/dateinterval.construct.php). Defaults to **2 hour (PT2H)**.
 
 Example for having acknowledgements with 2 hours expire time by default.