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

Merge pull request #3220 from Icinga/fix/filter-by-custom-variables

Browse Source 
Fix filter by host custom variables
This commit is contained in:
lippserd 2018-01-11 11:40:22 +01:00 committed by GitHub
commit 6abb91421a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
View File

@ -964,6 +964,12 @@ abstract class IdoQuery extends DbQuery
$leftcol = 'h.host_object_id'; $leftcol = 'h.host_object_id';
} }
$mapped = $this->getMappedField($leftcol);
if ($mapped !== null) {
$this->requireColumn($leftcol);
$leftcol = $mapped;
}
$joinOn = sprintf( $joinOn = sprintf(
$this->customVarsJoinTemplate, $this->customVarsJoinTemplate,
$leftcol, $leftcol,

13
modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
View File

@ -18,6 +18,9 @@ class ServicegroupQuery extends IdoQuery
'hostgroups' => array( 'hostgroups' => array(
'hostgroup_name' => 'hgo.name1' 'hostgroup_name' => 'hgo.name1'
), ),
'hosts' => array(
'h.host_object_id' => 's.host_object_id'
),
'instances' => array( 'instances' => array(
'instance_name' => 'i.instance_name' 'instance_name' => 'i.instance_name'
), ),
@ -70,6 +73,16 @@ class ServicegroupQuery extends IdoQuery
); );
} }
/**
* Join hosts
*
* This is required to make filters work which filter by host custom variables.
*/
protected function joinHosts()
{
$this->requireVirtualTable('services');
}
/** /**
* Join instances * Join instances
*/ */