tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2010-07-13 Miguel de Dios <miguel.dedios@artica.es> 

* pandoradb.sql: added in the table tgrupo the column 'propagrate' for to
	use in the subgroups trees (new feature in comming for 3.2).
	
	* extras/pandoradb_migrate_v3.1_to_v3.2.sql: added new migration SQL file to
	migrate from 3.1 to 3.2.
	
	* extras/pandoradb_migrate_v3.0_to_v3.1.sql: erase old file, only find into
	repository the branch 3.1.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3005 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2010-07-14 09:59:00 +00:00
parent c6946bd823
commit 8769553f3e
4 changed files with 43 additions and 323 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_console/ChangeLog
View File

@ -1,3 +1,14 @@
2010-07-13 Miguel de Dios <miguel.dedios@artica.es>
* pandoradb.sql: added in the table tgrupo the column 'propagrate' for to
use in the subgroups trees (new feature in comming for 3.2).
* extras/pandoradb_migrate_v3.1_to_v3.2.sql: added new migration SQL file to
migrate from 3.1 to 3.2.
* extras/pandoradb_migrate_v3.0_to_v3.1.sql: erase old file, only find into
repository the branch 3.1.
2010-07-13 Miguel de Dios <miguel.dedios@artica.es>
* godmode/modules/manage_network_templates_form.php: fixed the error

316
pandora_console/extras/pandoradb_migrate_v3.0_to_v3.1.sql
View File

