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

IcingaEndpoint: rename address to host

This commit is contained in:
Thomas Gelf 2015-12-08 08:29:04 +01:00
parent e8c90ebb6b
commit cbd09c69f0
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/forms/IcingaEndpointForm.php
View File

@ -34,7 +34,7 @@ class IcingaEndpointForm extends DirectorObjectForm
)); ));
} }
$this->addElement('text', 'address', array( $this->addElement('text', 'host', array(
'label' => $this->translate('Endpoint address'), 'label' => $this->translate('Endpoint address'),
'description' => $this->translate('IP address / hostname of remote node') 'description' => $this->translate('IP address / hostname of remote node')
)); ));

4
application/tables/IcingaEndpointTable.php
View File

@ -15,7 +15,7 @@ class IcingaEndpointTable extends QuickTable
return array( return array(
'id' => 'e.id', 'id' => 'e.id',
'endpoint' => 'e.object_name', 'endpoint' => 'e.object_name',
'address' => 'e.address', 'host' => "(CASE WHEN e.host IS NULL THEN NULL ELSE CONCAT(e.host || ':' || COALESCE(e.port, 5665)) END)",
'zone' => 'z.object_name', 'zone' => 'z.object_name',
); );
} }
@ -30,7 +30,7 @@ class IcingaEndpointTable extends QuickTable
$view = $this->view(); $view = $this->view();
return array( return array(
'endpoint' => $view->translate('Endpoint'), 'endpoint' => $view->translate('Endpoint'),
'address' => $view->translate('Address'), 'host' => $view->translate('Host'),
'zone' => $view->translate('Zone'), 'zone' => $view->translate('Zone'),
); );
} }

2
library/Director/Objects/IcingaEndpoint.php
View File

@ -12,7 +12,7 @@ class IcingaEndpoint extends IcingaObject
'id' => null, 'id' => null,
'zone_id' => null, 'zone_id' => null,
'object_name' => null, 'object_name' => null,
'address' => null, 'host' => null,
'port' => null, 'port' => null,
'log_duration' => null, 'log_duration' => null,
'object_type' => null, 'object_type' => null,

5
schema/mysql-changes/upgrade_52.sql Normal file
View File

@ -0,0 +1,5 @@
ALTER TABLE icinga_endpoint
MODIFY object_type ENUM('object', 'template', 'external_object') NOT NULL,
ADD COLUMN host VARCHAR(255) DEFAULT NULL COMMENT 'IP address / hostname of remote node' AFTER object_name,
DROP column address;

4
schema/mysql.sql
View File

@ -322,10 +322,10 @@ CREATE TABLE icinga_endpoint (
id INT(10) UNSIGNED AUTO_INCREMENT NOT NULL, id INT(10) UNSIGNED AUTO_INCREMENT NOT NULL,
zone_id INT(10) UNSIGNED DEFAULT NULL, zone_id INT(10) UNSIGNED DEFAULT NULL,
object_name VARCHAR(255) NOT NULL, object_name VARCHAR(255) NOT NULL,
address VARCHAR(255) DEFAULT NULL COMMENT 'IP address / hostname of remote node', host VARCHAR(255) DEFAULT NULL COMMENT 'IP address / hostname of remote node',
port SMALLINT UNSIGNED DEFAULT NULL COMMENT '5665 if not set', port SMALLINT UNSIGNED DEFAULT NULL COMMENT '5665 if not set',
log_duration VARCHAR(32) DEFAULT NULL COMMENT '1d if not set', log_duration VARCHAR(32) DEFAULT NULL COMMENT '1d if not set',
object_type ENUM('object', 'template') NOT NULL, object_type ENUM('object', 'template', 'external_object') NOT NULL,
PRIMARY KEY (id), PRIMARY KEY (id),
UNIQUE INDEX object_name (object_name), UNIQUE INDEX object_name (object_name),
CONSTRAINT icinga_endpoint_zone CONSTRAINT icinga_endpoint_zone