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

Merge branch 'master' into feature/user-and-group-management-8826

This commit is contained in:
Johannes Meyer 2015-05-20 10:46:55 +02:00
parent 093857641a 902c00e836
commit 71fa736144
8 changed files with 244 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/forms/ConfirmRemovalForm.php
View File

@ -11,11 +11,11 @@ use Icinga\Web\Form;
class ConfirmRemovalForm extends Form
{
/**
* Initalize this form
* Initialize this form
*/
public function init()
{
$this->setName('form_confirm_removal');
$this->setSubmitLabel($this->translate('Confirm Removal'));
$this->getSubmitLabel() ?: $this->setSubmitLabel($this->translate('Confirm Removal'));
}
}

26
library/Icinga/Cli/Params.php
View File

@ -167,7 +167,7 @@ class Params
*
* @throws MissingParameterException If the parameter was not given
*/
public function req($name, $strict = true)
public function getRequired($name, $strict = true)
{
if ($this->has($name)) {
$value = $this->get($name);
@ -258,6 +258,30 @@ class Params
return $result;
}
/**
* Require and remove a parameter
*
* @param string $name Name of the parameter
* @param bool $strict Whether the parameter's value must not be the empty string
*
* @return mixed
*
* @throws MissingParameterException If the parameter was not given
*/
public function shiftRequired($name, $strict = true)
{
if ($this->has($name)) {
$value = $this->get($name);
if (! $strict || strlen($value) > 0) {
$this->shift($name);
return $value;
}
}
$e = new MissingParameterException(t('Required parameter \'%s\' missing'), $name);
$e->setParameter($name);
throw $e;
}
/**
* Put the given value onto the argument stack
*

13
library/Icinga/Web/Controller.php
View File

@ -3,6 +3,7 @@
namespace Icinga\Web;
use Zend_Controller_Action_Exception;
use Icinga\Data\Sortable;
use Icinga\Data\QueryInterface;
use Icinga\Web\Controller\ModuleActionController;
@ -49,6 +50,18 @@ class Controller extends ModuleActionController
}
}
/**
* Immediately respond w/ HTTP 404
*
* @param $message
*
* @throws Zend_Controller_Action_Exception
*/
public function httpNotFound($message)
{
throw new Zend_Controller_Action_Exception($message, 404);
}
/**
* Create a SortBox widget and apply its sort rules on the given query
*

26
library/Icinga/Web/UrlParams.php
View File

@ -54,7 +54,7 @@ class UrlParams
*
* @throws MissingParameterException If the parameter was not given
*/
public function req($name, $strict = true)
public function getRequired($name, $strict = true)
{
if ($this->has($name)) {
$value = $this->get($name);
@ -138,6 +138,30 @@ class UrlParams
return $ret;
}
/**
* Require and remove a parameter
*
* @param string $name Name of the parameter
* @param bool $strict Whether the parameter's value must not be the empty string
*
* @return mixed
*
* @throws MissingParameterException If the parameter was not given
*/
public function shiftRequired($name, $strict = true)
{
if ($this->has($name)) {
$value = $this->get($name);
if (! $strict || strlen($value) > 0) {
$this->shift($name);
return $value;
}
}
$e = new MissingParameterException(t('Required parameter \'%s\' missing'), $name);
$e->setParameter($name);
throw $e;
}
public function addEncoded($param, $value = true)
{
$this->params[] = array($param, $this->cleanupValue($value));

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

@ -12,7 +12,6 @@ use Icinga\Web\Widget\Tabs;
use Icinga\Data\Filter\Filter;
use Icinga\Web\Widget;
use Icinga\Module\Monitoring\Forms\StatehistoryForm;
use Icinga\Data\Filterable;
class Monitoring_ListController extends Controller
{
@ -96,7 +95,7 @@ class Monitoring_ListController extends Controller
'host_current_check_attempt',
'host_max_check_attempts'
), $this->addColumns()));
$this->filterQuery($query, array('host', 'host_display_name'));
$this->filterQuery($query);
$this->applyRestriction('monitoring/hosts/filter', $query);
$this->view->hosts = $query;
@ -180,7 +179,7 @@ class Monitoring_ListController extends Controller
'max_check_attempts' => 'service_max_check_attempts'
), $this->addColumns());
$query = $this->backend->select()->from('serviceStatus', $columns);
$this->filterQuery($query, array('service', 'service_display_name'));
$this->filterQuery($query);
$this->applyRestriction('monitoring/services/filter', $query);
$this->view->services = $query;
@ -498,7 +497,7 @@ class Monitoring_ListController extends Controller
))->order('services_severity')->order('servicegroup_alias');
// TODO(el): Can't default to the sort rules of the data view because it's meant for both host groups and
// service groups. We should separate them.
$this->filterQuery($query, array('servicegroup', 'servicegroup_alias'));
$this->filterQuery($query);
$this->view->servicegroups = $query;
$this->setupLimitControl();
@ -535,6 +534,7 @@ class Monitoring_ListController extends Controller
'hosts_unreachable_last_state_change_handled',
'hosts_down_last_state_change_unhandled',
'hosts_unreachable_last_state_change_unhandled',
'hosts_total',
'services_ok',
'services_unknown_handled',
'services_unknown_unhandled',
@ -555,7 +555,7 @@ class Monitoring_ListController extends Controller
))->order('services_severity')->order('hostgroup_alias');
// TODO(el): Can't default to the sort rules of the data view because it's meant for both host groups and
// service groups. We should separate them.
$this->filterQuery($query, array('hostgroup', 'hostgroup_alias'));
$this->filterQuery($query);
$this->view->hostgroups = $query;
$this->setupLimitControl();
@ -626,15 +626,7 @@ class Monitoring_ListController extends Controller
$this->view->verticalPaginator = $pivot->paginateYAxis();
}
/**
* Apply filters on a query
*
* @param Filterable $query The query to apply filters on
* @param array $searchColumns Columns to search in
*
* @return Filterable $query
*/
protected function filterQuery(Filterable $query, array $searchColumns = null)
protected function filterQuery($query)
{
$editor = Widget::create('filterEditor')
->setQuery($query)
@ -642,11 +634,8 @@ class Monitoring_ListController extends Controller
'limit', 'sort', 'dir', 'format', 'view', 'backend',
'stateType', 'addColumns', '_dev'
)
->ignoreParams('page');
if ($searchColumns !== null) {
$editor->setSearchColumns($searchColumns);
}
$editor->handleRequest($this->getRequest());
->ignoreParams('page')
->handleRequest($this->getRequest());
$query->applyFilter($editor->getFilter());
$this->setupFilterControl($editor);

