From f7d1444fd92385ea83ff3c384f1b3bb47e1b3f31 Mon Sep 17 00:00:00 2001 From: Lee Clemens Date: Tue, 24 Jan 2017 13:48:42 -0500 Subject: [PATCH] Permit external HostGroups refs #384 fixes #748 --- application/forms/IcingaHostForm.php | 5 ++++- schema/mysql-migrations/upgrade_130.sql | 6 ++++++ schema/mysql.sql | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 schema/mysql-migrations/upgrade_130.sql diff --git a/application/forms/IcingaHostForm.php b/application/forms/IcingaHostForm.php index 2361bc63..64b427a7 100644 --- a/application/forms/IcingaHostForm.php +++ b/application/forms/IcingaHostForm.php @@ -224,7 +224,10 @@ class IcingaHostForm extends DirectorObjectForm 'name' => 'object_name', 'display' => 'COALESCE(display_name, object_name)' ) - )->where('object_type = ?', 'object')->order('display'); + )->where( + 'object_type IN (?)', + array('object', 'external_object') + )->order('display'); return $db->fetchPairs($select); } diff --git a/schema/mysql-migrations/upgrade_130.sql b/schema/mysql-migrations/upgrade_130.sql new file mode 100644 index 00000000..c862d0d4 --- /dev/null +++ b/schema/mysql-migrations/upgrade_130.sql @@ -0,0 +1,6 @@ +ALTER TABLE icinga_hostgroup + MODIFY object_type enum('object', 'template', 'external_object') NOT NULL; + +INSERT INTO director_schema_migration +(schema_version, migration_time) +VALUES (130, NOW()); diff --git a/schema/mysql.sql b/schema/mysql.sql index 9f7990d8..d47066aa 100644 --- a/schema/mysql.sql +++ b/schema/mysql.sql @@ -730,7 +730,7 @@ CREATE TABLE icinga_service_set_var ( CREATE TABLE icinga_hostgroup ( id INT(10) UNSIGNED AUTO_INCREMENT NOT NULL, object_name VARCHAR(255) NOT NULL, - object_type ENUM('object', 'template') NOT NULL, + object_type ENUM('object', 'template', 'external_object') NOT NULL, disabled ENUM('y', 'n') NOT NULL DEFAULT 'n', display_name VARCHAR(255) DEFAULT NULL, assign_filter TEXT DEFAULT NULL, @@ -1508,4 +1508,4 @@ CREATE TABLE icinga_user_resolved_var ( INSERT INTO director_schema_migration (schema_version, migration_time) - VALUES (129, NOW()); + VALUES (130, NOW());