@ -1,316 +0,0 @@
ALTER TABLE tagente ADD `timezone_offset` TINYINT(2) NULL DEFAULT '0';
ALTER TABLE tagente ADD `icon_path` VARCHAR(127) NULL DEFAULT NULL;
ALTER TABLE tagente ADD `update_gis_data` TINYINT(1) NOT NULL DEFAULT '1';
ALTER TABLE tagente_datos_string DROP id_tagente_datos_string;
CREATE INDEX idx_utimestamp USING BTREE ON tagente_datos_string(utimestamp);
ALTER TABLE tagente_datos DROP id_agente_datos;
CREATE INDEX idx_utimestamp USING BTREE ON tagente_datos(utimestamp);
-- -----------------------------------------------------
-- Table `tagente_datos_log4x`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `tagente_datos_log4x` (
`id_tagente_datos_log4x` bigint(20) unsigned NOT NULL auto_increment,
`id_agente_modulo` int(10) unsigned NOT NULL default '0',
`severity` text NOT NULL,
`message` text NOT NULL,
`stacktrace` text NOT NULL,
`utimestamp` int(20) unsigned NOT NULL default 0,
PRIMARY KEY (`id_tagente_datos_log4x`),
KEY `data_log4x_index_1` (`id_agente_modulo`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE INDEX idx_agente USING BTREE ON tagente_estado(id_agente);
DROP INDEX `status_index_2` on tagente_estado;
CREATE INDEX idx_status USING BTREE ON tagente_estado (estado);
ALTER TABLE `tagente_modulo` ADD `custom_string_1` text default '';
ALTER TABLE `tagente_modulo` ADD `custom_string_2` text default '';
ALTER TABLE `tagente_modulo` ADD `custom_string_3` text default '';
ALTER TABLE `tagente_modulo` ADD `custom_integer_1` int(10) default 0;
ALTER TABLE `tagente_modulo` ADD `custom_integer_2` int(10) default 0;
ALTER TABLE tagent_access DROP id_ac;
CREATE INDEX idx_utimestamp USING BTREE ON tagent_access(utimestamp);
CREATE INDEX idx_template_action USING BTREE ON talert_templates(id_alert_action);
CREATE INDEX idx_template_module USING BTREE ON talert_template_modules(id_agent_module);
ALTER TABLE talert_templates MODIFY `type` ENUM ('regex', 'max_min', 'max', 'min', 'equal', 'not_equal', 'warning', 'critical', 'onchange');
CREATE INDEX idx_agentmodule USING BTREE ON tevento(id_agentmodule);
ALTER TABLE `tnetwork_component` ADD `custom_string_1` text default '';
ALTER TABLE `tnetwork_component` ADD `custom_string_2` text default '';
ALTER TABLE `tnetwork_component` ADD `custom_string_3` text default '';
ALTER TABLE `tnetwork_component` ADD `custom_integer_1` int(10) default 0;
ALTER TABLE `tnetwork_component` ADD `custom_integer_2` int(10) default 0;
ALTER TABLE `tserver` ADD `lag_time` int(11) NOT NULL default 0;
ALTER TABLE `tserver` ADD `lag_modules` int(11) NOT NULL default 0;
ALTER TABLE `tserver` ADD `total_modules_running` int(11) NOT NULL default 0;
ALTER TABLE `tserver` ADD `my_modules` int(11) NOT NULL default 0;
ALTER TABLE `tserver` ADD `stat_utimestamp` bigint(20) NOT NULL default '0';
ALTER TABLE `tserver` engine=InnoDB;
CREATE INDEX idx_user USING BTREE ON tsesion (`ID_usuario`);
CREATE INDEX idx_utimestamp USING BTREE ON tsesion (`utimestamp`);
ALTER TABLE tusuario ADD `timezone` varchar(50) default '';
ALTER TABLE `tgraph_source` CHANGE `weight` `weight` float(5,3) UNSIGNED NOT NULL DEFAULT 0;
ALTER TABLE treport DROP FOREIGN KEY `treport_ibfk_1`;
-- New report data
ALTER TABLE `treport` ADD `custom_logo` varchar(200) default NULL;
ALTER TABLE `treport` ADD `header` MEDIUMTEXT default NULL;
ALTER TABLE `treport` ADD `first_page` MEDIUMTEXT default NULL;
ALTER TABLE `treport` ADD `footer` MEDIUMTEXT default NULL;
ALTER TABLE `treport` ADD `custom_font` varchar(200) default NULL;
-- New report content data
ALTER TABLE `treport_content` ADD `text` TEXT default NULL;
ALTER TABLE `treport_content` ADD `external_source` TinyText default NULL;
ALTER TABLE `treport_content` ADD `treport_custom_sql_id` INTEGER UNSIGNED default 0;
ALTER TABLE `treport_content` ADD `header_definition` TinyText default NULL;
ALTER TABLE `treport_content` ADD `column_separator` TinyText default NULL;
ALTER TABLE `treport_content` ADD `line_separator` TinyText default NULL;
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,
PRIMARY KEY(`id`)
) ENGINE = InnoDB DEFAULT CHARSET = utf8;
ALTER TABLE `tserver_export` ADD `timezone_offset` TINYINT(2) NULL DEFAULT '0';
-- GIS extension Tables
-- -----------------------------------------------------
-- Table `tgis_data_history`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `tgis_data_history` (
`id_tgis_data` INT NOT NULL AUTO_INCREMENT COMMENT 'key of the table' ,
`longitude` DOUBLE NOT NULL ,
`latitude` DOUBLE NOT NULL ,
`altitude` DOUBLE NULL ,
`start_timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'timestamp on wich the agente started to be in this position' ,
`end_timestamp` TIMESTAMP NULL COMMENT 'timestamp on wich the agent was placed for last time on this position' ,
`description` TEXT NULL COMMENT 'description of the region correoponding to this placemnt' ,
`manual_placement` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '0 to show that the position cames from the agent, 1 to show that the position was established manualy' ,
`number_of_packages` INT NOT NULL DEFAULT 1 COMMENT 'Number of data packages received with this position from the start_timestampa to the_end_timestamp' ,
`tagente_id_agente` INT(10) UNSIGNED NOT NULL COMMENT 'reference to the agent' ,
PRIMARY KEY (`id_tgis_data`) ,
INDEX `start_timestamp_index` USING BTREE (`start_timestamp` ASC),
INDEX `end_timestamp_index` USING BTREE (`end_timestamp` ASC) )
ENGINE = InnoDB
COMMENT = 'Table to store historical GIS information of the agents';
-- -----------------------------------------------------
-- Table `tgis_data_status`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `tgis_data_status` (
`tagente_id_agente` INT(10) UNSIGNED NOT NULL COMMENT 'Reference to the agent' ,
`current_longitude` DOUBLE NOT NULL COMMENT 'Last received longitude',
`current_latitude` DOUBLE NOT NULL COMMENT 'Last received latitude',
`current_altitude` DOUBLE NULL COMMENT 'Last received altitude',
`stored_longitude` DOUBLE NOT NULL COMMENT 'Reference longitude to see if the agent has moved',
`stored_latitude` DOUBLE NOT NULL COMMENT 'Reference latitude to see if the agent has moved',
`stored_altitude` DOUBLE NULL COMMENT 'Reference altitude to see if the agent has moved',
`number_of_packages` INT NOT NULL DEFAULT 1 COMMENT 'Number of data packages received with this position since start_timestampa' ,
`start_timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Timestamp on wich the agente started to be in this position' ,
`manual_placement` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '0 to show that the position cames from the agent, 1 to show that the position was established manualy' ,
`description` TEXT NULL COMMENT 'description of the region correoponding to this placemnt' ,
PRIMARY KEY (`tagente_id_agente`) ,
INDEX `start_timestamp_index` USING BTREE (`start_timestamp` ASC),
INDEX `fk_tgisdata_tagente1` (`tagente_id_agente` ASC) ,
CONSTRAINT `fk_tgisdata_tagente1`
FOREIGN KEY (`tagente_id_agente` )
REFERENCES `tagente` (`id_agente` )
ON DELETE CASCADE
ON UPDATE NO ACTION)
ENGINE = InnoDB
COMMENT = 'Table to store last GIS information of the agents';
-- -----------------------------------------------------
-- Table `tgis_map`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `tgis_map` (
`id_tgis_map` INT NOT NULL AUTO_INCREMENT COMMENT 'table identifier' ,
`map_name` VARCHAR(63) NOT NULL COMMENT 'Name of the map' ,
`initial_longitude` DOUBLE NULL COMMENT 'longitude of the center of the map when it\'s loaded' ,
`initial_latitude` DOUBLE NULL COMMENT 'latitude of the center of the map when it\'s loaded' ,
`initial_altitude` DOUBLE NULL COMMENT 'altitude of the center of the map when it\'s loaded' ,
`zoom_level` TINYINT(2) NULL DEFAULT '1' COMMENT 'Zoom level to show when the map is loaded.' ,
`map_background` VARCHAR(127) NULL COMMENT 'path on the server to the background image of the map' ,
`default_longitude` DOUBLE NULL COMMENT 'default longitude for the agents placed on the map' ,
`default_latitude` DOUBLE NULL COMMENT 'default latitude for the agents placed on the map' ,
`default_altitude` DOUBLE NULL COMMENT 'default altitude for the agents placed on the map' ,
`group_id` INT(10) NOT NULL DEFAULT 0 COMMENT 'Group that owns the map' ,
`default_map` TINYINT(1) NULL DEFAULT 0 COMMENT '1 if this is the default map, 0 in other case',
PRIMARY KEY (`id_tgis_map`),
INDEX `map_name_index` (`map_name` ASC)
)
ENGINE = InnoDB
COMMENT = 'Table containing information about a gis map';
-- -----------------------------------------------------
-- Table `tgis_map_connection`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `tgis_map_connection` (
`id_tmap_connection` INT NOT NULL AUTO_INCREMENT COMMENT 'table id' ,
`conection_name` VARCHAR(45) NULL COMMENT 'Name of the connection (name of the base layer)' ,
`connection_type` VARCHAR(45) NULL COMMENT 'Type of map server to connect' ,
`conection_data` TEXT NULL COMMENT 'connection information (this can probably change to fit better the possible connection parameters)' ,
`num_zoom_levels` TINYINT(2) NULL COMMENT 'Number of zoom levels available' ,
`default_zoom_level` TINYINT(2) NOT NULL DEFAULT 16 COMMENT 'Default Zoom Level for the connection' ,
`default_longitude` DOUBLE NULL COMMENT 'default longitude for the agents placed on the map' ,
`default_latitude` DOUBLE NULL COMMENT 'default latitude for the agents placed on the map' ,
`default_altitude` DOUBLE NULL COMMENT 'default altitude for the agents placed on the map' ,
`initial_longitude` DOUBLE NULL COMMENT 'longitude of the center of the map when it\'s loaded' ,
`initial_latitude` DOUBLE NULL COMMENT 'latitude of the center of the map when it\'s loaded' ,
`initial_altitude` DOUBLE NULL COMMENT 'altitude of the center of the map when it\'s loaded' ,
`group_id` INT(10) NOT NULL DEFAULT 0 COMMENT 'Group that owns the map',
PRIMARY KEY (`id_tmap_connection`) )
ENGINE = InnoDB
COMMENT = 'Table to store the map connection information';
-- -----------------------------------------------------
-- Table `tgis_map_has_tgis_map_connection`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `tgis_map_has_tgis_map_connection` (
`tgis_map_id_tgis_map` INT NOT NULL COMMENT 'reference to tgis_map' ,
`tgis_map_connection_id_tmap_connection` INT NOT NULL COMMENT 'reference to tgis_map_connection' ,
`modification_time` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Last Modification Time of the Connection' ,
`default_map_connection` TINYINT(1) NULL DEFAULT FALSE COMMENT 'Flag to mark the default map connection of a map' ,
PRIMARY KEY (`tgis_map_id_tgis_map`, `tgis_map_connection_id_tmap_connection`) ,
INDEX `fk_tgis_map_has_tgis_map_connection_tgis_map1` (`tgis_map_id_tgis_map` ASC) ,
INDEX `fk_tgis_map_has_tgis_map_connection_tgis_map_connection1` (`tgis_map_connection_id_tmap_connection` ASC) ,
CONSTRAINT `fk_tgis_map_has_tgis_map_connection_tgis_map1`
FOREIGN KEY (`tgis_map_id_tgis_map` )
REFERENCES `tgis_map` (`id_tgis_map` )
ON DELETE CASCADE
ON UPDATE NO ACTION,
CONSTRAINT `fk_tgis_map_has_tgis_map_connection_tgis_map_connection1`
FOREIGN KEY (`tgis_map_connection_id_tmap_connection` )
REFERENCES `tgis_map_connection` (`id_tmap_connection` )
ON DELETE CASCADE
ON UPDATE NO ACTION)
ENGINE = InnoDB
COMMENT = 'Table to asociate a connection to a gis map';
-- -----------------------------------------------------
-- Table `tgis_map_layer`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `tgis_map_layer` (
`id_tmap_layer` INT NOT NULL AUTO_INCREMENT COMMENT 'table id' ,
`layer_name` VARCHAR(45) NOT NULL COMMENT 'Name of the layer ' ,
`view_layer` TINYINT(1) NOT NULL DEFAULT TRUE COMMENT 'True if the layer must be shown' ,
`layer_stack_order` TINYINT(3) NULL DEFAULT 0 COMMENT 'Number of order of the layer in the layer stack, bigger means upper on the stack.\n' ,
`tgis_map_id_tgis_map` INT NOT NULL COMMENT 'reference to the map containing the layer' ,
`tgrupo_id_grupo` MEDIUMINT(4) NOT NULL COMMENT 'reference to the group shown in the layer' ,
PRIMARY KEY (`id_tmap_layer`) ,
INDEX `fk_tmap_layer_tgis_map1` (`tgis_map_id_tgis_map` ASC) ,
CONSTRAINT `fk_tmap_layer_tgis_map1`
FOREIGN KEY (`tgis_map_id_tgis_map` )
REFERENCES `tgis_map` (`id_tgis_map` )
ON DELETE CASCADE
ON UPDATE NO ACTION)
ENGINE = InnoDB
COMMENT = 'Table containing information about the map layers';
-- -----------------------------------------------------
-- Table `tgis_map_layer_has_tagente`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `tgis_map_layer_has_tagente` (
`tgis_map_layer_id_tmap_layer` INT NOT NULL ,
`tagente_id_agente` INT(10) UNSIGNED NOT NULL ,
PRIMARY KEY (`tgis_map_layer_id_tmap_layer`, `tagente_id_agente`) ,
INDEX `fk_tgis_map_layer_has_tagente_tgis_map_layer1` (`tgis_map_layer_id_tmap_layer` ASC) ,
INDEX `fk_tgis_map_layer_has_tagente_tagente1` (`tagente_id_agente` ASC) ,
CONSTRAINT `fk_tgis_map_layer_has_tagente_tgis_map_layer1`
FOREIGN KEY (`tgis_map_layer_id_tmap_layer` )
REFERENCES `tgis_map_layer` (`id_tmap_layer` )
ON DELETE CASCADE
ON UPDATE NO ACTION,
CONSTRAINT `fk_tgis_map_layer_has_tagente_tagente1`
FOREIGN KEY (`tagente_id_agente` )
REFERENCES `tagente` (`id_agente` )
ON DELETE CASCADE
ON UPDATE NO ACTION)
ENGINE = InnoDB
COMMENT = 'Table to define wich agents are shown in a layer';
-- -----------------------------------------------------
-- Table `tgroup_stat`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `tgroup_stat` (
`id_group` int(10) unsigned NOT NULL default '0',
`modules` int(10) unsigned NOT NULL default '0',
`normal` int(10) unsigned NOT NULL default '0',
`critical` int(10) unsigned NOT NULL default '0',
`warning` int(10) unsigned NOT NULL default '0',
`unknown` int(10) unsigned NOT NULL default '0',
`non-init` int(10) unsigned NOT NULL default '0',
`alerts` int(10) unsigned NOT NULL default '0',
`alerts_fired` int(10) unsigned NOT NULL default '0',
`agents` int(10) unsigned NOT NULL default '0',
`agents_unknown` int(10) unsigned NOT NULL default '0',
`utimestamp` int(20) unsigned NOT NULL default 0,
PRIMARY KEY (`id_group`)
) ENGINE=InnoDB
COMMENT = 'Table to store global system stats per group'
DEFAULT CHARSET=utf8;
-- -----------------------------------------------------------------------
-- Data insertion --
-- -----------------------------------------------------------------------
-- Realtime statistics on/off and interval
INSERT INTO tconfig (`token`, `value`) VALUES ('realtimestats', '1');
INSERT INTO tconfig (`token`, `value`) VALUES ('stats_interval', '300');
-- Log4x Module
INSERT INTO ttipo_modulo (`id_tipo`, `nombre`, `categoria`, `descripcion`, `icon`) VALUES (24, 'log4x', 0, 'Log4x', 'mod_log4x.png');
-- GIS is disabled by default
INSERT INTO tconfig (`token`, `value`) VALUES ('activate_gis', '1');
INSERT INTO `tgis_map` VALUES (1,'Sample',-3.708187,40.42056,0,16,'',-3.708187,40.42056,0,1,1);
INSERT INTO `tgis_map_connection` VALUES (1,'OpenStreetMap','OSM','{\"type\":\"OSM\",\"url\":\"http://tile.openstreetmap.org/${z}/${x}/${y}.png\"}',19,16,-3.708187,40.42056,0,-3.708187,40.42056,0,1);
INSERT INTO `tgis_map_has_tgis_map_connection` VALUES (1,1,'2010-03-01 09:46:48',1);
INSERT INTO `tgis_map_layer` VALUES (1,'Group All',1,0,1,1);
-- -----------------------------------------------------
-- Modifications of data in order to group All issue fix
-- -----------------------------------------------------
DELETE FROM tgrupo WHERE id_grupo = 1;
UPDATE tusuario_perfil SET id_grupo = 0 WHERE id_grupo = 1;
UPDATE tgis_map SET group_id = 0 WHERE group_id = 1;
UPDATE tgis_map_connection SET group_id = 0 WHERE group_id = 1;
UPDATE tgis_map_layer SET tgrupo_id_grupo = 0 WHERE tgrupo_id_grupo = 1;
UPDATE talert_actions SET id_group = 0 WHERE id_group = 1;
UPDATE talert_templates SET id_group = 0 WHERE id_group = 1;
UPDATE tevento SET id_grupo = 0 WHERE id_grupo = 1;
UPDATE tgraph SET id_group = 0 WHERE id_group = 1;
UPDATE tincidencia SET id_grupo = 0 WHERE id_grupo = 1;
UPDATE tlayout SET id_group = 0 WHERE id_group = 1;
UPDATE tplanned_downtime SET id_group = 0 WHERE id_group = 1;
UPDATE tconfig SET `value` = '3.1rc1' WHERE `token` = 'db_scheme_version';
UPDATE tconfig SET `value` = 'PD100515' WHERE `token` = 'db_scheme_build';

24
pandora_console/extras/pandoradb_migrate_v3.1_to_v3.2.sql Normal file
View File

@ -0,0 +1,24 @@
-- Pandora FMS - the Flexible Monitoring System
-- ============================================
-- Copyright (c) 2005-2009 Artica Soluciones Tecnológicas, http://www.artica.es
-- Please see http://pandora.sourceforge.net for full contribution list
-- This program is free software; you can redistribute it and/or
-- modify it under the terms of the GNU General Public License
-- as published by the Free Software Foundation for version 2.
-- This program is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- GNU General Public License for more details.
-- You should have received a copy of the GNU General Public License
-- along with this program; if not, write to the Free Software
-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-- PLEASE NO NOT USE MULTILINE COMMENTS
-- Because Pandora Installer don't understand them
-- and fails creating database !!!
-- -----------------------------------------------------
-- Table `tgrupo`
-- -----------------------------------------------------
ALTER TABLE `tgrupo` ADD COLUMN `propagate` tinyint(1) unsigned NOT NULL default '0';

1
pandora_console/pandoradb.sql
View File

@ -428,6 +428,7 @@ CREATE TABLE IF NOT EXISTS `tgrupo` (
`nombre` varchar(100) NOT NULL default '',
`icon` varchar(50) default NULL default 'world',
`parent` mediumint(4) unsigned NOT NULL default '0',
`propagate` tinyint(1) unsigned NOT NULL default '0',
`disabled` tinyint(3) unsigned NOT NULL default '0',
`custom_id` varchar(255) default '',
PRIMARY KEY (`id_grupo`)