diff --git a/library/Director/Objects/IcingaService.php b/library/Director/Objects/IcingaService.php index 7bf1c214..1d21eb35 100644 --- a/library/Director/Objects/IcingaService.php +++ b/library/Director/Objects/IcingaService.php @@ -38,6 +38,7 @@ class IcingaService extends IcingaObject 'icon_image' => null, 'icon_image_alt' => null, 'use_agent' => null, + 'use_var_overrides' => null, ); protected $relations = array( @@ -58,6 +59,7 @@ class IcingaService extends IcingaObject 'enable_perfdata' => 'enable_perfdata', 'volatile' => 'volatile', 'use_agent' => 'use_agent', + 'use_var_overrides' => 'use_var_overrides', ); protected $intervalProperties = array( @@ -205,6 +207,11 @@ class IcingaService extends IcingaObject * @return string */ public function renderUse_agent() + { + return ''; + } + + public function renderUse_var_overrides() { // @codingStandardsIgnoreEnd return ''; diff --git a/schema/mysql-migrations/upgrade_105.sql b/schema/mysql-migrations/upgrade_105.sql new file mode 100644 index 00000000..da4efa86 --- /dev/null +++ b/schema/mysql-migrations/upgrade_105.sql @@ -0,0 +1,6 @@ +ALTER TABLE icinga_service + ADD COLUMN use_var_overrides ENUM('y', 'n') DEFAULT NULL; + +INSERT INTO director_schema_migration + (schema_version, migration_time) + VALUES (105, NOW()); diff --git a/schema/mysql.sql b/schema/mysql.sql index 474b32af..249a6c98 100644 --- a/schema/mysql.sql +++ b/schema/mysql.sql @@ -557,6 +557,7 @@ CREATE TABLE icinga_service ( icon_image VARCHAR(255) DEFAULT NULL, icon_image_alt VARCHAR(255) DEFAULT NULL, use_agent ENUM('y', 'n') DEFAULT NULL, + use_var_overrides ENUM('y', 'n') DEFAULT NULL, PRIMARY KEY (id), UNIQUE KEY object_key (object_name, host_id), CONSTRAINT icinga_service_host @@ -1312,4 +1313,4 @@ CREATE TABLE sync_run ( INSERT INTO director_schema_migration SET migration_time = NOW(), - schema_version = 104; + schema_version = 105; diff --git a/schema/pgsql-migrations/upgrade_105.sql b/schema/pgsql-migrations/upgrade_105.sql new file mode 100644 index 00000000..69ea0474 --- /dev/null +++ b/schema/pgsql-migrations/upgrade_105.sql @@ -0,0 +1,6 @@ +ALTER TABLE icinga_service + ADD COLUMN use_var_overrides enum_boolean DEFAULT NULL; + +INSERT INTO director_schema_migration + (schema_version, migration_time) + VALUES (105, NOW()); diff --git a/schema/pgsql.sql b/schema/pgsql.sql index 2e3a088c..5f93ccf5 100644 --- a/schema/pgsql.sql +++ b/schema/pgsql.sql @@ -704,6 +704,7 @@ CREATE TABLE icinga_service ( icon_image character varying(255) DEFAULT NULL, icon_image_alt character varying(255) DEFAULT NULL, use_agent enum_boolean DEFAULT NULL, + use_var_overrides enum_boolean DEFAULT NULL, PRIMARY KEY (id), -- UNIQUE INDEX object_name (object_name, zone_id), CONSTRAINT icinga_service_host @@ -1532,4 +1533,4 @@ CREATE UNIQUE INDEX notification_inheritance ON icinga_notification_inheritance INSERT INTO director_schema_migration (schema_version, migration_time) - VALUES (104, NOW()); + VALUES (105, NOW());