diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 3144b42134..12dd3e8ad3 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,13 @@ +2012-02-28 Vanessa Gil + + * pandoradb.sql + pandoradb.oracle.sql + pandoradb.postgreSQL.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: Fixed bug: Wrong module + type names in create module view. + 2012-02-28 Miguel de Dios * include/functions_networkmap.php: fixed into the function 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 e86a476308..aed626afe9 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 @@ -172,3 +172,10 @@ ALTER TABLE treport ADD COLUMN `id_template` INTEGER UNSIGNED DEFAULT 0; -- Table `tgraph` -- ----------------------------------------------------- ALTER TABLE `tgraph` ADD COLUMN `id_graph_template` int(11) NOT NULL DEFAULT 0; + +-- ----------------------------------------------------- +-- Table `ttipo_modulo` +-- ----------------------------------------------------- +UPDATE ttipo_modulo SET descripcion='Generic data' WHERE id_tipo=1; + +UPDATE ttipo_modulo SET descripcion='Generic data incremental' WHERE id_tipo=4; 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 099b74a4cd..4a7054ef96 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 @@ -163,3 +163,10 @@ ALTER TABLE treport ADD (id_template NUMBER(10, 0) default 0 NOT NULL); -- Table `tgraph` -- ----------------------------------------------------- ALTER TABLE tgraph ADD (id_graph_template NUMBER(11, 0) default 0 NOT NULL); + +-- ----------------------------------------------------- +-- Table `ttipo_modulo` +-- ----------------------------------------------------- +UPDATE ttipo_modulo SET descripcion='Generic data' WHERE id_tipo=1; + +UPDATE ttipo_modulo SET descripcion='Generic data incremental' WHERE id_tipo=4; 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 21fc661be9..c2ac245b14 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 @@ -150,3 +150,10 @@ ALTER TABLE "treport" ADD COLUMN "id_template" INTEGER NOT NULL default 0; -- Table `tgraph` -- ----------------------------------------------------- ALTER TABLE "tgraph" ADD COLUMN "id_graph_template" INTEGER NOT NULL default 0; + +-- ----------------------------------------------------- +-- Table `ttipo_modulo` +-- ----------------------------------------------------- +UPDATE "ttipo_modulo" SET "descripcion"='Generic data' WHERE "id_tipo"=1; + +UPDATE "ttipo_modulo" SET "descripcion"='Generic data incremental' WHERE "id_tipo"=4; diff --git a/pandora_console/pandoradb.data.oracle.sql b/pandora_console/pandoradb.data.oracle.sql index becc9d8272..8d3fe5be80 100644 --- a/pandora_console/pandoradb.data.oracle.sql +++ b/pandora_console/pandoradb.data.oracle.sql @@ -242,10 +242,10 @@ END;; -- Identifiers 30 and 31 are reserved for Enterprise data types BEGIN LOCK TABLE ttipo_modulo IN EXCLUSIVE MODE; -INSERT INTO ttipo_modulo VALUES (1,'generic_data',0,'Generic numeric','mod_data.png'); +INSERT INTO ttipo_modulo VALUES (1,'generic_data',0,'Generic data','mod_data.png'); INSERT INTO ttipo_modulo VALUES (2,'generic_proc',1,'Generic boolean','mod_proc.png'); INSERT INTO ttipo_modulo VALUES (3,'generic_data_string',2,'Generic string','mod_string.png'); -INSERT INTO ttipo_modulo VALUES (4,'generic_data_inc',0,'Generic numeric incremental','mod_data_inc.png'); +INSERT INTO ttipo_modulo VALUES (4,'generic_data_inc',0,'Generic data incremental','mod_data_inc.png'); INSERT INTO ttipo_modulo VALUES (6,'remote_icmp_proc',4,'Remote ICMP network agent, boolean data','mod_icmp_proc.png'); INSERT INTO ttipo_modulo VALUES (7,'remote_icmp',3,'Remote ICMP network agent (latency)','mod_icmp_data.png'); diff --git a/pandora_console/pandoradb.data.postgreSQL.sql b/pandora_console/pandoradb.data.postgreSQL.sql index 1b63b01da7..d24860f7ed 100644 --- a/pandora_console/pandoradb.data.postgreSQL.sql +++ b/pandora_console/pandoradb.data.postgreSQL.sql @@ -223,10 +223,10 @@ INSERT INTO "torigen" VALUES -- -- Identifiers 30 and 31 are reserved for Enterprise data types INSERT INTO "ttipo_modulo" VALUES -(1,'generic_data',0,'Generic numeric','mod_data.png'), +(1,'generic_data',0,'Generic data','mod_data.png'), (2,'generic_proc',1,'Generic boolean','mod_proc.png'), (3,'generic_data_string',2,'Generic string','mod_string.png'), -(4,'generic_data_inc',0,'Generic numeric incremental','mod_data_inc.png'), +(4,'generic_data_inc',0,'Generic data incremental','mod_data_inc.png'), (6,'remote_icmp_proc',4,'Remote ICMP network agent, boolean data','mod_icmp_proc.png'), (7,'remote_icmp',3,'Remote ICMP network agent (latency)','mod_icmp_data.png'), diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index 2b727c70a5..ec51b0d61a 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -229,10 +229,10 @@ INSERT INTO `torigen` VALUES -- Identifiers 30 and 31 are reserved for Enterprise data types INSERT INTO `ttipo_modulo` VALUES -(1,'generic_data',0,'Generic numeric','mod_data.png'), +(1,'generic_data',0,'Generic data','mod_data.png'), (2,'generic_proc',1,'Generic boolean','mod_proc.png'), (3,'generic_data_string',2,'Generic string','mod_string.png'), -(4,'generic_data_inc',0,'Generic numeric incremental','mod_data_inc.png'), +(4,'generic_data_inc',0,'Generic data incremental','mod_data_inc.png'), (6,'remote_icmp_proc',4,'Remote ICMP network agent, boolean data','mod_icmp_proc.png'), (7,'remote_icmp',3,'Remote ICMP network agent (latency)','mod_icmp_data.png'),