From 24d24500037d2202275a1ba27523bff6938472fc Mon Sep 17 00:00:00 2001 From: vgilc Date: Mon, 30 Apr 2012 12:21:38 +0000 Subject: [PATCH] 2012-04-30 Vanessa Gil * pandoradb.php extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql: Fixed: BLOB/TEXT column can't have a default value. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6229 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 6 + .../pandoradb_migrate_4.0.x_to_4.1.mysql.sql | 22 +-- pandora_console/pandoradb.sql | 150 +++++++++--------- 3 files changed, 92 insertions(+), 86 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index bfcd0d2d02..f2f9011e22 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2012-04-30 Vanessa Gil + + * pandoradb.php + extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql: Fixed: BLOB/TEXT column + can't have a default value. + 2012-04-30 Vanessa Gil * include/functions_server.php: Fixed broken link in server view. 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 3d1a9f20e0..5ff9b4654c 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 @@ -55,7 +55,7 @@ CREATE TABLE IF NOT EXISTS `tnetflow_report_content` ( ALTER TABLE `tusuario` ADD COLUMN `disabled` int(4) NOT NULL DEFAULT 0; ALTER TABLE `tusuario` ADD COLUMN `shortcut` tinyint(1) DEFAULT 0; -ALTER TABLE tusuario ADD COLUMN `shortcut_data` text default ''; +ALTER TABLE tusuario ADD COLUMN `shortcut_data` text; -- ----------------------------------------------------- -- Table `tincidencia` @@ -67,7 +67,7 @@ ALTER TABLE `tincidencia` ADD COLUMN `id_agent` int(10) unsigned NULL default 0; -- Table `tagente` -- ----------------------------------------------------- -ALTER TABLE `tagente` ADD COLUMN `url_address` mediumtext NULL default ''; +ALTER TABLE `tagente` ADD COLUMN `url_address` mediumtext NULL; -- ----------------------------------------------------- -- Table `talert_special_days` @@ -101,14 +101,14 @@ ON DELETE CASCADE; -- Table `tevento` -- ----------------------------------------------------- -ALTER TABLE `tevento` ADD COLUMN (`source` tinytext NOT NULL DEFAULT '', -`id_extra` tinytext NOT NULL DEFAULT ''); +ALTER TABLE `tevento` ADD COLUMN (`source` tinytext NOT NULL, +`id_extra` tinytext NOT NULL); -- ----------------------------------------------------- -- Table `talert_snmp` -- ----------------------------------------------------- -ALTER TABLE `talert_snmp` ADD COLUMN (`_snmp_f1_` text DEFAULT '', `_snmp_f2_` text DEFAULT '', `_snmp_f3_` text DEFAULT '', -`_snmp_f4_` text DEFAULT '', `_snmp_f5_` text DEFAULT '', `_snmp_f6_` text DEFAULT '', `trap_type` int(11) NOT NULL default '-1', +ALTER TABLE `talert_snmp` ADD COLUMN (`_snmp_f1_` text, `_snmp_f2_` text, `_snmp_f3_` text, +`_snmp_f4_` text, `_snmp_f5_` text, `_snmp_f6_` text, `trap_type` int(11) NOT NULL default '-1', `single_value` varchar(255) DEFAULT ''); -- ----------------------------------------------------- @@ -136,11 +136,11 @@ CREATE TABLE IF NOT EXISTS `tevent_filter` ( `id_group_filter` int(10) NOT NULL default 0, `id_name` varchar(600) NOT NULL, `id_group` int(10) NOT NULL default 0, - `event_type` text NOT NULL default '', + `event_type` text NOT NULL, `severity` int(10) NOT NULL default -1, `status` int(10) NOT NULL default -1, - `search` TEXT default '', - `text_agent` TEXT default '', + `search` TEXT, + `text_agent` TEXT, `pagination` int(10) NOT NULL default 25, `event_view_hr` int(10) NOT NULL default 8, `id_user_ack` TEXT, @@ -191,12 +191,12 @@ ALTER TABLE `tusuario` ADD COLUMN `data_section` TEXT NOT NULL; -- ----------------------------------------------------- -- Table `treport_content_item` -- ----------------------------------------------------- -ALTER TABLE `treport_content_item` ADD COLUMN `operation` TEXT DEFAULT ''; +ALTER TABLE `treport_content_item` ADD COLUMN `operation` TEXT; -- ----------------------------------------------------- -- Table `tmensajes` -- ----------------------------------------------------- -ALTER TABLE `tmensajes` MODIFY COLUMN `mensaje` TEXT NOT NULL DEFAULT ''; +ALTER TABLE `tmensajes` MODIFY COLUMN `mensaje` TEXT NOT NULL; -- ----------------------------------------------------- -- Table `talert_compound` diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 578b4f73e8..27a8bc23b4 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -59,7 +59,7 @@ CREATE TABLE IF NOT EXISTS `tagente` ( `timezone_offset` TINYINT(2) NULL DEFAULT '0' COMMENT 'nuber of hours of diference with the server timezone' , `icon_path` VARCHAR(127) NULL DEFAULT NULL COMMENT 'path in the server to the image of the icon representing the agent' , `update_gis_data` TINYINT(1) NOT NULL DEFAULT '1' COMMENT 'set it to one to update the position data (altitude, longitude, latitude) when getting information from the agent or to 0 to keep the last value and don\'t update it' , - `url_address` mediumtext NULL default '', + `url_address` mediumtext NULL, PRIMARY KEY (`id_agente`), KEY `nombre` (`nombre`), KEY `direccion` (`direccion`), @@ -110,7 +110,7 @@ CREATE TABLE IF NOT EXISTS `tagente_datos_log4x` ( CREATE TABLE `tagente_estado` ( `id_agente_estado` int(10) unsigned NOT NULL auto_increment, `id_agente_modulo` int(10) NOT NULL default '0', - `datos` text NOT NULL default '', + `datos` text NOT NULL, `timestamp` datetime NOT NULL default '1970-01-01 00:00:00', `estado` int(4) NOT NULL default '0', `id_agente` int(10) NOT NULL default '0', @@ -145,18 +145,18 @@ CREATE TABLE IF NOT EXISTS `tagente_modulo` ( `id_agente_modulo` int(10) unsigned NOT NULL auto_increment, `id_agente` int(10) unsigned NOT NULL default '0', `id_tipo_modulo` smallint(5) NOT NULL default '0', - `descripcion` TEXT NOT NULL default '', - `extended_info` TEXT NOT NULL default '', - `nombre` text NOT NULL default '', - `unit` text default '', + `descripcion` TEXT NOT NULL, + `extended_info` TEXT NOT NULL, + `nombre` text NOT NULL, + `unit` text, `id_policy_module` INTEGER unsigned NOT NULL default '0', `max` bigint(20) default '0', `min` bigint(20) default '0', `module_interval` int(4) unsigned default '0', `module_ff_interval` int(4) unsigned default '0', `tcp_port` int(4) unsigned default '0', - `tcp_send` TEXT default '', - `tcp_rcv` TEXT default '', + `tcp_send` TEXT, + `tcp_rcv` TEXT, `snmp_community` varchar(100) default '', `snmp_oid` varchar(255) default '0', `ip_target` varchar(100) default '', @@ -165,8 +165,8 @@ CREATE TABLE IF NOT EXISTS `tagente_modulo` ( `id_modulo` int(10) unsigned default '0', `disabled` tinyint(1) unsigned NOT NULL default '0', `id_export` smallint(4) unsigned default '0', - `plugin_user` text default '', - `plugin_pass` text default '', + `plugin_user` text, + `plugin_pass` text, `plugin_parameter` text, `id_plugin` int(10) default '0', `post_process` double(18,5) default NULL, @@ -176,17 +176,17 @@ CREATE TABLE IF NOT EXISTS `tagente_modulo` ( `history_data` tinyint(1) unsigned default '1', `min_warning` double(18,2) default 0, `max_warning` double(18,2) default 0, - `str_warning` text default '', + `str_warning` text, `min_critical` double(18,2) default 0, `max_critical` double(18,2) default 0, - `str_critical` text default '', + `str_critical` text, `min_ff_event` int(4) unsigned default '0', `delete_pending` int(1) unsigned default 0, `policy_linked` tinyint(1) unsigned not null default 0, `policy_adopted` tinyint(1) unsigned not null default 0, - `custom_string_1` text default '', - `custom_string_2` text default '', - `custom_string_3` text default '', + `custom_string_1` text, + `custom_string_2` text, + `custom_string_3` text, `custom_integer_1` int(10) default 0, `custom_integer_2` int(10) default 0, PRIMARY KEY (`id_agente_modulo`), @@ -211,13 +211,13 @@ CREATE TABLE IF NOT EXISTS `tagent_access` ( CREATE TABLE IF NOT EXISTS `talert_snmp` ( `id_as` int(10) unsigned NOT NULL auto_increment, `id_alert` int(10) unsigned NOT NULL default '0', - `al_field1` text NOT NULL default '', - `al_field2` text NOT NULL default '', - `al_field3` text NOT NULL default '', + `al_field1` text NOT NULL, + `al_field2` text NOT NULL, + `al_field3` text NOT NULL, `description` varchar(255) default '', `alert_type` int(2) unsigned NOT NULL default '0', `agent` varchar(100) default '', - `custom_oid` text default '', + `custom_oid` text, `oid` varchar(255) NOT NULL default '', `time_threshold` int(11) NOT NULL default '0', `times_fired` int(2) unsigned NOT NULL default '0', @@ -226,12 +226,12 @@ CREATE TABLE IF NOT EXISTS `talert_snmp` ( `min_alerts` int(11) NOT NULL default '1', `internal_counter` int(2) unsigned NOT NULL default '0', `priority` tinyint(4) default '0', - `_snmp_f1_` text DEFAULT '', - `_snmp_f2_` text DEFAULT '', - `_snmp_f3_` text DEFAULT '', - `_snmp_f4_` text DEFAULT '', - `_snmp_f5_` text DEFAULT '', - `_snmp_f6_` text DEFAULT '', + `_snmp_f1_` text, + `_snmp_f2_` text, + `_snmp_f3_` text, + `_snmp_f4_` text, + `_snmp_f5_` text, + `_snmp_f6_` text, `trap_type` int(11) NOT NULL default '-1', `single_value` varchar(255) default '', PRIMARY KEY (`id_as`) @@ -240,19 +240,19 @@ CREATE TABLE IF NOT EXISTS `talert_snmp` ( CREATE TABLE IF NOT EXISTS `talert_commands` ( `id` int(10) unsigned NOT NULL auto_increment, `name` varchar(100) NOT NULL default '', - `command` text default '', - `description` text default '', + `command` text, + `description` text, `internal` tinyint(1) default 0, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `talert_actions` ( `id` int(10) unsigned NOT NULL auto_increment, - `name` text default '', + `name` text, `id_alert_command` int(10) unsigned NOT NULL, - `field1` text NOT NULL default '', - `field2` text default '', - `field3` text default '', + `field1` text NOT NULL, + `field2` text, + `field3` text, `id_group` mediumint(8) unsigned NULL default 0, `action_threshold` int(10) NOT NULL default '0', PRIMARY KEY (`id`), @@ -262,11 +262,11 @@ CREATE TABLE IF NOT EXISTS `talert_actions` ( CREATE TABLE IF NOT EXISTS `talert_templates` ( `id` int(10) unsigned NOT NULL auto_increment, - `name` text default '', + `name` text, `description` mediumtext, `id_alert_action` int(10) unsigned NULL, - `field1` text default '', - `field2` text default '', + `field1` text, + `field2` text, `field3` text NOT NULL, `type` ENUM ('regex', 'max_min', 'max', 'min', 'equal', 'not_equal', 'warning', 'critical', 'onchange', 'unknown', 'always'), `value` varchar(255) default '', @@ -286,7 +286,7 @@ CREATE TABLE IF NOT EXISTS `talert_templates` ( `saturday` tinyint(1) default 1, `sunday` tinyint(1) default 1, `recovery_notify` tinyint(1) default '0', - `field2_recovery` text NOT NULL default '', + `field2_recovery` text NOT NULL, `field3_recovery` text NOT NULL, `priority` tinyint(4) default '0', `id_group` mediumint(8) unsigned NULL default 0, @@ -440,7 +440,7 @@ CREATE TABLE IF NOT EXISTS `tevento` ( `id_grupo` mediumint(4) NOT NULL default '0', `estado` tinyint(3) unsigned NOT NULL default '0', `timestamp` datetime NOT NULL default '1970-01-01 00:00:00', - `evento` text NOT NULL default '', + `evento` text NOT NULL, `utimestamp` bigint(20) NOT NULL default '0', `event_type` enum('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') default 'unknown', `id_agentmodule` int(10) NOT NULL default '0', @@ -448,8 +448,8 @@ CREATE TABLE IF NOT EXISTS `tevento` ( `criticity` int(4) unsigned NOT NULL default '0', `user_comment` text NOT NULL, `tags` text NOT NULL, - `source` tinytext NOT NULL default '', - `id_extra` tinytext NOT NULL default '', + `source` tinytext NOT NULL, + `id_extra` tinytext NOT NULL, PRIMARY KEY (`id_evento`), KEY `indice_1` (`id_agente`,`id_evento`), KEY `indice_2` (`utimestamp`,`id_evento`), @@ -480,7 +480,7 @@ CREATE TABLE IF NOT EXISTS `tincidencia` ( `id_incidencia` bigint(6) unsigned zerofill NOT NULL auto_increment, `inicio` datetime NOT NULL default '1970-01-01 00:00:00', `cierre` datetime NOT NULL default '1970-01-01 00:00:00', - `titulo` text NOT NULL default '', + `titulo` text NOT NULL, `descripcion` text NOT NULL, `id_usuario` varchar(60) NOT NULL default '', `origen` varchar(100) NOT NULL default '', @@ -517,7 +517,7 @@ CREATE TABLE IF NOT EXISTS `tmensajes` ( `id_mensaje` int(10) unsigned NOT NULL auto_increment, `id_usuario_origen` varchar(60) NOT NULL default '', `id_usuario_destino` varchar(60) NOT NULL default '', - `mensaje` text NOT NULL DEFAULT '', + `mensaje` text NOT NULL, `timestamp` bigint (20) unsigned NOT NULL default '0', `subject` varchar(255) NOT NULL default '', `estado` int(4) unsigned NOT NULL default '0', @@ -549,21 +549,21 @@ CREATE TABLE IF NOT EXISTS `tnetwork_component` ( `id_module_group` tinyint(4) unsigned NOT NULL default '0', `id_modulo` int(10) unsigned default '0', `id_plugin` INTEGER unsigned default '0', - `plugin_user` text default '', - `plugin_pass` text default '', + `plugin_user` text, + `plugin_pass` text, `plugin_parameter` text, `max_timeout` tinyint(3) unsigned default '0', `history_data` tinyint(1) unsigned default '1', `min_warning` double(18,2) default 0, `max_warning` double(18,2) default 0, - `str_warning` text default '', + `str_warning` text, `min_critical` double(18,2) default 0, `max_critical` double(18,2) default 0, - `str_critical` text default '', + `str_critical` text, `min_ff_event` int(4) unsigned default '0', - `custom_string_1` text default '', - `custom_string_2` text default '', - `custom_string_3` text default '', + `custom_string_1` text, + `custom_string_2` text, + `custom_string_3` text, `custom_integer_1` int(10) default 0, `custom_integer_2` int(10) default 0, `post_process` double(18,5) default 0, @@ -610,7 +610,7 @@ CREATE TABLE IF NOT EXISTS `torigen` ( CREATE TABLE IF NOT EXISTS `tperfil` ( `id_perfil` int(10) unsigned NOT NULL auto_increment, - `name` TEXT NOT NULL default '', + `name` TEXT NOT NULL, `incident_edit` tinyint(3) NOT NULL default '0', `incident_view` tinyint(3) NOT NULL default '0', `incident_management` tinyint(3) NOT NULL default '0', @@ -627,7 +627,7 @@ CREATE TABLE IF NOT EXISTS `tperfil` ( CREATE TABLE IF NOT EXISTS `trecon_script` ( `id_recon_script` int(10) NOT NULL auto_increment, `name` varchar(100) default '', - `description` TEXT default NULL, + `description` TEXT, `script` varchar(250) default '', PRIMARY KEY (`id_recon_script`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -714,7 +714,7 @@ CREATE TABLE IF NOT EXISTS `tsesion` ( `id_usuario` varchar(60) NOT NULL default '0', `ip_origen` varchar(100) NOT NULL default '', `accion` varchar(100) NOT NULL default '', - `descripcion` text NOT NULL default '', + `descripcion` text NOT NULL, `fecha` datetime NOT NULL default '1970-01-01 00:00:00', `utimestamp` bigint(20) unsigned NOT NULL default '0', PRIMARY KEY (`id_sesion`), @@ -736,12 +736,12 @@ CREATE TABLE IF NOT EXISTS `ttipo_modulo` ( CREATE TABLE IF NOT EXISTS `ttrap` ( `id_trap` bigint(20) unsigned NOT NULL auto_increment, `source` varchar(50) NOT NULL default '', - `oid` text NOT NULL default '', - `oid_custom` text default '', + `oid` text NOT NULL, + `oid_custom` text, `type` int(11) NOT NULL default '0', `type_custom` varchar(100) default '', - `value` text default '', - `value_custom` text default '', + `value` text, + `value_custom` text, `alerted` smallint(6) NOT NULL default '0', `status` smallint(6) NOT NULL default '0', `id_usuario` varchar(150) default '', @@ -775,7 +775,7 @@ CREATE TABLE IF NOT EXISTS `tusuario` ( `id_skin` int(10) unsigned NOT NULL, `disabled` int(4) NOT NULL DEFAULT 0, `shortcut` tinyint(1) DEFAULT 0, - `shortcut_data` text default '', + `shortcut_data` text, `section` TEXT NOT NULL, `data_section` TEXT NOT NULL, UNIQUE KEY `id_user` (`id_user`) @@ -833,9 +833,9 @@ CREATE TABLE IF NOT EXISTS `treport` ( `private` tinyint(1) UNSIGNED NOT NULL default 0, `id_group` mediumint(8) unsigned NULL default NULL, `custom_logo` varchar(200) default NULL, - `header` MEDIUMTEXT default NULL, - `first_page` MEDIUMTEXT default NULL, - `footer` MEDIUMTEXT default NULL, + `header` MEDIUMTEXT, + `first_page` MEDIUMTEXT, + `footer` MEDIUMTEXT, `custom_font` varchar(200) default NULL, `id_template` INTEGER UNSIGNED DEFAULT 0, PRIMARY KEY(`id_report`) @@ -854,12 +854,12 @@ CREATE TABLE IF NOT EXISTS `treport_content` ( `order` int (11) NOT NULL default 0, `description` mediumtext, `id_agent` int(10) unsigned NOT NULL default 0, - `text` TEXT default NULL, - `external_source` Text default NULL, + `text` TEXT, + `external_source` Text, `treport_custom_sql_id` INTEGER UNSIGNED default 0, - `header_definition` TinyText default NULL, - `column_separator` TinyText default NULL, - `line_separator` TinyText default NULL, + `header_definition` TinyText, + `column_separator` TinyText, + `line_separator` TinyText, `time_from` time default '00:00:00', `time_to` time default '00:00:00', `monday` tinyint(1) default 1, @@ -878,10 +878,10 @@ CREATE TABLE IF NOT EXISTS `treport_content` ( `order_uptodown` INT NOT NULL default 0, `show_graph` INT NOT NULL default 0, `group_by_agent` INT NOT NULL default 0, - `style` TEXT NOT NULL DEFAULT '', + `style` TEXT NOT NULL, `id_group` INT (10) unsigned NOT NULL DEFAULT 0, `id_module_group` INT (10) unsigned NOT NULL DEFAULT 0, - `server_name` text default '', + `server_name` text, PRIMARY KEY(`id_rc`), FOREIGN KEY (`id_report`) REFERENCES treport(`id_report`) ON UPDATE CASCADE ON DELETE CASCADE @@ -894,7 +894,7 @@ CREATE TABLE IF NOT EXISTS `treport_content_sla_combined` ( `sla_max` double(18,2) NOT NULL default 0, `sla_min` double(18,2) NOT NULL default 0, `sla_limit` double(18,2) NOT NULL default 0, - `server_name` text default '', + `server_name` text, PRIMARY KEY(`id`), FOREIGN KEY (`id_report_content`) REFERENCES treport_content(`id_rc`) ON UPDATE CASCADE ON DELETE CASCADE @@ -904,8 +904,8 @@ CREATE TABLE IF NOT EXISTS `treport_content_item` ( `id` INTEGER UNSIGNED NOT NULL auto_increment, `id_report_content` INTEGER UNSIGNED NOT NULL, `id_agent_module` int(10) unsigned NOT NULL, - `server_name` text default '', - `operation` text default '', + `server_name` text, + `operation` text, PRIMARY KEY(`id`), FOREIGN KEY (`id_report_content`) REFERENCES treport_content(`id_rc`) ON UPDATE CASCADE ON DELETE CASCADE @@ -914,7 +914,7 @@ CREATE TABLE IF NOT EXISTS `treport_content_item` ( CREATE TABLE IF NOT EXISTS `treport_custom_sql` ( `id` INTEGER UNSIGNED NOT NULL auto_increment, `name` varchar(150) NOT NULL default '', - `sql` TEXT default NULL, + `sql` TEXT, PRIMARY KEY(`id`) ) ENGINE = InnoDB DEFAULT CHARSET = utf8; @@ -1260,7 +1260,7 @@ CREATE TABLE IF NOT EXISTS `tagent_custom_fields` ( CREATE TABLE IF NOT EXISTS `tagent_custom_data` ( `id_field` int(10) unsigned NOT NULL, `id_agent` int(10) unsigned NOT NULL, - `description` text default '', + `description` text, FOREIGN KEY (`id_field`) REFERENCES tagent_custom_fields(`id_field`) ON UPDATE CASCADE ON DELETE CASCADE, FOREIGN KEY (`id_agent`) REFERENCES tagente(`id_agente`) @@ -1275,8 +1275,8 @@ CREATE TABLE IF NOT EXISTS `tagent_custom_data` ( CREATE TABLE IF NOT EXISTS `ttag` ( `id_tag` integer(10) unsigned NOT NULL auto_increment, `name` varchar(100) NOT NULL default '', - `description` text NOT NULL default '', - `url` mediumtext NOT NULL default '', + `description` text NOT NULL, + `url` mediumtext NOT NULL, PRIMARY KEY (`id_tag`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -1373,11 +1373,11 @@ CREATE TABLE IF NOT EXISTS `tevent_filter` ( `id_group_filter` int(10) NOT NULL default 0, `id_name` varchar(600) NOT NULL, `id_group` int(10) NOT NULL default 0, - `event_type` text NOT NULL default '', + `event_type` text NOT NULL, `severity` int(10) NOT NULL default -1, `status` int(10) NOT NULL default -1, - `search` TEXT default '', - `text_agent` TEXT default '', + `search` TEXT, + `text_agent` TEXT, `pagination` int(10) NOT NULL default 25, `event_view_hr` int(10) NOT NULL default 8, `id_user_ack` TEXT,