From 9b7a8cec71656001cf8b181bd018a6c7a62dff0f Mon Sep 17 00:00:00 2001 From: slerena Date: Wed, 6 Aug 2014 07:37:46 +0000 Subject: [PATCH] 2014-08-06 Sancho Lerena * extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql, pandoradb.sql: Fixed bug introduced in commit 9604 altering tagente_modulo.post_process double precission making conversion from bytes to megabytes impossible (0,00000095367432). Pending to fix also the interface for module creation/edition which also fails. This is critical for SP1 release :( git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10384 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 10 ++++++++++ .../extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql | 2 -- pandora_console/pandoradb.sql | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 67824319e7..3621ffa829 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,13 @@ +2014-08-06 Sancho Lerena + + * extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql, + pandoradb.sql: Fixed bug introduced in commit 9604 + altering tagente_modulo.post_process double precission + making conversion from bytes to megabytes impossible + (0,00000095367432). Pending to fix also the interface for + module creation/edition which also fails. This is critical + for SP1 release :( + 2014-08-05 Alejandro Gallardo * general/main_menu.php: Improved the submenus state diff --git a/pandora_console/extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql b/pandora_console/extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql index d6f868e33f..7bee1fd162 100644 --- a/pandora_console/extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql @@ -48,8 +48,6 @@ INSERT INTO `tconfig_os` (`name`, `description`, `icon_name`) VALUES ('Satellite -- --------------------------------------------------------------------- -- Table `tagente_modulo` -- --------------------------------------------------------------------- -ALTER TABLE `tagente_modulo` MODIFY COLUMN `post_process` DOUBLE DEFAULT NULL; -/* 2014/05/21 */ ALTER TABLE `tagente_modulo` ADD COLUMN `min_ff_event_normal` int(4) unsigned default '0'; ALTER TABLE `tagente_modulo` ADD COLUMN `min_ff_event_warning` int(4) unsigned default '0'; ALTER TABLE `tagente_modulo` ADD COLUMN `min_ff_event_critical` int(4) unsigned default '0'; diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 320e0ff18f..4330f2932e 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -203,7 +203,7 @@ CREATE TABLE IF NOT EXISTS `tagente_modulo` ( `plugin_pass` text, `plugin_parameter` text, `id_plugin` int(10) default '0', - `post_process` double default NULL, + `post_process` double(18,5) default 0, `prediction_module` bigint(14) default '0', `max_timeout` int(4) unsigned default '0', `max_retries` int(4) unsigned default '0',