From ff5696e7a6aeb3c4b396546b80073545a7256b1b Mon Sep 17 00:00:00 2001 From: Matthias Jentsch Date: Mon, 28 Sep 2015 15:00:03 +0200 Subject: [PATCH] Do not validate existence of customvar columns Improve performance and solve issues with differences in customvar case sensitivitty among different versions. refs #10172 --- modules/monitoring/library/Monitoring/DataView/DataView.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php index 845aa4db4..97879d53d 100644 --- a/modules/monitoring/library/Monitoring/DataView/DataView.php +++ b/modules/monitoring/library/Monitoring/DataView/DataView.php @@ -185,7 +185,11 @@ abstract class DataView implements QueryInterface, SortRules, FilterColumns, Ite */ public function isValidFilterTarget($column) { - return in_array($column, $this->getFilterColumns()); + // Customvar + if ($column[0] === '_' && preg_match('/^_(?:host|service)_/', $column)) { + return true; + } + return in_array($column, $this->getColumns()) || in_array($column, $this->getStaticFilterColumns()); } /**