2013-04-25 Ramon Novoa <rnovoa@artica.es>

* 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.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8056 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f

pandora_console/ChangeLog

@@ -1,3 +1,15 @@
+2013-04-25  Ramon Novoa  <rnovoa@artica.es>
+
+	* 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 <miguel.dedios@artica.es>
 
 	* include/javascript/pandora.js: set the title for the large

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&#x2
 -- ---------------------------------------------------------------------
 
 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;
+

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&#x2
 -- ---------------------------------------------------------------------
 
 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;
+

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;
+

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");
 		

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

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

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;