From 0e709d5469574f779dc3065cf158aad7ddf7d9a6 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Fri, 13 Nov 2015 15:09:54 +0100 Subject: [PATCH] DataViewHost/Servicestatus: use hooked columns --- modules/monitoring/library/Monitoring/DataView/Hoststatus.php | 4 ++-- .../monitoring/library/Monitoring/DataView/Servicestatus.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/monitoring/library/Monitoring/DataView/Hoststatus.php b/modules/monitoring/library/Monitoring/DataView/Hoststatus.php index 0ab9dd92e..220ce2226 100644 --- a/modules/monitoring/library/Monitoring/DataView/Hoststatus.php +++ b/modules/monitoring/library/Monitoring/DataView/Hoststatus.php @@ -10,7 +10,7 @@ class HostStatus extends DataView */ public function getColumns() { - return array( + return array_merge($this->getHookedColumns(), array( 'instance_name', 'host_name', 'host_display_name', @@ -63,7 +63,7 @@ class HostStatus extends DataView 'host_problem', 'host_ipv4', 'host_acknowledgement_type' - ); + )); } /** diff --git a/modules/monitoring/library/Monitoring/DataView/Servicestatus.php b/modules/monitoring/library/Monitoring/DataView/Servicestatus.php index db44f62c6..389bc9ae0 100644 --- a/modules/monitoring/library/Monitoring/DataView/Servicestatus.php +++ b/modules/monitoring/library/Monitoring/DataView/Servicestatus.php @@ -10,7 +10,7 @@ class ServiceStatus extends DataView */ public function getColumns() { - return array( + return array_merge($this->getHookedColumns(), array( 'instance_name', 'host_name', 'host_display_name', @@ -98,7 +98,7 @@ class ServiceStatus extends DataView 'service_modified_service_attributes', 'service_host_name', 'service_acknowledgement_type', - ); + )); } /**