diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index a7660b1d72..9e1c29f69b 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,15 @@ +2013-04-25 Ramon Novoa + + * pandoradb.sql, + extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql, + extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql, + extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql, + pandoradb.postgreSQL.sql, + pandoradb.oracle.sql: Removed an unused column from tagente_datos_inc. + Fixes bug #3611681. + + * godmode/servers/modificar_server.php: Fixed a comment. + 2013-04-25 Miguel de Dios * include/javascript/pandora.js: set the title for the large diff --git a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql index 737b5ddf4a..a4382a3001 100644 --- a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql @@ -1119,3 +1119,10 @@ UPDATE talert_commands SET fields_descriptions = '["Agent name","Module -- --------------------------------------------------------------------- UPDATE tagente_estado SET last_known_status = last_status, last_status = 3 WHERE estado = 3; + +-- --------------------------------------------------------------------- +-- Table `tagente_datos_inc` +-- --------------------------------------------------------------------- + +ALTER TABLE tagente_datos_inc DROP COLUMN id_adi; + diff --git a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql index 308959c1c1..2e9491d2cf 100644 --- a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql +++ b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql @@ -1125,3 +1125,10 @@ UPDATE talert_commands SET fields_descriptions = '["Agent name","Module -- --------------------------------------------------------------------- UPDATE tagente_estado SET last_known_status = last_status, last_status = 3 WHERE estado = 3; + +-- --------------------------------------------------------------------- +-- Table `tagente_datos_inc` +-- --------------------------------------------------------------------- + +ALTER TABLE tagente_datos_inc DROP COLUMN id_adi; + diff --git a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql index 2c8f57fe02..dfb74295a8 100644 --- a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql +++ b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql @@ -1114,3 +1114,10 @@ UPDATE "talert_commands" SET "fields_descriptions" = '["Agent name","Module -- --------------------------------------------------------------------- UPDATE tagente_estado SET last_known_status = last_status, last_status = 3 WHERE estado = 3; + +-- --------------------------------------------------------------------- +-- Table `tagente_datos_inc` +-- --------------------------------------------------------------------- + +ALTER TABLE tagente_datos_inc DROP COLUMN id_adi; + diff --git a/pandora_console/godmode/servers/modificar_server.php b/pandora_console/godmode/servers/modificar_server.php index 549e8d36c0..0b57a76cc1 100644 --- a/pandora_console/godmode/servers/modificar_server.php +++ b/pandora_console/godmode/servers/modificar_server.php @@ -68,7 +68,7 @@ else { } } - // Move SNMP modules back to the enterprise server + // Reset module count if (isset($_GET["server_reset_counts"])) { $reslt = db_process_sql ("UPDATE tagente SET update_module_count=1, update_alert_count=1"); diff --git a/pandora_console/pandoradb.oracle.sql b/pandora_console/pandoradb.oracle.sql index 6d806f9449..2d93ba6fbc 100644 --- a/pandora_console/pandoradb.oracle.sql +++ b/pandora_console/pandoradb.oracle.sql @@ -112,7 +112,6 @@ CREATE INDEX tagente_datos_utimestamp_idx ON tagente_datos(utimestamp); -- Table `tagente_datos_inc` -- ----------------------------------------------------- CREATE TABLE tagente_datos_inc ( - id_adi NUMBER(10, 0) NOT NULL PRIMARY KEY, id_agente_modulo NUMBER(10, 0) default 0 NOT NULL, datos BINARY_DOUBLE default NULL, utimestamp NUMBER(10, 0) default 0 NOT NULL diff --git a/pandora_console/pandoradb.postgreSQL.sql b/pandora_console/pandoradb.postgreSQL.sql index f92a02eadd..684a494bf5 100644 --- a/pandora_console/pandoradb.postgreSQL.sql +++ b/pandora_console/pandoradb.postgreSQL.sql @@ -108,7 +108,6 @@ CREATE INDEX "tagente_datos_utimestamp_idx" ON "tagente_datos"("utimestamp"); -- Table `tagente_datos_inc` -- --------------------------------------------------------------------- CREATE TABLE "tagente_datos_inc" ( - "id_adi" SERIAL NOT NULL PRIMARY KEY, "id_agente_modulo" INTEGER NOT NULL default 0, "datos" DOUBLE PRECISION default NULL, "utimestamp" INTEGER NOT NULL default 0 diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 8bdb52c44c..61a2c490a1 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -102,11 +102,9 @@ CREATE TABLE IF NOT EXISTS `tagente_datos` ( -- Table `tagente_datos_inc` -- ----------------------------------------------------- CREATE TABLE IF NOT EXISTS `tagente_datos_inc` ( - `id_adi` int(10) unsigned NOT NULL auto_increment, `id_agente_modulo` int(10) unsigned NOT NULL default '0', `datos` double(18,2) default NULL, `utimestamp` int(20) unsigned default '0', - PRIMARY KEY (`id_adi`), KEY `data_inc_index_1` (`id_agente_modulo`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8;