tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-30 17:24:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Host,Service: add check_timeout property

Browse Source 
fixes #546
This commit is contained in:
Thomas Gelf 2017-07-13 12:25:23 +02:00
parent 0ea443cc84
commit 4a0e8df2f2
7 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,7 @@ class IcingaHost extends IcingaObject
'check_period_id' => null,
'check_interval' => null,
'retry_interval' => null,
'check_timeout' => null,
'enable_notifications' => null,
'enable_active_checks' => null,
'enable_passive_checks' => null,
@ -74,6 +75,7 @@ class IcingaHost extends IcingaObject
protected $intervalProperties = array(
'check_interval' => 'check_interval',
'check_timeout' => 'check_timeout',
'retry_interval' => 'retry_interval',
);

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

@ -27,6 +27,7 @@ class IcingaService extends IcingaObject
'check_period_id' => null,
'check_interval' => null,
'retry_interval' => null,
'check_timeout' => null,
'enable_notifications' => null,
'enable_active_checks' => null,
'enable_passive_checks' => null,
@ -75,6 +76,7 @@ class IcingaService extends IcingaObject
protected $intervalProperties = array(
'check_interval' => 'check_interval',
'check_timeout' => 'check_timeout',
'retry_interval' => 'retry_interval',
);

12
library/Director/Web/Form/DirectorObjectForm.php
View File

@ -1196,6 +1196,17 @@ abstract class DirectorObjectForm extends DirectorForm
)
);
$this->addElement(
'text',
'check_timeout',
array(
'label' => $this->translate('Check timeout'),
'description' => $this->translate(
"Check command timeout in seconds. Overrides the CheckCommand's timeout attribute"
)
)
);
$periods = $this->db->enumTimeperiods();
if (!empty($periods)) {
@ -1253,6 +1264,7 @@ abstract class DirectorObjectForm extends DirectorForm
'check_interval',
'retry_interval',
'max_check_attempts',
'check_timeout',
'check_period_id',
'enable_active_checks',
'enable_passive_checks',

9
schema/mysql-migrations/upgrade_135.sql Normal file
View File

@ -0,0 +1,9 @@
ALTER TABLE icinga_host
ADD COLUMN check_timeout SMALLINT UNSIGNED DEFAULT NULL AFTER retry_interval;
ALTER TABLE icinga_service
ADD COLUMN check_timeout SMALLINT UNSIGNED DEFAULT NULL AFTER retry_interval;
INSERT INTO director_schema_migration
(schema_version, migration_time)
VALUES (135, NOW());

4
schema/mysql.sql
View File

@ -444,6 +444,7 @@ CREATE TABLE icinga_host (
check_period_id INT(10) UNSIGNED DEFAULT NULL,
check_interval VARCHAR(8) DEFAULT NULL,
retry_interval VARCHAR(8) DEFAULT NULL,
check_timeout SMALLINT UNSIGNED DEFAULT NULL,
enable_notifications ENUM('y', 'n') DEFAULT NULL,
enable_active_checks ENUM('y', 'n') DEFAULT NULL,
enable_passive_checks ENUM('y', 'n') DEFAULT NULL,
@ -592,6 +593,7 @@ CREATE TABLE icinga_service (
check_period_id INT(10) UNSIGNED DEFAULT NULL,
check_interval VARCHAR(8) DEFAULT NULL,
retry_interval VARCHAR(8) DEFAULT NULL,
check_timeout SMALLINT UNSIGNED DEFAULT NULL,
enable_notifications ENUM('y', 'n') DEFAULT NULL,
enable_active_checks ENUM('y', 'n') DEFAULT NULL,
enable_passive_checks ENUM('y', 'n') DEFAULT NULL,
@ -1556,4 +1558,4 @@ CREATE TABLE icinga_user_resolved_var (
INSERT INTO director_schema_migration
(schema_version, migration_time)
VALUES (134, NOW());
VALUES (135, NOW());

9
schema/pgsql-migrations/upgrade_135.sql Normal file
View File

@ -0,0 +1,9 @@
ALTER TABLE icinga_host
ADD COLUMN check_timeout smallint DEFAULT NULL;
ALTER TABLE icinga_service
ADD COLUMN check_timeout smallint DEFAULT NULL;
INSERT INTO director_schema_migration
(schema_version, migration_time)
VALUES (135, NOW());

4
schema/pgsql.sql
View File

@ -568,6 +568,7 @@ CREATE TABLE icinga_host (
check_period_id integer DEFAULT NULL,
check_interval character varying(8) DEFAULT NULL,
retry_interval character varying(8) DEFAULT NULL,
check_timeout smallint DEFAULT NULL,
enable_notifications enum_boolean DEFAULT NULL,
enable_active_checks enum_boolean DEFAULT NULL,
enable_passive_checks enum_boolean DEFAULT NULL,
@ -742,6 +743,7 @@ CREATE TABLE icinga_service (
check_period_id integer DEFAULT NULL,
check_interval character varying(8) DEFAULT NULL,
retry_interval character varying(8) DEFAULT NULL,
check_timeout smallint DEFAULT NULL,
enable_notifications enum_boolean DEFAULT NULL,
enable_active_checks enum_boolean DEFAULT NULL,
enable_passive_checks enum_boolean DEFAULT NULL,
@ -1833,4 +1835,4 @@ CREATE INDEX user_resolved_var_schecksum ON icinga_user_resolved_var (checksum);
INSERT INTO director_schema_migration
(schema_version, migration_time)
VALUES (134, NOW());
VALUES (135, NOW());