Skip to content

Commit 1230fae

Browse files
authored
Fix broken host and servicegroup quick search (#994)
fixes #936
2 parents 8c13f5b + e04e6eb commit 1230fae

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

library/Icingadb/Model/Hostgroupsummary.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
/**
1717
* @property string $id
1818
* @property string $display_name
19+
* @property string $name_ci
1920
* @property string $name
2021
* @property int $hosts_down_handled
2122
* @property int $hosts_down_unhandled
@@ -75,6 +76,8 @@ public function getKeyName()
7576
public function getColumns()
7677
{
7778
return [
79+
'name' => 'hostgroup_name',
80+
'name_ci' => 'hostgroup_name_ci',
7881
'display_name' => 'hostgroup_display_name',
7982
'hosts_down_handled' => new Expression(
8083
'SUM(CASE WHEN host_state = 1'
@@ -94,7 +97,6 @@ public function getColumns()
9497
'SUM(CASE WHEN host_state = 0 THEN 1 ELSE 0 END)'
9598
),
9699
'hosts_severity' => new Expression('MAX(host_severity)'),
97-
'name' => 'hostgroup_name',
98100
'services_critical_handled' => new Expression(
99101
'SUM(CASE WHEN service_state = 2'
100102
. ' AND (service_handled = \'y\' OR service_reachable = \'n\') THEN 1 ELSE 0 END)'
@@ -153,6 +155,7 @@ public function getUnions()
153155
[
154156
'hostgroup_id' => 'hostgroup.id',
155157
'hostgroup_name' => 'hostgroup.name',
158+
'hostgroup_name_ci' => 'hostgroup.name_ci',
156159
'hostgroup_display_name' => 'hostgroup.display_name',
157160
'host_id' => 'host.id',
158161
'host_state' => 'state.soft_state',
@@ -174,6 +177,7 @@ public function getUnions()
174177
[
175178
'hostgroup_id' => 'hostgroup.id',
176179
'hostgroup_name' => 'hostgroup.name',
180+
'hostgroup_name_ci' => 'hostgroup.name_ci',
177181
'hostgroup_display_name' => 'hostgroup.display_name',
178182
'host_id' => new Expression('NULL'),
179183
'host_state' => new Expression('NULL'),
@@ -192,6 +196,7 @@ public function getUnions()
192196
[
193197
'hostgroup_id' => 'hostgroup.id',
194198
'hostgroup_name' => 'hostgroup.name',
199+
'hostgroup_name_ci' => 'hostgroup.name_ci',
195200
'hostgroup_display_name' => 'hostgroup.display_name',
196201
'host_id' => new Expression('NULL'),
197202
'host_state' => new Expression('NULL'),

library/Icingadb/Model/ServicegroupSummary.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
/**
1717
* @property string $id
1818
* @property string $display_name
19+
* @property string $name_ci
1920
* @property string $name
2021
* @property int $services_critical_handled
2122
* @property int $services_critical_unhandled
@@ -70,8 +71,9 @@ public function getKeyName()
7071
public function getColumns()
7172
{
7273
return [
73-
'display_name' => 'servicegroup_display_name',
7474
'name' => 'servicegroup_name',
75+
'name_ci' => 'servicegroup_name_ci',
76+
'display_name' => 'servicegroup_display_name',
7577
'services_critical_handled' => new Expression(
7678
'SUM(CASE WHEN service_state = 2'
7779
. ' AND (service_handled = \'y\' OR service_reachable = \'n\') THEN 1 ELSE 0 END)'
@@ -131,6 +133,7 @@ public function getUnions()
131133
[
132134
'servicegroup_id' => 'servicegroup.id',
133135
'servicegroup_name' => 'servicegroup.name',
136+
'servicegroup_name_ci' => 'servicegroup.name_ci',
134137
'servicegroup_display_name' => 'servicegroup.display_name',
135138
'service_id' => 'service.id',
136139
'service_state' => 'state.soft_state',
@@ -145,6 +148,7 @@ public function getUnions()
145148
[
146149
'servicegroup_id' => 'servicegroup.id',
147150
'servicegroup_name' => 'servicegroup.name',
151+
'servicegroup_name_ci' => 'servicegroup.name_ci',
148152
'servicegroup_display_name' => 'servicegroup.display_name',
149153
'service_id' => new Expression('NULL'),
150154
'service_state' => new Expression('NULL'),

0 commit comments

Comments
 (0)