Merge pull request #3074 from Icinga/fix/search-for-host-and-servicegroups

Allow to search for host and servicegroups by their case insensitive …

modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php

@@ -20,6 +20,7 @@ class HostgroupQuery extends IdoQuery
 
     protected $columnMap = array(
         'hostgroups' => array(
+            'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
             'hostgroup_alias'   => 'hg.alias COLLATE latin1_general_ci',
             'hostgroup_name'    => 'hgo.name1'
         ),

modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php

@@ -26,6 +26,7 @@ class ServicegroupQuery extends IdoQuery
             'service_description'   => 'so.name2'
         ),
         'servicegroups' => array(
+            'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
             'servicegroup_alias'    => 'sg.alias COLLATE latin1_general_ci',
             'servicegroup_name'     => 'sgo.name1'
         ),

modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php

@@ -34,7 +34,7 @@ class Hostgroupsummary extends DataView
 
     public function getSearchColumns()
     {
-        return array('hostgroup_name', 'hostgroup_alias');
+        return array('hostgroup', 'hostgroup_alias');
     }
 
     public function getSortRules()

modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php

@@ -27,7 +27,7 @@ class Servicegroupsummary extends DataView
 
     public function getSearchColumns()
     {
-        return array('servicegroup_name', 'servicegroup_alias');
+        return array('servicegroup', 'servicegroup_alias');
     }
 
     public function getSortRules()