parent
6ad40b5123
commit
e45723c4db
|
@ -14,6 +14,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\RemoveAcknowledgementCommandFo
|
||||||
use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleServiceCheckCommandForm;
|
use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleServiceCheckCommandForm;
|
||||||
use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleServiceDowntimeCommandForm;
|
use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleServiceDowntimeCommandForm;
|
||||||
use Icinga\Module\Monitoring\Forms\Command\Object\SendCustomNotificationCommandForm;
|
use Icinga\Module\Monitoring\Forms\Command\Object\SendCustomNotificationCommandForm;
|
||||||
|
use Icinga\Module\Monitoring\Forms\Command\Object\ToggleObjectFeaturesCommandForm;
|
||||||
use Icinga\Module\Monitoring\Object\ServiceList;
|
use Icinga\Module\Monitoring\Object\ServiceList;
|
||||||
use Icinga\Web\Url;
|
use Icinga\Web\Url;
|
||||||
use Icinga\Web\Widget\Tabextension\DashboardAction;
|
use Icinga\Web\Widget\Tabextension\DashboardAction;
|
||||||
|
@ -34,6 +35,27 @@ class ServicesController extends Controller
|
||||||
(string) $this->params->without(array('service_problem', 'service_handled', 'view'))
|
(string) $this->params->without(array('service_problem', 'service_handled', 'view'))
|
||||||
));
|
));
|
||||||
$this->serviceList = $serviceList;
|
$this->serviceList = $serviceList;
|
||||||
|
$this->serviceList->setColumns(array(
|
||||||
|
'host_display_name',
|
||||||
|
'host_handled',
|
||||||
|
'host_name',
|
||||||
|
'host_problem',
|
||||||
|
'host_state',
|
||||||
|
'service_acknowledged',
|
||||||
|
'service_active_checks_enabled',
|
||||||
|
'service_description',
|
||||||
|
'service_display_name',
|
||||||
|
'service_event_handler_enabled',
|
||||||
|
'service_flap_detection_enabled',
|
||||||
|
'service_handled',
|
||||||
|
'service_in_downtime',
|
||||||
|
'service_is_flapping',
|
||||||
|
'service_last_state_change',
|
||||||
|
'service_notifications_enabled',
|
||||||
|
'service_passive_checks_enabled',
|
||||||
|
'service_problem',
|
||||||
|
'service_state'
|
||||||
|
));
|
||||||
$this->view->baseFilter = $this->serviceList->getFilter();
|
$this->view->baseFilter = $this->serviceList->getFilter();
|
||||||
$this->view->listAllLink = Url::fromRequest()->setPath('monitoring/list/services');
|
$this->view->listAllLink = Url::fromRequest()->setPath('monitoring/list/services');
|
||||||
$this->getTabs()->add(
|
$this->getTabs()->add(
|
||||||
|
@ -51,26 +73,6 @@ class ServicesController extends Controller
|
||||||
|
|
||||||
protected function handleCommandForm(ObjectsCommandForm $form)
|
protected function handleCommandForm(ObjectsCommandForm $form)
|
||||||
{
|
{
|
||||||
$this->serviceList->setColumns(array(
|
|
||||||
'host_display_name',
|
|
||||||
'host_handled',
|
|
||||||
'host_name',
|
|
||||||
'host_problem',
|
|
||||||
'host_state',
|
|
||||||
'service_acknowledged',
|
|
||||||
'service_active_checks_enabled',
|
|
||||||
'service_description',
|
|
||||||
'service_display_name',
|
|
||||||
'service_handled',
|
|
||||||
'service_in_downtime',
|
|
||||||
'service_is_flapping',
|
|
||||||
'service_last_state_change',
|
|
||||||
'service_notifications_enabled',
|
|
||||||
'service_passive_checks_enabled',
|
|
||||||
'service_problem',
|
|
||||||
'service_state'
|
|
||||||
));
|
|
||||||
|
|
||||||
$form
|
$form
|
||||||
->setObjects($this->serviceList)
|
->setObjects($this->serviceList)
|
||||||
->setRedirectUrl(Url::fromPath('monitoring/services/show')->setParams($this->params))
|
->setRedirectUrl(Url::fromPath('monitoring/services/show')->setParams($this->params))
|
||||||
|
@ -92,25 +94,6 @@ class ServicesController extends Controller
|
||||||
->setObjects($this->serviceList)
|
->setObjects($this->serviceList)
|
||||||
->handleRequest();
|
->handleRequest();
|
||||||
$this->view->checkNowForm = $checkNowForm;
|
$this->view->checkNowForm = $checkNowForm;
|
||||||
$this->serviceList->setColumns(array(
|
|
||||||
'host_display_name',
|
|
||||||
'host_handled',
|
|
||||||
'host_name',
|
|
||||||
'host_problem',
|
|
||||||
'host_state',
|
|
||||||
'service_acknowledged',
|
|
||||||
'service_active_checks_enabled',
|
|
||||||
'service_description',
|
|
||||||
'service_display_name',
|
|
||||||
'service_handled',
|
|
||||||
'service_in_downtime',
|
|
||||||
'service_is_flapping',
|
|
||||||
'service_last_state_change',
|
|
||||||
'service_notifications_enabled',
|
|
||||||
'service_passive_checks_enabled',
|
|
||||||
'service_problem',
|
|
||||||
'service_state'
|
|
||||||
));
|
|
||||||
|
|
||||||
$acknowledgedObjects = $this->serviceList->getAcknowledgedObjects();
|
$acknowledgedObjects = $this->serviceList->getAcknowledgedObjects();
|
||||||
if (! empty($acknowledgedObjects)) {
|
if (! empty($acknowledgedObjects)) {
|
||||||
|
@ -121,6 +104,16 @@ class ServicesController extends Controller
|
||||||
$this->view->removeAckForm = $removeAckForm;
|
$this->view->removeAckForm = $removeAckForm;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$featureStatus = $this->serviceList->getFeatureStatus();
|
||||||
|
$toggleFeaturesForm = new ToggleObjectFeaturesCommandForm(array(
|
||||||
|
'backend' => $this->backend,
|
||||||
|
'objects' => $this->serviceList
|
||||||
|
));
|
||||||
|
$toggleFeaturesForm
|
||||||
|
->load((object) $featureStatus)
|
||||||
|
->handleRequest();
|
||||||
|
$this->view->toggleFeaturesForm = $toggleFeaturesForm;
|
||||||
|
|
||||||
$this->setAutorefreshInterval(15);
|
$this->setAutorefreshInterval(15);
|
||||||
$this->view->rescheduleAllLink = Url::fromRequest()->setPath('monitoring/services/reschedule-check');
|
$this->view->rescheduleAllLink = Url::fromRequest()->setPath('monitoring/services/reschedule-check');
|
||||||
$this->view->downtimeAllLink = Url::fromRequest()->setPath('monitoring/services/schedule-downtime');
|
$this->view->downtimeAllLink = Url::fromRequest()->setPath('monitoring/services/schedule-downtime');
|
||||||
|
|
|
@ -197,5 +197,7 @@
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
<h2><?= $this->translate('Feature Commands') ?></h2>
|
||||||
|
<?= $toggleFeaturesForm ?>
|
||||||
<?php endif ?>
|
<?php endif ?>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue