tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-26 23:34:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Servicegroups: Use query column servicegroup_name' instead of servicegroup'

Browse Source 
refs #8613
This commit is contained in:
Johannes Meyer 2015-04-10 16:28:57 +02:00
parent c59d5ac7d5
commit c10617d409
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -509,7 +509,7 @@ class Monitoring_ListController extends Controller
); );
$this->setAutorefreshInterval(12); $this->setAutorefreshInterval(12);
$query = $this->backend->select()->from('groupsummary', array( $query = $this->backend->select()->from('groupsummary', array(
'servicegroup', 'servicegroup_name',
'servicegroup_alias', 'servicegroup_alias',
'hosts_up', 'hosts_up',
'hosts_unreachable_handled', 'hosts_unreachable_handled',

20
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_name' => $s->servicegroup)); ?>"> <tr href="<?= $this->href('monitoring/list/services', array('servicegroup_name' => $s->servicegroup_name)); ?>">
<?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_name' => $s->servicegroup), array('servicegroup_name' => $s->servicegroup_name),
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>
@ -97,7 +97,7 @@
'monitoring/list/services', 'monitoring/list/services',
array( array(
'service_state' => 0, 'service_state' => 0,
'servicegroup_name' => $s->servicegroup, 'servicegroup_name' => $s->servicegroup_name,
'sort' => 'service_severity' 'sort' => 'service_severity'
), ),
array( array(
@ -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_name' => $s->servicegroup, 'servicegroup_name' => $s->servicegroup_name,
'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_name' => $s->servicegroup, 'servicegroup_name' => $s->servicegroup_name,
'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_name' => $s->servicegroup, 'servicegroup_name' => $s->servicegroup_name,
'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_name' => $s->servicegroup, 'servicegroup_name' => $s->servicegroup_name,
'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_name' => $s->servicegroup, 'servicegroup_name' => $s->servicegroup_name,
'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_name' => $s->servicegroup, 'servicegroup_name' => $s->servicegroup_name,
'sort' => 'service_severity' 'sort' => 'service_severity'
), ),
array( array(
@ -283,7 +283,7 @@
'monitoring/list/services', 'monitoring/list/services',
array( array(
'service_state' => 99, 'service_state' => 99,
'servicegroup_name' => $s->servicegroup, 'servicegroup_name' => $s->servicegroup_name,
'sort' => 'service_severity' 'sort' => 'service_severity'
), ),
array( array(

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

@ -44,7 +44,7 @@ class GroupSummaryQuery extends IdoQuery
'services_warning_last_state_change_unhandled' => 'MAX(CASE WHEN object_type = \'service\' AND state = 1 AND acknowledged + in_downtime + host_state = 0 THEN state_change ELSE 0 END)', 'services_warning_last_state_change_unhandled' => 'MAX(CASE WHEN object_type = \'service\' AND state = 1 AND acknowledged + in_downtime + host_state = 0 THEN state_change ELSE 0 END)',
'services_critical_last_state_change_unhandled' => 'MAX(CASE WHEN object_type = \'service\' AND state = 2 AND acknowledged + in_downtime + host_state = 0 THEN state_change ELSE 0 END)', 'services_critical_last_state_change_unhandled' => 'MAX(CASE WHEN object_type = \'service\' AND state = 2 AND acknowledged + in_downtime + host_state = 0 THEN state_change ELSE 0 END)',
'services_unknown_last_state_change_unhandled' => 'MAX(CASE WHEN object_type = \'service\' AND state = 3 AND acknowledged + in_downtime + host_state = 0 THEN state_change ELSE 0 END)', 'services_unknown_last_state_change_unhandled' => 'MAX(CASE WHEN object_type = \'service\' AND state = 3 AND acknowledged + in_downtime + host_state = 0 THEN state_change ELSE 0 END)',
'servicegroup' => 'servicegroup', 'servicegroup_name' => 'servicegroup_name',
'servicegroup_alias' => 'servicegroup_alias' 'servicegroup_alias' => 'servicegroup_alias'
) )
); );
@ -56,10 +56,10 @@ class GroupSummaryQuery extends IdoQuery
'host_state' 'host_state'
); );
if (in_array('servicegroup', $this->desiredColumns)) { if (in_array('servicegroup_name', $this->desiredColumns)) {
$columns[] = 'servicegroup'; $columns[] = 'servicegroup_name';
$columns[] = 'servicegroup_alias'; $columns[] = 'servicegroup_alias';
$groupColumns = array('servicegroup', 'servicegroup_alias'); $groupColumns = array('servicegroup_name', 'servicegroup_alias');
} else { } else {
$columns[] = 'hostgroup_name'; $columns[] = 'hostgroup_name';
$columns[] = 'hostgroup_alias'; $columns[] = 'hostgroup_alias';
@ -75,7 +75,7 @@ class GroupSummaryQuery extends IdoQuery
'severity' => 'host_severity' 'severity' => 'host_severity'
) )
); );
if (in_array('servicegroup', $this->desiredColumns)) { if (in_array('servicegroup_name', $this->desiredColumns)) {
$hosts->group(array( $hosts->group(array(
'sgo.name1', 'sgo.name1',
'ho.object_id', 'ho.object_id',

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
View File

@ -87,7 +87,7 @@ class HoststatusQuery extends IdoQuery
'hostgroup_alias' => 'hg.alias' 'hostgroup_alias' => 'hg.alias'
), ),
'servicegroups' => array( 'servicegroups' => array(
'servicegroup' => 'sgo.name1 COLLATE latin1_general_ci', 'servicegroup_name' => 'sgo.name1',
'servicegroup_alias' => 'sg.alias' 'servicegroup_alias' => 'sg.alias'
), ),
'contactgroups' => array( 'contactgroups' => array(

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

@ -13,7 +13,7 @@ class Groupsummary extends DataView
public function getColumns() public function getColumns()
{ {
return array( return array(
'servicegroup', 'servicegroup_name',
'servicegroup_alias', 'servicegroup_alias',
'hostgroup_name', 'hostgroup_name',
'hostgroup_alias', 'hostgroup_alias',