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

Data\Db\DbQuery: rename also in monitoring module

Browse Source 
refs #6418
This commit is contained in:
Thomas Gelf 2014-06-06 06:51:11 +00:00
parent 1e9bc6c7d4
commit 3adf7752c4
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/monitoring/application/controllers/ListController.php
View File

@ -29,7 +29,6 @@
// {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}}
use Icinga\Application\Benchmark; use Icinga\Application\Benchmark;
use Icinga\Data\Db\Query;
use Icinga\Module\Monitoring\Controller; use Icinga\Module\Monitoring\Controller;
use Icinga\Web\Hook; use Icinga\Web\Hook;
use Icinga\Web\Widget\Tabextension\DashboardAction; use Icinga\Web\Widget\Tabextension\DashboardAction;

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

@ -30,7 +30,7 @@
namespace Icinga\Module\Monitoring\Backend\Ido\Query; namespace Icinga\Module\Monitoring\Backend\Ido\Query;
use Icinga\Logger\Logger; use Icinga\Logger\Logger;
use Icinga\Data\Db\Query; use Icinga\Data\Db\DbQuery;
use Icinga\Exception\ProgrammingError; use Icinga\Exception\ProgrammingError;
use Icinga\Application\Icinga; use Icinga\Application\Icinga;
use Icinga\Web\Session; use Icinga\Web\Session;

4
modules/monitoring/library/Monitoring/Object/Host.php
View File

@ -3,14 +3,14 @@
namespace Icinga\Module\Monitoring\Object; namespace Icinga\Module\Monitoring\Object;
use Icinga\Module\Monitoring\DataView\HostStatus; use Icinga\Module\Monitoring\DataView\HostStatus;
use Icinga\Data\Db\Query; use Icinga\Data\Db\DbQuery;
class Host extends AbstractObject class Host extends AbstractObject
{ {
public $type = 'host'; public $type = 'host';
public $prefix = 'host_'; public $prefix = 'host_';
protected function applyObjectFilter(Query $query) protected function applyObjectFilter(DbQuery $query)
{ {
return $query->where('host_name', $this->host_name); return $query->where('host_name', $this->host_name);
} }

4
modules/monitoring/library/Monitoring/Object/Service.php
View File

@ -3,14 +3,14 @@
namespace Icinga\Module\Monitoring\Object; namespace Icinga\Module\Monitoring\Object;
use Icinga\Module\Monitoring\DataView\ServiceStatus; use Icinga\Module\Monitoring\DataView\ServiceStatus;
use Icinga\Data\Db\Query; use Icinga\Data\Db\DbQuery;
class Service extends AbstractObject class Service extends AbstractObject
{ {
public $type = 'service'; public $type = 'service';
public $prefix = 'service_'; public $prefix = 'service_';
protected function applyObjectFilter(Query $query) protected function applyObjectFilter(DbQuery $query)
{ {
return $query->where('service_host_name', $this->host_name) return $query->where('service_host_name', $this->host_name)
->where('service_description', $this->service_description); ->where('service_description', $this->service_description);