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

Add uuid to service sets.

This commit is contained in:
Ravi Kumar Kempapura Srinivasa 2021-10-28 16:33:38 +02:00 committed by Thomas Gelf
parent 5fe0a8812c
commit 388c79e430
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/controllers/ServicesetController.php
View File

@ -12,6 +12,7 @@ use Icinga\Module\Director\Web\Table\IcingaHostsMatchingFilterTable;
use Icinga\Module\Director\Web\Table\IcingaServiceSetHostTable; use Icinga\Module\Director\Web\Table\IcingaServiceSetHostTable;
use Icinga\Module\Director\Web\Table\IcingaServiceSetServiceTable; use Icinga\Module\Director\Web\Table\IcingaServiceSetServiceTable;
use gipfl\IcingaWeb2\Link; use gipfl\IcingaWeb2\Link;
use Ramsey\Uuid\Uuid;
class ServicesetController extends ObjectController class ServicesetController extends ObjectController
{ {
@ -102,11 +103,11 @@ class ServicesetController extends ObjectController
$name = $this->object->getObjectName(); $name = $this->object->getObjectName();
$tabs->add('services', [ $tabs->add('services', [
'url' => 'director/serviceset/services', 'url' => 'director/serviceset/services',
'urlParams' => ['name' => $name], 'urlParams' => ['uuid' => $this->object->getUniqueId()],
'label' => 'Services' 'label' => 'Services'
])->add('hosts', [ ])->add('hosts', [
'url' => 'director/serviceset/hosts', 'url' => 'director/serviceset/hosts',
'urlParams' => ['name' => $name], 'urlParams' => ['uuid' => $this->object->getUniqueId()],
'label' => 'Hosts' 'label' => 'Hosts'
]); ]);

3
library/Director/Objects/IcingaServiceSet.php
View File

@ -19,6 +19,7 @@ class IcingaServiceSet extends IcingaObject implements ExportInterface
protected $defaultProperties = array( protected $defaultProperties = array(
'id' => null, 'id' => null,
'uuid' => null,
'host_id' => null, 'host_id' => null,
'object_name' => null, 'object_name' => null,
'object_type' => null, 'object_type' => null,
@ -26,6 +27,8 @@ class IcingaServiceSet extends IcingaObject implements ExportInterface
'assign_filter' => null, 'assign_filter' => null,
); );
protected $uuidColumn = 'uuid';
protected $keyName = array('host_id', 'object_name'); protected $keyName = array('host_id', 'object_name');
protected $supportsImports = true; protected $supportsImports = true;

7
library/Director/Web/Table/ObjectSetTable.php
View File

@ -8,6 +8,7 @@ use gipfl\IcingaWeb2\Link;
use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; use gipfl\IcingaWeb2\Table\ZfQueryBasedTable;
use gipfl\IcingaWeb2\Url; use gipfl\IcingaWeb2\Url;
use Icinga\Module\Director\Restriction\FilterByNameRestriction; use Icinga\Module\Director\Restriction\FilterByNameRestriction;
use Ramsey\Uuid\Uuid;
class ObjectSetTable extends ZfQueryBasedTable class ObjectSetTable extends ZfQueryBasedTable
{ {
@ -47,7 +48,10 @@ class ObjectSetTable extends ZfQueryBasedTable
if ($row->object_type === 'apply') { if ($row->object_type === 'apply') {
$params['id'] = $row->id; $params['id'] = $row->id;
} else { } else {
$params = array('name' => $row->object_name); $params = [
'uuid' => Uuid::fromBytes($row->uuid)->toString(),
'name' => $row->object_name
];
} }
$url = Url::fromPath("director/${type}set", $params); $url = Url::fromPath("director/${type}set", $params);
@ -70,6 +74,7 @@ class ObjectSetTable extends ZfQueryBasedTable
$columns = [ $columns = [
'id' => 'os.id', 'id' => 'os.id',
'uuid' => 'os.uuid',
'object_name' => 'os.object_name', 'object_name' => 'os.object_name',
'object_type' => 'os.object_type', 'object_type' => 'os.object_type',
'assign_filter' => 'os.assign_filter', 'assign_filter' => 'os.assign_filter',

2
schema/mysql.sql
View File

@ -656,12 +656,14 @@ ALTER TABLE icinga_host_template_choice
CREATE TABLE icinga_service_set ( CREATE TABLE icinga_service_set (
id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
uuid VARBINARY(16) NOT NULL,
object_name VARCHAR(128) NOT NULL, object_name VARCHAR(128) NOT NULL,
object_type ENUM('object', 'template', 'external_object') NOT NULL, object_type ENUM('object', 'template', 'external_object') NOT NULL,
host_id INT(10) UNSIGNED DEFAULT NULL, host_id INT(10) UNSIGNED DEFAULT NULL,
description TEXT DEFAULT NULL, description TEXT DEFAULT NULL,
assign_filter TEXT DEFAULT NULL, assign_filter TEXT DEFAULT NULL,
PRIMARY KEY (id), PRIMARY KEY (id),
UNIQUE INDEX uuid (uuid),
UNIQUE KEY object_key (object_name, host_id), UNIQUE KEY object_key (object_name, host_id),
CONSTRAINT icinga_service_set_host CONSTRAINT icinga_service_set_host
FOREIGN KEY host (host_id) FOREIGN KEY host (host_id)