diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index c3877111ae..ec5b18ca25 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,12 @@ +2012-02-06 Vanessa Gil <vanessa.gil@artica.es> + * pandoradb.sql + pandoradb.postgreSQL.sql + pandoradb.oracle.sql + extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql + extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql + extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql: Removed field + unique_id to tevento table. + 2012-02-06 Vanessa Gil <vanessa.gil@artica.es> * godmode/events/custom_events.php operation/events/events_list.php: Show all groups in diff --git a/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql b/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql index f9b2579ec8..fd444e204d 100644 --- a/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql @@ -101,7 +101,7 @@ ON DELETE CASCADE; -- ----------------------------------------------------- ALTER TABLE `tevento` ADD COLUMN (`source` tinytext NOT NULL DEFAULT '', -`unique_id` tinytext NOT NULL DEFAULT '', `id_extra` tinytext NOT NULL DEFAULT ''); +`id_extra` tinytext NOT NULL DEFAULT ''); -- ----------------------------------------------------- -- Table `talert_snmp` diff --git a/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql b/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql index e43f08ee5a..16ea56ca22 100644 --- a/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql +++ b/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql @@ -107,7 +107,6 @@ references tplanned_downtime (id); -- ----------------------------------------------------- alter table tevento add (source VARCHAR2(100) default '' NOT NULL); -alter table tevento add (unique_id VARCHAR2(100) default '' NOT NULL); alter table tevento add (id_extra VARCHAR2(100) default '' NOT NULL); -- ----------------------------------------------------- diff --git a/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql b/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql index 15d7759ba4..48abddee6e 100644 --- a/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql +++ b/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql @@ -92,7 +92,6 @@ REFERENCES "tplanned_downtime"("id"); -- ----------------------------------------------------- ALTER TABLE "tevento" ADD COLUMN "source" text NULL default ''; -ALTER TABLE "tevento" ADD COLUMN "unique_id" text NULL default ''; ALTER TABLE "tevento" ADD COLUMN "id_extra" text NULL default ''; -- ----------------------------------------------------- diff --git a/pandora_console/pandoradb.oracle.sql b/pandora_console/pandoradb.oracle.sql index c60eddb282..91fadbbc2b 100644 --- a/pandora_console/pandoradb.oracle.sql +++ b/pandora_console/pandoradb.oracle.sql @@ -512,7 +512,6 @@ CREATE TABLE tevento ( user_comment CLOB, tags CLOB, source VARCHAR2(100) default '' NOT NULL, - unique_id VARCHAR2(100) default '' NOT NULL, id_extra VARCHAR2(100) default '' NOT NULL, CONSTRAINT tevento_event_type_cons CHECK (event_type IN ('unknown','alert_fired','alert_recovered','alert_ceased','alert_manual_validation','recon_host_detected','system','error','new_agent','going_up_warning','going_up_critical','going_down_warning','going_down_normal','going_down_critical','going_up_normal', 'configuration_change')) ); diff --git a/pandora_console/pandoradb.postgreSQL.sql b/pandora_console/pandoradb.postgreSQL.sql index 8b1bdd98d8..759e335e2b 100644 --- a/pandora_console/pandoradb.postgreSQL.sql +++ b/pandora_console/pandoradb.postgreSQL.sql @@ -404,7 +404,6 @@ CREATE TABLE "tevento" ( "user_comment" text NOT NULL, "tags" text NOT NULL, "source" text NOT NULL default '', - "unique_id" text NOT NULL default '', "id_extra" text NOT NULL default '' ); CREATE INDEX "tevento_id_1_idx" ON "tevento"("id_agente", "id_evento"); diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 88ad51b8db..1068e907c9 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -448,7 +448,6 @@ CREATE TABLE IF NOT EXISTS `tevento` ( `user_comment` text NOT NULL, `tags` text NOT NULL, `source` tinytext NOT NULL default '', - `unique_id` tinytext NOT NULL default '', `id_extra` tinytext NOT NULL default '', PRIMARY KEY (`id_evento`), KEY `indice_1` (`id_agente`,`id_evento`),