tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

We need stricter control over Monitoring Object queries 

* fromRequest-generated ones are sometimes buggy and sometimes slow
* this is just a temporary quickfix for the worst problems
This commit is contained in:
Thomas Gelf 2014-04-17 16:41:10 +00:00
parent 57097bba16
commit f741bc01f3
1 changed files with 30 additions and 1 deletions
modules/monitoring/library/Monitoring/Object
AbstractObject.php

31
modules/monitoring/library/Monitoring/Object/AbstractObject.php
View File

@ -142,6 +142,7 @@ abstract class AbstractObject
public function fetchContacts()
{
/*
$query = Contact::fromRequest(
$this->request,
array(
@ -152,6 +153,21 @@ abstract class AbstractObject
)
)->getQuery()
->where('host_name', $this->host_name);
*/
$query = Contact::fromParams(array('backend' => null), array(
'contact_name',
'contact_alias',
'contact_email',
'contact_pager',
))->getQuery();
if ($this->type === 'service') {
$query->where('service_host_name', $this->host_name);
$query->where('service_description', $this->service_description);
} else {
$query->where('host_name', $this->host_name);
}
$this->contacts = $query->fetchAll();
return $this;
@ -173,6 +189,19 @@ abstract class AbstractObject
public function fetchContactgroups()
{
$query = Contactgroup::fromParams(array('backend' => null), array(
'contactgroup_name',
'contactgroup_alias'
))->getQuery();
if ($this->type === 'service') {
$query->where('service_host_name', $this->host_name);
$query->where('service_description', $this->service_description);
} else {
$query->where('host_name', $this->host_name);
}
/*
$query = Contactgroup::fromRequest(
$this->request,
array(
@ -180,7 +209,7 @@ abstract class AbstractObject
'contactgroup_alias'
)
)->getQuery();
*/
$this->contactgroups = $query->fetchAll();
return $this;