tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enable propagate host downtime commands for Icinga 2 

This only works when using the latest Icinga 2 snapshot packages. Before releasing Web 2.4.0, we have to include a check to only offer these commands when using Icinga 2 2.6.0+

refs #10774
This commit is contained in:
Eric Lippmann 2016-11-08 15:27:29 +01:00
parent 2b060d9bd4
commit 93474972bf
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php
View File

@ -34,24 +34,22 @@ class ScheduleHostDowntimeCommandForm extends ScheduleServiceDowntimeCommandForm
)
);
if (! $this->getBackend()->isIcinga2()) {
$this->addElement(
'select',
'child_hosts',
array(
'description' => $this->translate(
'Define what should be done with the child hosts of the hosts.'
),
'label' => $this->translate('Child Hosts'),
'multiOptions' => array(
0 => $this->translate('Do nothing with child hosts'),
1 => $this->translate('Schedule triggered downtime for all child hosts'),
2 => $this->translate('Schedule non-triggered downtime for all child hosts')
),
'value' => 0
)
);
}
$this->addElement(
'select',
'child_hosts',
array(
'description' => $this->translate(
'Define what should be done with the child hosts of the hosts.'
),
'label' => $this->translate('Child Hosts'),
'multiOptions' => array(
0 => $this->translate('Do nothing with child hosts'),
1 => $this->translate('Schedule triggered downtime for all child hosts'),
2 => $this->translate('Schedule non-triggered downtime for all child hosts')
),
'value' => 0
)
);
return $this;
}

7
modules/monitoring/library/Monitoring/Command/Renderer/IcingaApiCommandRenderer.php
View File

@ -10,6 +10,7 @@ use Icinga\Module\Monitoring\Command\Object\AddCommentCommand;
use Icinga\Module\Monitoring\Command\Object\DeleteCommentCommand;
use Icinga\Module\Monitoring\Command\Object\DeleteDowntimeCommand;
use Icinga\Module\Monitoring\Command\Object\ProcessCheckResultCommand;
use Icinga\Module\Monitoring\Command\Object\PropagateHostDowntimeCommand;
use Icinga\Module\Monitoring\Command\Object\RemoveAcknowledgementCommand;
use Icinga\Module\Monitoring\Command\Object\ScheduleServiceCheckCommand;
use Icinga\Module\Monitoring\Command\Object\ScheduleServiceDowntimeCommand;
@ -148,6 +149,12 @@ class IcingaApiCommandRenderer implements IcingaCommandRendererInterface
'fixed' => $command->getFixed(),
'trigger_name' => $command->getTriggerId()
);
if ($command->getObject()->getType() === $command::TYPE_HOST
&& $command instanceof PropagateHostDowntimeCommand
) {
/** @var \Icinga\Module\Monitoring\Command\Object\PropagateHostDowntimeCommand $command */
$data['child_options'] = $command->getTriggered() ? 1 : 2;
}
$this->applyFilter($data, $command->getObject());
return IcingaApiCommand::create($endpoint, $data);
}