169
modules/monitoring/application/views/scripts/list/hostgroups.phtml
View File

@ -22,6 +22,8 @@ if (count($hostgroups) === 0) {
<thead>
<th><?= $this->translate('Last Problem'); ?></th>
<th><?= $this->translate('Host Group'); ?></th>
<th><?= $this->translate('Total Hosts'); ?></th>
<th><?= $this->translate('Host States'); ?></th>
<th><?= $this->translate('Total Services'); ?></th>
<th><?= $this->translate('Service States'); ?></th>
</thead>
@ -68,6 +70,173 @@ if (count($hostgroups) === 0) {
array('title' => sprintf($this->translate('List all hosts in the group "%s"'), $h->hostgroup_alias))
); ?>
</td>
<td class="total">
<?= $this->qlink(
$h->hosts_total,
'monitoring/list/hosts',
array('hostgroup_name' => $h->hostgroup_name),
array('title' => sprintf(
$this->translate('List all hosts in host group "%s"'),
$h->hostgroup_alias
))
); ?>
</td>
<td>
<?php if ($h->hosts_up): ?>
<span class="state ok">
<?= $this->qlink(
$h->hosts_up,
'monitoring/list/hosts',
array(
'host_state' => 0,
'hostgroup_name' => $h->hostgroup_name,
'sort' => 'host_severity'
),
array(
'title' => sprintf(
$this->translatePlural(
'List %u host that is currently in state UP in the host group "%s"',
'List %u hosts which are currently in state UP in the host group "%s"',
$h->hosts_up
),
$h->hosts_up,
$h->hostgroup_alias
)
)
); ?>
</span>
<?php endif ?>
<?php if ($h->hosts_down_unhandled): ?>
<span class="state critical">
<?= $this->qlink(
$h->hosts_down_unhandled,
'monitoring/list/hosts',
array(
'host_state' => 1,
'host_acknowledged' => 0,
'host_in_downtime' => 0,
'hostgroup_name' => $h->hostgroup_name,
'sort' => 'host_severity'
),
array(
'title' => sprintf(
$this->translatePlural(
'List %u host that is currently in state DOWN in the host group "%s"',
'List %u hosts which are currently in state DOWN in the host group "%s"',
$h->hosts_down_unhandled
),
$h->hosts_down_unhandled,
$h->hostgroup_alias
)
)
); ?>
<?php endif ?>
<?php if ($h->hosts_down_handled): ?>
<span class="state critical handled">
<?= $this->qlink(
$h->hosts_down_handled,
'monitoring/list/hosts',
array(
'host_state' => 1,
'host_handled' => 1,
'hostgroup_name' => $h->hostgroup_name,
'sort' => 'host_severity'
),
array(
'title' => sprintf(
$this->translatePlural(
'List %u host that is currently in state DOWN (Acknowledged) in the host group "%s"',
'List %u hosts which are currently in state DOWN (Acknowledged) in the host group "%s"',
$h->hosts_down_handled
),
$h->hosts_down_handled,
$h->hostgroup_alias
)
)
); ?>
</span>
<?php endif ?>
<?php if ($h->hosts_down_unhandled): ?>
</span>
<?php endif ?>
<?php if ($h->hosts_unreachable_unhandled): ?>
<span class="state unknown">
<?= $this->qlink(
$h->hosts_unreachable_unhandled,
'monitoring/list/hosts',
array(
'host_state' => 2,
'host_acknowledged' => 0,
'host_in_downtime' => 0,
'hostgroup_name' => $h->hostgroup_name,
'sort' => 'host_severity'
),
array(
'title' => sprintf(
$this->translatePlural(
'List %u host that is currently in state UNREACHABLE in the host group "%s"',
'List %u hosts which are currently in state UNREACHABLE in the host group "%s"',
$h->hosts_unreachable_unhandled
),
$h->hosts_unreachable_unhandled,
$h->hostgroup_alias
)
)
); ?>
<?php endif ?>
<?php if ($h->hosts_unreachable_handled): ?>
<span class="state unknown handled">
<?= $this->qlink(
$h->hosts_unreachable_handled,
'monitoring/list/hosts',
array(
'host_state' => 2,
'host_handled' => 1,
'hostgroup_name' => $h->hostgroup_name,
'sort' => 'host_severity'
),
array(
'title' => sprintf(
$this->translatePlural(
'List %u host that is currently in state UNREACHABLE (Acknowledged) in the host group "%s"',
'List %u hosts which are currently in state UNREACHABLE (Acknowledged) in the host group "%s"',
$h->hosts_unreachable_handled
),
$h->hosts_unreachable_handled,
$h->hostgroup_alias
)
)
); ?>
</span>
<?php endif ?>
<?php if ($h->hosts_unreachable_unhandled): ?>
</span>
<?php endif ?>
<?php if ($h->hosts_pending): ?>
<span class="state pending">
<?= $this->qlink(
$h->hosts_pending,
'monitoring/list/hosts',
array(
'host_state' => 99,
'hostgroup_name' => $h->hostgroup_name,
'sort' => 'host_severity'
),
array(
'title' => sprintf(
$this->translatePlural(
'List %u host that is currently in state PENDING in the host group "%s"',
'List %u hosts which are currently in state PENDING in the host group "%s"',
$h->hosts_pending
),
$h->hosts_pending,
$h->hostgroup_alias
)
)
); ?>
</span>
<?php endif ?>
</td>
<td class="total">
<?= $this->qlink(
$h->services_total,

1
modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
View File

@ -11,6 +11,7 @@ class GroupSummaryQuery extends IdoQuery
protected $columnMap = array(
'hoststatussummary' => array(
'hosts_total' => 'SUM(CASE WHEN object_type = \'host\' THEN 1 ELSE 0 END)',
'hosts_up' => 'SUM(CASE WHEN object_type = \'host\' AND state = 0 THEN 1 ELSE 0 END)',
'hosts_unreachable' => 'SUM(CASE WHEN object_type = \'host\' AND state = 2 THEN 1 ELSE 0 END)',
'hosts_unreachable_handled' => 'SUM(CASE WHEN object_type = \'host\' AND state = 2 AND acknowledged + in_downtime != 0 THEN 1 ELSE 0 END)',

1
modules/monitoring/library/Monitoring/DataView/Groupsummary.php
View File

@ -17,6 +17,7 @@ class Groupsummary extends DataView
'servicegroup_alias',
'hostgroup_name',
'hostgroup_alias',
'hosts_total',
'hosts_up',
'hosts_unreachable',
'hosts_unreachable_handled',