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

monitoring/list: add stateType parameter 

This allows one to show only hard states, useful for support dashboards.
This commit is contained in:
Thomas Gelf 2014-06-26 00:42:38 +02:00
parent c85a0ac11e
commit a91bbd3a75
1 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
modules/monitoring/application/controllers/ListController.php
View File

@ -64,13 +64,25 @@ class Monitoring_ListController extends Controller
if ($url = $this->hasBetterUrl()) {
return $this->redirectNow($url);
}
// Handle soft and hard states
$stateType = $this->params->shift('stateType', 'soft');
if ($stateType == 'hard') {
$stateColumn = 'host_hard_state';
$stateChangeColumn = 'host_last_hard_state_change';
} else {
$stateColumn = 'host_state';
$stateChangeColumn = 'host_last_state_change';
$stateType = 'soft';
}
$this->addTitleTab('hosts');
$this->setAutorefreshInterval(10);
$this->compactView = 'hosts-compact';
$query = $this->backend->select()->from('hostStatus', array_merge(array(
'host_icon_image',
'host_name',
'host_state',
'host_state' => $stateColumn,
'host_address',
'host_acknowledged',
'host_output',
@ -79,7 +91,7 @@ class Monitoring_ListController extends Controller
'host_state_type',
'host_handled',
'host_last_check',
'host_last_state_change',
'host_last_state_change' => $stateChangeColumn,
'host_notifications_enabled',
// 'host_unhandled_service_count',
'host_unhandled_services',
@ -115,6 +127,18 @@ class Monitoring_ListController extends Controller
if ($url = $this->hasBetterUrl()) {
return $this->redirectNow($url);
}
// Handle soft and hard states
$stateType = $this->params->shift('stateType', 'soft');
if ($stateType == 'hard') {
$stateColumn = 'service_hard_state';
$stateChangeColumn = 'service_last_hard_state_change';
} else {
$stateColumn = 'service_state';
$stateChangeColumn = 'service_last_state_change';
$stateType = 'soft';
}
$this->addTitleTab('services');
$this->view->showHost = true;
if ($host = $this->_getParam('host')) {
@ -133,14 +157,14 @@ class Monitoring_ListController extends Controller
'host_handled',
'service_description',
'service_display_name',
'service_state',
'service_state' => $stateColumn,
'service_in_downtime',
'service_acknowledged',
'service_handled',
'service_output',
'service_perfdata',
'service_attempt',
'service_last_state_change',
'service_last_state_change' => $stateChangeColumn,
'service_icon_image',
'service_is_flapping',
'service_state_type',
@ -175,11 +199,11 @@ class Monitoring_ListController extends Controller
));
$limit = $this->params->get('limit');
$this->view->limit = $limit;
if ($limit === 0) {
$this->view->services = $query->getQuery()->fetchAll();
} else {
if ($limit) {
// TODO: Workaround, paginate should be able to fetch limit from new params
$this->view->services = $query->paginate($limit);
$this->view->services = $query->paginate($this->params->get('limit'));
} else {
$this->view->services = $query->getQuery()->fetchAll();
}
}