upstream/icingadb-web
1
0
Fork 0
mirror of https://github.com/Icinga/icingadb-web.git synced 2026-05-28 04:36:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #21 from Icinga/fix/inefficient-history-joins

Browse source 
Fix inefficient history joins
This commit is contained in:
Johannes Meyer 2020-03-02 10:17:13 +01:00 committed by GitHub
commit d3dec9b85b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
application/controllers/HistoryController.php
View file

@ -22,8 +22,6 @@ class HistoryController extends Controller
'host.state',
'service',
'service.state',
'service.host',
'service.host.state',
'comment',
'downtime',
'notification',

2
application/controllers/NotificationsController.php
View file

@ -21,8 +21,6 @@ class NotificationsController extends Controller
'host',
'host.state',
'service',
'service.host',
'service.host.state',
'service.state'
]);

2
application/controllers/ServiceController.php
View file

@ -121,8 +121,6 @@ class ServiceController extends Controller
'host.state',
'service',
'service.state',
'service.host',
'service.host.state',
'comment',
'downtime',
'notification',

4
library/Icingadb/Model/CommentHistory.php
View file

@ -57,7 +57,7 @@ class CommentHistory extends Model
{
$relations->belongsTo('endpoint', Endpoint::class);
$relations->belongsTo('environment', Environment::class);
$relations->belongsTo('host', Host::class)->setJoinType('LEFT');
$relations->belongsTo('service', Service::class)->setJoinType('LEFT');
$relations->belongsTo('host', Host::class);
$relations->belongsTo('service', Service::class);
}
}

4
library/Icingadb/Model/DowntimeHistory.php
View file

@ -68,7 +68,7 @@ class DowntimeHistory extends Model
// @TODO(el): Add relation for triggered_by_id
$relations->belongsTo('endpoint', Endpoint::class);
$relations->belongsTo('environment', Environment::class);
$relations->belongsTo('host', Host::class)->setJoinType('LEFT');
$relations->belongsTo('service', Service::class)->setJoinType('LEFT');
$relations->belongsTo('host', Host::class);
$relations->belongsTo('service', Service::class);
}
}

4
library/Icingadb/Model/History.php
View file

@ -59,8 +59,8 @@ class History extends Model
// @TODO(el): Add relation for flapping_history_id
$relations->belongsTo('endpoint', Endpoint::class);
$relations->belongsTo('environment', Environment::class);
$relations->belongsTo('host', Host::class)->setJoinType('LEFT');
$relations->belongsTo('service', Service::class)->setJoinType('LEFT');
$relations->belongsTo('host', Host::class);
$relations->belongsTo('service', Service::class);
$relations->belongsTo('comment', CommentHistory::class)
->setCandidateKey('comment_history_id')
->setForeignKey('comment_id')

4
library/Icingadb/Model/NotificationHistory.php
View file

@ -58,7 +58,7 @@ class NotificationHistory extends Model
public function createRelations(Relations $relations)
{
$relations->belongsTo('environment', Environment::class);
$relations->belongsTo('host', Host::class)->setJoinType('LEFT');
$relations->belongsTo('service', Service::class)->setJoinType('LEFT');
$relations->belongsTo('host', Host::class);
$relations->belongsTo('service', Service::class);
}
}

4
library/Icingadb/Model/StateHistory.php
View file

@ -52,7 +52,7 @@ class StateHistory extends Model
{
$relations->belongsTo('endpoint', Endpoint::class);
$relations->belongsTo('environment', Environment::class);
$relations->belongsTo('host', Host::class)->setJoinType('LEFT');
$relations->belongsTo('service', Service::class)->setJoinType('LEFT');
$relations->belongsTo('host', Host::class);
$relations->belongsTo('service', Service::class);
}
}

2
library/Icingadb/Widget/ItemList/HistoryListItem.php
View file

@ -166,7 +166,7 @@ class HistoryListItem extends CommonListItem
if ($this->item->object_type === 'host') {
$link = $this->createHostLink($this->item->host, true);
} else {
$link = $this->createServiceLink($this->item->service, $this->item->service->host, true);
$link = $this->createServiceLink($this->item->service, $this->item->host, true);
}
$title->add([Html::tag('br'), $link]);

2
library/Icingadb/Widget/ItemList/NotificationListItem.php
View file

@ -105,7 +105,7 @@ class NotificationListItem extends CommonListItem
if ($this->item->object_type === 'host') {
$link = $this->createHostLink($this->item->host, true);
} else {
$link = $this->createServiceLink($this->item->service, $this->item->service->host, true);
$link = $this->createServiceLink($this->item->service, $this->item->host, true);
}
$title->add($link);