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

Use `servicegroup_name' instead of `servicegroup' to filter services 

refs #8613
This commit is contained in:
Johannes Meyer 2015-04-09 11:43:51 +02:00
parent e5eca97169
commit 1e6f292910
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
modules/monitoring/application/views/scripts/list/servicegroups.phtml
View File

@ -28,7 +28,7 @@
</thead> </thead>
<tbody> <tbody>
<?php foreach ($servicegroups as $s): ?> <?php foreach ($servicegroups as $s): ?>
<tr href="<?= $this->href('monitoring/list/services', array('servicegroup' => $s->servicegroup)); ?>"> <tr href="<?= $this->href('monitoring/list/services', array('servicegroup_name' => $s->servicegroup)); ?>">
<?php if ($s->services_critical_last_state_change_unhandled): ?> <?php if ($s->services_critical_last_state_change_unhandled): ?>
<td class="state change critical unhandled"> <td class="state change critical unhandled">
<strong><?= $this->translate('CRITICAL'); ?></strong> <strong><?= $this->translate('CRITICAL'); ?></strong>
@ -82,7 +82,7 @@
<?= $this->qlink( <?= $this->qlink(
$s->servicegroup_alias, $s->servicegroup_alias,
'monitoring/list/services', 'monitoring/list/services',
array('servicegroup' => $s->servicegroup), array('servicegroup_name' => $s->servicegroup),
array('title' => sprintf($this->translate('List all services in the group "%s"'), $s->servicegroup_alias)) array('title' => sprintf($this->translate('List all services in the group "%s"'), $s->servicegroup_alias))
); ?> ); ?>
</td> </td>
@ -96,9 +96,9 @@
$s->services_ok, $s->services_ok,
'monitoring/list/services', 'monitoring/list/services',
array( array(
'service_state' => 0, 'service_state' => 0,
'servicegroup' => $s->servicegroup, 'servicegroup_name' => $s->servicegroup,
'sort' => 'service_severity' 'sort' => 'service_severity'
), ),
array( array(
'title' => sprintf( 'title' => sprintf(
@ -124,7 +124,7 @@
'service_acknowledged' => 0, 'service_acknowledged' => 0,
'service_in_downtime' => 0, 'service_in_downtime' => 0,
'host_problem' => 0, 'host_problem' => 0,
'servicegroup' => $s->servicegroup, 'servicegroup_name' => $s->servicegroup,
'sort' => 'service_severity' 'sort' => 'service_severity'
), ),
array( array(
@ -148,7 +148,7 @@
array( array(
'service_state' => 2, 'service_state' => 2,
'service_handled' => 1, 'service_handled' => 1,
'servicegroup' => $s->servicegroup, 'servicegroup_name' => $s->servicegroup,
'sort' => 'service_severity' 'sort' => 'service_severity'
), ),
array( array(
@ -178,7 +178,7 @@
'service_acknowledged' => 0, 'service_acknowledged' => 0,
'service_in_downtime' => 0, 'service_in_downtime' => 0,
'host_problem' => 0, 'host_problem' => 0,
'servicegroup' => $s->servicegroup, 'servicegroup_name' => $s->servicegroup,
'sort' => 'service_severity' 'sort' => 'service_severity'
), ),
array( array(
@ -202,7 +202,7 @@
array( array(
'service_state' => 3, 'service_state' => 3,
'service_handled' => 1, 'service_handled' => 1,
'servicegroup' => $s->servicegroup, 'servicegroup_name' => $s->servicegroup,
'sort' => 'service_severity' 'sort' => 'service_severity'
), ),
array( array(
@ -232,7 +232,7 @@
'service_acknowledged' => 0, 'service_acknowledged' => 0,
'service_in_downtime' => 0, 'service_in_downtime' => 0,
'host_problem' => 0, 'host_problem' => 0,
'servicegroup' => $s->servicegroup, 'servicegroup_name' => $s->servicegroup,
'sort' => 'service_severity' 'sort' => 'service_severity'
), ),
array( array(
@ -256,7 +256,7 @@
array( array(
'service_state' => 1, 'service_state' => 1,
'service_handled' => 1, 'service_handled' => 1,
'servicegroup' => $s->servicegroup, 'servicegroup_name' => $s->servicegroup,
'sort' => 'service_severity' 'sort' => 'service_severity'
), ),
array( array(
@ -282,9 +282,9 @@
$s->services_pending, $s->services_pending,
'monitoring/list/services', 'monitoring/list/services',
array( array(
'service_state' => 99, 'service_state' => 99,
'servicegroup' => $s->servicegroup, 'servicegroup_name' => $s->servicegroup,
'sort' => 'service_severity' 'sort' => 'service_severity'
), ),
array( array(
'title' => sprintf( 'title' => sprintf(

2
modules/monitoring/application/views/scripts/show/components/servicegroups.phtml
View File

@ -7,7 +7,7 @@ foreach ($object->servicegroups as $name => $alias) {
$list[] = $this->qlink( $list[] = $this->qlink(
$alias, $alias,
'monitoring/list/services', 'monitoring/list/services',
array('servicegroup' => $name), array('servicegroup_name' => $name),
array('title' => sprintf($this->translate('List all services in the group "%s"'), $alias)) array('title' => sprintf($this->translate('List all services in the group "%s"'), $alias))
); );
} }