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

HostServiceLoader: less logic in Exporter

This commit is contained in:
Thomas Gelf 2022-08-03 10:23:39 +02:00
parent 9015993b05
commit fae9783ff9
3 changed files with 185 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/Director/Cli/ObjectCommand.php
View File

@ -68,7 +68,7 @@ class ObjectCommand extends Command
if (!$object instanceof IcingaHost) {
$this->fail('--all-services is available for Hosts only');
}
$exporter->resolveHostServices();
$exporter->serviceLoader()->resolveHostServices();
}
$exporter->resolveObjects($resolve);
@ -83,7 +83,7 @@ class ObjectCommand extends Command
}
$object->renderToConfig($config);
if ($withServices) {
foreach ($exporter->fetchServicesForHost($object) as $service) {
foreach ($exporter->serviceLoader()->fetchServicesForHost($object) as $service) {
$service->renderToConfig($config);
}
}

146
library/Director/Data/Exporter.php
View File

@ -2,14 +2,10 @@
namespace Icinga\Module\Director\Data;
use gipfl\IcingaWeb2\Table\QueryBasedTable;
use gipfl\ZfDb\Adapter\Adapter;
use gipfl\ZfDb\Select;
use Icinga\Data\SimpleQuery;
use Icinga\Module\Director\Data\Db\DbObject;
use Icinga\Module\Director\Data\Db\DbObjectWithSettings;
use Icinga\Module\Director\Db;
use Icinga\Module\Director\Db\AppliedServiceSetLoader;
use Icinga\Module\Director\Objects\DirectorDatafield;
use Icinga\Module\Director\Objects\DirectorDatalist;
use Icinga\Module\Director\Objects\DirectorDatalistEntry;
@ -17,31 +13,25 @@ use Icinga\Module\Director\Objects\DirectorJob;
use Icinga\Module\Director\Objects\IcingaCommand;
use Icinga\Module\Director\Objects\IcingaHost;
use Icinga\Module\Director\Objects\IcingaObject;
use Icinga\Module\Director\Objects\IcingaService;
use Icinga\Module\Director\Objects\IcingaServiceSet;
use Icinga\Module\Director\Objects\IcingaTemplateChoice;
use Icinga\Module\Director\Objects\ImportSource;
use Icinga\Module\Director\Objects\InstantiatedViaHook;
use Icinga\Module\Director\Objects\SyncRule;
use Icinga\Module\Director\Repository\IcingaTemplateRepository;
use Icinga\Module\Director\Web\Table\IcingaHostAppliedServicesTable;
use Icinga\Module\Director\Web\Table\IcingaServiceSetServiceTable;
use Icinga\Module\Director\Web\Table\ObjectsTableService;
use Ramsey\Uuid\Uuid;
use RuntimeException;
use Zend_Db_Select;
class Exporter
{
/** @var Adapter|\Zend_Db_Adapter_Abstract */
protected $db;
/** @var FieldReferenceLoader */
protected $fieldReferenceLoader;
/** @var ?HostServiceLoader */
protected $serviceLoader = null;
protected $exportHostServices = false;
protected $resolveHostServices = false;
protected $showDefaults = false;
protected $showIds = false;
protected $resolveObjects = false;
@ -89,12 +79,6 @@ class Exporter
return $this;
}
public function resolveHostServices($enable = true)
{
$this->resolveHostServices = $enable;
return $this;
}
public function showDefaults($show = true)
{
$this->showDefaults = $show;
@ -110,6 +94,10 @@ class Exporter
public function resolveObjects($resolve = true)
{
$this->resolveObjects = $resolve;
if ($this->serviceLoader) {
$this->serviceLoader->resolveObjects($resolve);
}
return $this;
}
@ -171,7 +159,7 @@ class Exporter
} elseif ($object instanceof IcingaHost) {
if ($this->exportHostServices) {
$services = [];
foreach ($this->fetchServicesForHost($object) as $service) {
foreach ($this->serviceLoader()->fetchServicesForHost($object) as $service) {
$services[] = $this->export($service);
}
@ -180,122 +168,14 @@ class Exporter
}
}
public function fetchServicesForHost(IcingaHost $host)
public function serviceLoader()
{
$table = (new ObjectsTableService($this->connection))->setHost($host);
$services = $this->fetchServicesForTable($table);
if ($this->resolveHostServices) {
foreach ($this->fetchAllServicesForHost($host) as $service) {
$services[] = $service;
}
if ($this->serviceLoader === null) {
$this->serviceLoader = new HostServiceLoader($this->connection);
$this->serviceLoader->resolveObjects($this->resolveObjects);
}
return $services;
}
protected function fetchServicesForTable(QueryBasedTable $table)
{
$query = $table->getQuery();
if ($query instanceof Select || $query instanceof Zend_Db_Select) {
// What about SimpleQuery? IcingaHostAppliedServicesTable with branch in place?
$query->reset(Select::LIMIT_COUNT);
$query->reset(Select::LIMIT_OFFSET);
$rows = $this->db->fetchAll($query);
} elseif ($query instanceof SimpleQuery) {
$rows = $query->fetchAll();
} else {
throw new RuntimeException('Table query needs to be either a Select or a SimpleQuery instance');
}
$services = [];
foreach ($rows as $row) {
$service = IcingaService::loadWithUniqueId(Uuid::fromBytes($row->uuid), $this->connection);
if ($this->resolveObjects) {
$service = $service::fromPlainObject($service->toPlainObject(true), $this->connection);
}
$services[] = $service;
}
return $services;
}
protected function fetchAllServicesForHost(IcingaHost $host)
{
$services = [];
/** @var IcingaHost[] $parents */
$parents = IcingaTemplateRepository::instanceByObject($host)->getTemplatesFor($host, true);
foreach ($parents as $parent) {
$table = (new ObjectsTableService($this->connection))
->setHost($parent)
->setInheritedBy($host);
foreach ($this->fetchServicesForTable($table) as $service) {
$services[] = $service;
}
}
foreach ($this->getHostServiceSetTables($host) as $table) {
foreach ($this->fetchServicesForTable($table) as $service) {
$services[] = $service;
}
}
foreach ($parents as $parent) {
foreach ($this->getHostServiceSetTables($parent, $host) as $table) {
foreach ($this->fetchServicesForTable($table) as $service) {
$services[] = $service;
}
}
}
$appliedSets = AppliedServiceSetLoader::fetchForHost($host);
foreach ($appliedSets as $set) {
$table = IcingaServiceSetServiceTable::load($set)
// ->setHost($host)
->setAffectedHost($host);
foreach ($this->fetchServicesForTable($table) as $service) {
$services[] = $service;
}
}
$table = IcingaHostAppliedServicesTable::load($host);
foreach ($this->fetchServicesForTable($table) as $service) {
$services[] = $service;
}
return $services;
}
/**
* Duplicates Logic in HostController
*
* @param IcingaHost $host
* @param IcingaHost|null $affectedHost
* @return IcingaServiceSetServiceTable[]
*/
protected function getHostServiceSetTables(IcingaHost $host, IcingaHost $affectedHost = null)
{
$tables = [];
$db = $this->connection;
if ($affectedHost === null) {
$affectedHost = $host;
}
if ($host->get('id') === null) {
return $tables;
}
$query = $db->getDbAdapter()->select()
->from(['ss' => 'icinga_service_set'], 'ss.*')
->join(['hsi' => 'icinga_service_set_inheritance'], 'hsi.parent_service_set_id = ss.id', [])
->join(['hs' => 'icinga_service_set'], 'hs.id = hsi.service_set_id', [])
->where('hs.host_id = ?', $host->get('id'));
$sets = IcingaServiceSet::loadAll($db, $query, 'object_name');
/** @var IcingaServiceSet $set*/
foreach ($sets as $name => $set) {
$tables[] = IcingaServiceSetServiceTable::load($set)
->setHost($host)
->setAffectedHost($affectedHost);
}
return $tables;
return $this->serviceLoader;
}
protected function loadTemplateName($table, $id)

170
library/Director/Data/HostServiceLoader.php Normal file
View File

@ -0,0 +1,170 @@
<?php
namespace Icinga\Module\Director\Data;
use gipfl\IcingaWeb2\Table\QueryBasedTable;
use gipfl\ZfDb\Select;
use Icinga\Data\SimpleQuery;
use Icinga\Module\Director\Db;
use Icinga\Module\Director\Db\AppliedServiceSetLoader;
use Icinga\Module\Director\Objects\IcingaHost;
use Icinga\Module\Director\Objects\IcingaService;
use Icinga\Module\Director\Objects\IcingaServiceSet;
use Icinga\Module\Director\Repository\IcingaTemplateRepository;
use Icinga\Module\Director\Web\Table\IcingaHostAppliedServicesTable;
use Icinga\Module\Director\Web\Table\IcingaServiceSetServiceTable;
use Icinga\Module\Director\Web\Table\ObjectsTableService;
use Ramsey\Uuid\Uuid;
use RuntimeException;
use Zend_Db_Select;
class HostServiceLoader
{
/** @var Db */
protected $connection;
/** @var \Zend_Db_Adapter_Abstract */
protected $db;
/** @var bool */
protected $resolveHostServices = false;
/** @var bool */
protected $resolveObjects = false;
public function __construct(Db $connection)
{
$this->connection = $connection;
$this->db = $connection->getDbAdapter();
}
public function fetchServicesForHost(IcingaHost $host)
{
$table = (new ObjectsTableService($this->connection))->setHost($host);
$services = $this->fetchServicesForTable($table);
if ($this->resolveHostServices) {
foreach ($this->fetchAllServicesForHost($host) as $service) {
$services[] = $service;
}
}
return $services;
}
public function resolveHostServices($enable = true)
{
$this->resolveHostServices = $enable;
return $this;
}
public function resolveObjects($resolve = true)
{
$this->resolveObjects = $resolve;
return $this;
}
protected function fetchAllServicesForHost(IcingaHost $host)
{
$services = [];
/** @var IcingaHost[] $parents */
$parents = IcingaTemplateRepository::instanceByObject($host)->getTemplatesFor($host, true);
foreach ($parents as $parent) {
$table = (new ObjectsTableService($this->connection))
->setHost($parent)
->setInheritedBy($host);
foreach ($this->fetchServicesForTable($table) as $service) {
$services[] = $service;
}
}
foreach ($this->getHostServiceSetTables($host) as $table) {
foreach ($this->fetchServicesForTable($table) as $service) {
$services[] = $service;
}
}
foreach ($parents as $parent) {
foreach ($this->getHostServiceSetTables($parent, $host) as $table) {
foreach ($this->fetchServicesForTable($table) as $service) {
$services[] = $service;
}
}
}
$appliedSets = AppliedServiceSetLoader::fetchForHost($host);
foreach ($appliedSets as $set) {
$table = IcingaServiceSetServiceTable::load($set)
// ->setHost($host)
->setAffectedHost($host);
foreach ($this->fetchServicesForTable($table) as $service) {
$services[] = $service;
}
}
$table = IcingaHostAppliedServicesTable::load($host);
foreach ($this->fetchServicesForTable($table) as $service) {
$services[] = $service;
}
return $services;
}
/**
* Duplicates Logic in HostController
*
* @param IcingaHost $host
* @param IcingaHost|null $affectedHost
* @return IcingaServiceSetServiceTable[]
*/
protected function getHostServiceSetTables(IcingaHost $host, IcingaHost $affectedHost = null)
{
$tables = [];
$db = $this->connection;
if ($affectedHost === null) {
$affectedHost = $host;
}
if ($host->get('id') === null) {
return $tables;
}
$query = $db->getDbAdapter()->select()
->from(['ss' => 'icinga_service_set'], 'ss.*')
->join(['hsi' => 'icinga_service_set_inheritance'], 'hsi.parent_service_set_id = ss.id', [])
->join(['hs' => 'icinga_service_set'], 'hs.id = hsi.service_set_id', [])
->where('hs.host_id = ?', $host->get('id'));
$sets = IcingaServiceSet::loadAll($db, $query, 'object_name');
/** @var IcingaServiceSet $set*/
foreach ($sets as $name => $set) {
$tables[] = IcingaServiceSetServiceTable::load($set)
->setHost($host)
->setAffectedHost($affectedHost);
}
return $tables;
}
protected function fetchServicesForTable(QueryBasedTable $table)
{
$query = $table->getQuery();
if ($query instanceof Select || $query instanceof Zend_Db_Select) {
// What about SimpleQuery? IcingaHostAppliedServicesTable with branch in place?
$query->reset(Select::LIMIT_COUNT);
$query->reset(Select::LIMIT_OFFSET);
$rows = $this->db->fetchAll($query);
} elseif ($query instanceof SimpleQuery) {
$rows = $query->fetchAll();
} else {
throw new RuntimeException('Table query needs to be either a Select or a SimpleQuery instance');
}
$services = [];
foreach ($rows as $row) {
$service = IcingaService::loadWithUniqueId(Uuid::fromBytes($row->uuid), $this->connection);
if ($this->resolveObjects) {
$service = $service::fromPlainObject($service->toPlainObject(true), $this->connection);
}
$services[] = $service;
}
return $services;
}
}