From 002b82083584b06753be0f73fda73fb33c40bdcf Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Thu, 9 Apr 2015 12:55:57 +0200 Subject: [PATCH] CommentQuery: Provide `service_host' additionally to `service_host_name' refs #8613 --- .../library/Monitoring/Backend/Ido/Query/CommentQuery.php | 1 + modules/monitoring/library/Monitoring/DataView/Comment.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php index 91800ef78..882a31ff6 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php @@ -22,6 +22,7 @@ class CommentQuery extends IdoQuery 'host_name' => 'CASE WHEN ho.name1 IS NULL THEN so.name1 ELSE ho.name1 END', 'service' => 'so.name2 COLLATE latin1_general_ci', 'service_description' => 'so.name2', + 'service_host' => 'so.name1 COLLATE latin1_general_ci', 'service_host_name' => 'so.name1' ), 'hosts' => array( diff --git a/modules/monitoring/library/Monitoring/DataView/Comment.php b/modules/monitoring/library/Monitoring/DataView/Comment.php index f7f3703b8..8d4e46f90 100644 --- a/modules/monitoring/library/Monitoring/DataView/Comment.php +++ b/modules/monitoring/library/Monitoring/DataView/Comment.php @@ -60,6 +60,6 @@ class Comment extends DataView */ public function getFilterColumns() { - return array('host', 'service'); + return array('host', 'service', 'service_host'); } }