2011-07-08 Sergio Martin <sergio.martin@artica.es>

* pandoradb.sql
	pandoradb.postgreSQL.sql
	pandoradb.oracle.sql
	extras/pandoradb_migrate_v3.2_to_v4.0.sql: Added 'always' to the
	possible values into talert_templates.type



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4534 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2011-07-08 09:56:18 +00:00
parent bcfaf49723
commit 47b551da9a
5 changed files with 17 additions and 3 deletions

View File

@ -1,3 +1,11 @@
2011-07-08 Sergio Martin <sergio.martin@artica.es>
* pandoradb.sql
pandoradb.postgreSQL.sql
pandoradb.oracle.sql
extras/pandoradb_migrate_v3.2_to_v4.0.sql: Added 'always' to the
possible values into talert_templates.type
2011-07-08 Sergio Martin <sergio.martin@artica.es>
* include/functions_alerts.php: Add always condition to templates

View File

@ -208,3 +208,9 @@ ALTER TABLE `trecon_task` ADD COLUMN `disabled` tinyint(1) UNSIGNED NOT NULL DEF
-- -----------------------------------------------------
ALTER TABLE `tplanned_downtime` ADD COLUMN `only_alerts` TINYINT(1) NOT NULL DEFAULT 0;
-- -----------------------------------------------------
-- Table `talert_templates`
-- -----------------------------------------------------
ALTER TABLE `talert_templates` MODIFY COLUMN `type` ENUM('regex','max_min','max','min','equal','not_equal','warning','critical','onchange','unknown', 'always') DEFAULT NULL;

View File

@ -310,7 +310,7 @@ CREATE TABLE talert_templates (
field3_recovery CLOB NOT NULL,
priority NUMBER(10, 0) default 0 NOT NULL,
id_group NUMBER(10, 0) default 0 NOT NULL,
CONSTRAINT t_alert_templates_type_cons CHECK (type IN ('regex', 'max_min', 'max', 'min', 'equal', 'not_equal', 'warning', 'critical', 'onchange', 'unknown'))
CONSTRAINT t_alert_templates_type_cons CHECK (type IN ('regex', 'max_min', 'max', 'min', 'equal', 'not_equal', 'warning', 'critical', 'onchange', 'unknown', 'always'))
);
CREATE INDEX talert_templates_id_al_act_idx ON talert_templates(id_alert_action);

View File

@ -245,7 +245,7 @@ CREATE TABLE "talert_actions" (
"action_threshold" BIGINT NOT NULL default 0
);
CREATE TYPE type_talert_templates_alert_template AS ENUM ('regex', 'max_min', 'max', 'min', 'equal', 'not_equal', 'warning', 'critical', 'onchange', 'unknown');
CREATE TYPE type_talert_templates_alert_template AS ENUM ('regex', 'max_min', 'max', 'min', 'equal', 'not_equal', 'warning', 'critical', 'onchange', 'unknown', 'always');
CREATE TABLE "talert_templates" (
"id" SERIAL NOT NULL PRIMARY KEY,
"name" text default '',

View File

@ -255,7 +255,7 @@ CREATE TABLE IF NOT EXISTS `talert_templates` (
`field1` text default '',
`field2` text default '',
`field3` text NOT NULL,
`type` ENUM ('regex', 'max_min', 'max', 'min', 'equal', 'not_equal', 'warning', 'critical', 'onchange', 'unknown'),
`type` ENUM ('regex', 'max_min', 'max', 'min', 'equal', 'not_equal', 'warning', 'critical', 'onchange', 'unknown', 'always'),
`value` varchar(255) default '',
`matches_value` tinyint(1) default 0,
`max_value` double(18,2) default NULL,