From c81d13d77a0f1bb2a6d146be6cee73840e65455c Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Tue, 26 May 2015 13:42:42 +0200 Subject: [PATCH] monitoring: Use the HostatusQuery in the HostStatus data view refs #7344 refs #9009 --- .../Monitoring/DataView/HostStatus.php | 23 ++++++------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/modules/monitoring/library/Monitoring/DataView/HostStatus.php b/modules/monitoring/library/Monitoring/DataView/HostStatus.php index a7c77e2e2..90d58643a 100644 --- a/modules/monitoring/library/Monitoring/DataView/HostStatus.php +++ b/modules/monitoring/library/Monitoring/DataView/HostStatus.php @@ -6,17 +6,7 @@ namespace Icinga\Module\Monitoring\DataView; class HostStatus extends DataView { /** - * @see DataView::init() - */ - public function init() - { - $this->query->setMode('host'); - } - - /** - * Retrieve columns provided by this view - * - * @return array + * {@inheritdoc} */ public function getColumns() { @@ -76,11 +66,6 @@ class HostStatus extends DataView ); } - public static function getQueryName() - { - return 'status'; - } - /** * The sort rules for this query * @@ -112,11 +97,17 @@ class HostStatus extends DataView ); } + /** + * {@inheritdoc} + */ public function getFilterColumns() { return array('host', 'hostgroup', 'hostgroup_name', 'service', 'servicegroup', 'servicegroup_name'); } + /** + * {@inheritdoc} + */ public function isValidFilterTarget($column) { if ($column[0] === '_'