tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-27 15:54:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove unncessary column definitions in the Hostgroupsummary and Servicegroupsummary data views

Browse Source
This commit is contained in:
Eric Lippmann 2017-07-27 15:03:12 +02:00
parent 0a3da99e7f
commit e42d86a4e1
2 changed files with 29 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
View File

@ -8,27 +8,18 @@ namespace Icinga\Module\Monitoring\DataView;
*/ */
class Hostgroupsummary extends DataView class Hostgroupsummary extends DataView
{ {
/**
* {@inheritdoc}
*/
public function getColumns() public function getColumns()
{ {
return array( return array(
'hostgroup_alias', 'hostgroup_alias',
'hostgroup_name', 'hostgroup_name',
'hosts_down_handled', 'hosts_down_handled',
'hosts_down_handled_last_state_change',
'hosts_down_unhandled', 'hosts_down_unhandled',
'hosts_down_unhandled_last_state_change',
'hosts_pending', 'hosts_pending',
'hosts_pending_last_state_change',
'hosts_total', 'hosts_total',
'hosts_unreachable_handled', 'hosts_unreachable_handled',
'hosts_unreachable_handled_last_state_change',
'hosts_unreachable_unhandled', 'hosts_unreachable_unhandled',
'hosts_unreachable_unhandled_last_state_change',
'hosts_up', 'hosts_up',
'hosts_up_last_state_change',
'services_critical_handled', 'services_critical_handled',
'services_critical_unhandled', 'services_critical_unhandled',
'services_ok', 'services_ok',
@ -41,59 +32,28 @@ class Hostgroupsummary extends DataView
); );
} }
/** public function getSearchColumns()
* {@inheritdoc} {
*/ return array('hostgroup_name', 'hostgroup_alias');
}
public function getSortRules()
{
return array(
'hostgroup_alias' => array(
'order' => self::SORT_ASC
)
);
}
public function getStaticFilterColumns() public function getStaticFilterColumns()
{ {
return array( return array(
'instance_name', 'instance_name',
'hosts_severity',
'host', 'host_alias', 'host_display_name', 'host_name', 'host', 'host_alias', 'host_display_name', 'host_name',
'hostgroup', 'hostgroup',
'service', 'service_description', 'service_display_name', 'service', 'service_description', 'service_display_name',
'servicegroup', 'servicegroup_alias', 'servicegroup_name' 'servicegroup', 'servicegroup_alias', 'servicegroup_name'
); );
} }
/**
* {@inheritdoc}
*/
public function getSearchColumns()
{
return array('hostgroup_alias');
}
/**
* {@inheritdoc}
*/
public function getSortRules()
{
return array(
'hostgroup_alias' => array(
'order' => self::SORT_ASC
),
'hosts_severity' => array(
'columns' => array(
'hosts_severity',
'hostgroup_alias ASC'
),
'order' => self::SORT_DESC
),
'hosts_total' => array(
'columns' => array(
'hosts_total',
'hostgroup_alias ASC'
),
'order' => self::SORT_ASC
),
'services_total' => array(
'columns' => array(
'services_total',
'hostgroup_alias ASC'
),
'order' => self::SORT_ASC
)
);
}
} }

64
modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
View File

@ -8,37 +8,37 @@ namespace Icinga\Module\Monitoring\DataView;
*/ */
class Servicegroupsummary extends DataView class Servicegroupsummary extends DataView
{ {
/**
* {@inheritdoc}
*/
public function getColumns() public function getColumns()
{ {
return array( return array(
'servicegroup_alias', 'servicegroup_alias',
'servicegroup_name', 'servicegroup_name',
'services_critical_handled', 'services_critical_handled',
'services_critical_handled_last_state_change',
'services_critical_unhandled', 'services_critical_unhandled',
'services_critical_unhandled_last_state_change',
'services_ok', 'services_ok',
'services_ok_last_state_change',
'services_pending', 'services_pending',
'services_pending_last_state_change',
'services_total', 'services_total',
'services_unknown_handled', 'services_unknown_handled',
'services_unknown_handled_last_state_change',
'services_unknown_unhandled', 'services_unknown_unhandled',
'services_unknown_unhandled_last_state_change',
'services_warning_handled', 'services_warning_handled',
'services_warning_handled_last_state_change', 'services_warning_unhandled'
'services_warning_unhandled', );
'services_warning_unhandled_last_state_change' }
public function getSearchColumns()
{
return array('servicegroup_name', 'servicegroup_alias');
}
public function getSortRules()
{
return array(
'servicegroup_alias' => array(
'order' => self::SORT_ASC
)
); );
} }
/**
* {@inheritdoc}
*/
public function getStaticFilterColumns() public function getStaticFilterColumns()
{ {
return array( return array(
@ -50,38 +50,4 @@ class Servicegroupsummary extends DataView
'servicegroup' 'servicegroup'
); );
} }
/**
* {@inheritdoc}
*/
public function getSearchColumns()
{
return array('servicegroup_alias');
}
/**
* {@inheritdoc}
*/
public function getSortRules()
{
return array(
'servicegroup_alias' => array(
'order' => self::SORT_ASC
),
'services_severity' => array(
'columns' => array(
'services_severity',
'servicegroup_alias ASC'
),
'order' => self::SORT_DESC
),
'services_total' => array(
'columns' => array(
'services_total',
'servicegroup_alias ASC'
),
'order' => self::SORT_ASC
)
);
}
} }