From 5caec20153ecd19d1b636e5920f6ac57a432b4cc Mon Sep 17 00:00:00 2001
From: Sylvestre Ho <shotamchay@merethis.com>
Date: Thu, 5 May 2011 14:30:48 +0000
Subject: [PATCH] prepare sql upgrade
git-svn-id: http://svn.centreon.com/trunk/centreon@12198 6bcd3966-0018-0410-8128-fd23d134de7e
---
CHANGELOG | 21 +
www/install/insertBaseConf.sql | 2 +-
.../centreon/Update-DB-2.2.0-RC2_to_2.2.0.sql | 2 +
.../centreon/Update-DB-2.2.0_to_2.3.0-RC1.sql | 338 ++++++++
.../Update-DB-2.3.0-b4_to_2.3.0-RC1.sql | 1 +
.../Update-CSTG-2.2.0_to_2.3.0-RC1.sql | 741 ++++++++++++++++++
.../Update-CSTG-2.3.0-b1_to_2.3.0-b2.sql | 4 +-
.../Update-CSTG-2.3.0-b2_to_2.3.0-b3.sql | 4 +-
8 files changed, 1108 insertions(+), 5 deletions(-)
create mode 100644 www/install/sql/centreon/Update-DB-2.2.0-RC2_to_2.2.0.sql
create mode 100644 www/install/sql/centreon/Update-DB-2.2.0_to_2.3.0-RC1.sql
create mode 100644 www/install/sql/centreon/Update-DB-2.3.0-b4_to_2.3.0-RC1.sql
create mode 100644 www/install/sql/centstorage/Update-CSTG-2.2.0_to_2.3.0-RC1.sql
diff --git a/CHANGELOG b/CHANGELOG
index b92c458093..f8a782bce2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -93,6 +93,27 @@
=> enhancement: Add more options in search engine in monitoring
=> enhancement: Add overlay in montoring on host link in all gird and summary pages
+## Centreon 2.1.13
+
+=> fix: problem with update of LDAP cache
+=> fix: module cannot generate configuration for pollers.
+
+## Centreon 2.1.12
+
+=> fix: problem with traps and services link configuration
+=> fix: problem with ACL menu configuration -> some menu were not displayed
+
+## Centreon 2.1.11
+
+=> fix: Remove problem with regexp in Centcore when matching command name
+=> fix: Improve reactivity of pollers TopCounter status
+=> fix: fix typo error in about
+=> fix: Problem with cache refresh for LDAP auth
+=> fix: During service duplication, contact wasn't duplicated
+=> fix: problem with config files generation for escalades
+=> enhancement: Improve rebuild engine for logs
+=> fix: remove infinite loop in service configuration page
+=> fix: improve loading hostgroups and hosts cfg files
## Centreon 2.1.10
diff --git a/www/install/insertBaseConf.sql b/www/install/insertBaseConf.sql
index 0c852e8a16..d390aab032 100644
--- a/www/install/insertBaseConf.sql
+++ b/www/install/insertBaseConf.sql
@@ -3,7 +3,7 @@
-- Insert version
--
-INSERT INTO `informations` (`key` ,`value`) VALUES ('version', '2.3.0-b4');
+INSERT INTO `informations` (`key` ,`value`) VALUES ('version', '2.3.0-RC1');
--
-- Contenu de la table `nagios_server`
diff --git a/www/install/sql/centreon/Update-DB-2.2.0-RC2_to_2.2.0.sql b/www/install/sql/centreon/Update-DB-2.2.0-RC2_to_2.2.0.sql
new file mode 100644
index 0000000000..231c0b5ff3
--- /dev/null
+++ b/www/install/sql/centreon/Update-DB-2.2.0-RC2_to_2.2.0.sql
@@ -0,0 +1,2 @@
+
+UPDATE `informations` SET `value` = '2.2.0' WHERE CONVERT( `informations`.`key` USING utf8 ) = 'version' AND CONVERT ( `informations`.`value` USING utf8 ) = '2.2.0-RC2' LIMIT 1;
\ No newline at end of file
diff --git a/www/install/sql/centreon/Update-DB-2.2.0_to_2.3.0-RC1.sql b/www/install/sql/centreon/Update-DB-2.2.0_to_2.3.0-RC1.sql
new file mode 100644
index 0000000000..faaf0872d3
--- /dev/null
+++ b/www/install/sql/centreon/Update-DB-2.2.0_to_2.3.0-RC1.sql
@@ -0,0 +1,338 @@
+alter table contact add contact_enable_notifications enum('0','1') default '0' after contact_oreon;
+alter table contact add contact_template_id int(11) default null after contact_enable_notifications;
+
+ALTER TABLE `contact` ADD INDEX ( `contact_template_id` );
+
+ALTER TABLE `contact`
+ ADD CONSTRAINT `contact_ibfk_3` FOREIGN KEY (`contact_template_id`) REFERENCES `contact` (`contact_id`) ON DELETE SET NULL;
+
+--
+-- Structure de la table `auth_ressource`
+--
+
+CREATE TABLE IF NOT EXISTS `auth_ressource` (
+ `ar_id` INT(11) NOT NULL AUTO_INCREMENT,
+ `ar_type` VARCHAR(50) NOT NULL,
+ `ar_enable` ENUM('0', '1') DEFAULT 0,
+ `ar_order` INT(3) DEFAULT 0,
+ PRIMARY KEY (`ar_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;
+
+-- --------------------------------------------------------
+
+--
+-- Structure de la table `auth_ressource_info`
+--
+
+CREATE TABLE IF NOT EXISTS `auth_ressource_info` (
+ `ar_id` INT(11) NOT NULL,
+ `ari_name` VARCHAR(100) NOT NULL,
+ `ari_value` VARCHAR(255) NOT NULL,
+ PRIMARY KEY (`ar_id`, `ari_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;
+
+-- --------------------------------------------------------
+
+--
+-- Contraintes pour la table `auth_ressource_info`
+--
+ALTER TABLE `auth_ressource_info`
+ ADD CONSTRAINT `auth_ressource_info_ibfk_1` FOREIGN KEY (`ar_id`) REFERENCES `auth_ressource` (`ar_id`) ON DELETE CASCADE;
+
+-- New ldap options
+INSERT INTO `options` (`key`,`value`) values ('ldap_dns_use_ssl', '0');
+INSERT INTO `options` (`key`,`value`) values ('ldap_dns_use_tls', '0');
+INSERT INTO `options` (`key`,`value`) values ('ldap_srv_dns', '0');
+INSERT INTO `options` (`key`,`value`) values ('ldap_dns_use_domain', '0');
+INSERT INTO `options` (`key`,`value`) values ('broker', 'Ndo');
+
+--
+-- Structure de la table `downtime`
+--
+CREATE TABLE IF NOT EXISTS `downtime` (
+ `dt_id` INT(11) NOT NULL AUTO_INCREMENT,
+ `dt_name` VARCHAR(100) NOT NULL,
+ `dt_description` VARCHAR(255) DEFAULT NULL,
+ `dt_activate` ENUM('0', '1') DEFAULT '1',
+ PRIMARY KEY (`dt_id`),
+ KEY `downtime_idx01` (`dt_id`, `dt_activate`),
+ UNIQUE KEY `downtime_idx02` (`dt_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+-- --------------------------------------------------------
+
+--
+-- Structure de la table `downtime_period`
+--
+CREATE TABLE IF NOT EXISTS `downtime_period` (
+ `dt_id` INT(11) NOT NULL,
+ `dtp_start_time` TIME NOT NULL,
+ `dtp_end_time` TIME NOT NULL,
+ `dtp_day_of_week` VARCHAR(15) DEFAULT NULL,
+ `dtp_month_cycle` ENUM('first', 'last', 'all', 'none') DEFAULT 'all',
+ `dtp_day_of_month` VARCHAR(100) DEFAULT NULL,
+ `dtp_fixed` ENUM('0', '1') DEFAULT '1',
+ `dtp_duration` INT DEFAULT NULL,
+ `dtp_next_date` DATE DEFAULT NULL,
+ `dtp_activate` ENUM('0', '1') DEFAULT '1',
+ KEY `downtime_period_idx01` (`dt_id`, `dtp_activate`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+-- --------------------------------------------------------
+
+--
+-- Structure de la table `downtime_host_relation`
+--
+CREATE TABLE IF NOT EXISTS `downtime_host_relation` (
+ `dt_id` INT(11) NOT NULL,
+ `host_host_id` INT(11) NOT NULL,
+ PRIMARY KEY (`dt_id`, `host_host_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+-- --------------------------------------------------------
+
+--
+-- Structure de la table `downtime_hostgroup_relation`
+--
+CREATE TABLE IF NOT EXISTS `downtime_hostgroup_relation` (
+ `dt_id` INT(11) NOT NULL,
+ `hg_hg_id` INT(11) NOT NULL,
+ PRIMARY KEY (`dt_id`, `hg_hg_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+-- --------------------------------------------------------
+
+--
+-- Structure de la table `downtime_service_relation`
+--
+CREATE TABLE IF NOT EXISTS `downtime_service_relation` (
+ `dt_id` INT(11) NOT NULL,
+ `host_host_id` INT(11) NOT NULL,
+ `service_service_id` INT(11) NOT NULL,
+ PRIMARY KEY (`dt_id`, `host_host_id`, `service_service_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+-- --------------------------------------------------------
+
+--
+-- Structure de la table `downtime_servicegroup_relation`
+--
+CREATE TABLE IF NOT EXISTS `downtime_servicegroup_relation` (
+ `dt_id` INT(11) NOT NULL,
+ `sg_sg_id` INT(11) NOT NULL,
+ PRIMARY KEY (`dt_id`, `sg_sg_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+-- --------------------------------------------------------
+
+--
+-- Contraintes pour la table `downtime_period`
+--
+ALTER TABLE `downtime_period`
+ ADD CONSTRAINT `downtime_period_ibfk_1` FOREIGN KEY (`dt_id`) REFERENCES `downtime` (`dt_id`) ON DELETE CASCADE;
+
+--
+-- Contraintes pour la table `downtime_host_relation`
+--
+ALTER TABLE `downtime_host_relation`
+ ADD CONSTRAINT `downtime_host_relation_ibfk_1` FOREIGN KEY (`host_host_id`) REFERENCES `host` (`host_id`) ON DELETE CASCADE,
+ ADD CONSTRAINT `downtime_host_relation_ibfk_2` FOREIGN KEY (`dt_id`) REFERENCES `downtime` (`dt_id`) ON DELETE CASCADE;
+
+--
+-- Contraintes pour la table `downtime_hostgroup_relation`
+--
+ALTER TABLE `downtime_hostgroup_relation`
+ ADD CONSTRAINT `downtime_hostgroup_relation_ibfk_1` FOREIGN KEY (`hg_hg_id`) REFERENCES `hostgroup` (`hg_id`) ON DELETE CASCADE,
+ ADD CONSTRAINT `downtime_hostgroup_relation_ibfk_2` FOREIGN KEY (`dt_id`) REFERENCES `downtime` (`dt_id`) ON DELETE CASCADE;
+
+--
+-- Contraintes pour la table `downtime_service_relation`
+--
+ALTER TABLE `downtime_service_relation`
+ ADD CONSTRAINT `downtime_service_relation_ibfk_1` FOREIGN KEY (`service_service_id`) REFERENCES `service` (`service_id`) ON DELETE CASCADE,
+ ADD CONSTRAINT `downtime_service_relation_ibfk_2` FOREIGN KEY (`dt_id`) REFERENCES `downtime` (`dt_id`) ON DELETE CASCADE;
+
+--
+-- Contraintes pour la table `downtime_service_relation`
+--
+ALTER TABLE `downtime_servicegroup_relation`
+ ADD CONSTRAINT `downtime_servicegroup_relation_ibfk_1` FOREIGN KEY (`sg_sg_id`) REFERENCES `servicegroup` (`sg_id`) ON DELETE CASCADE,
+ ADD CONSTRAINT `downtime_servicegroup_relation_ibfk_2` FOREIGN KEY (`dt_id`) REFERENCES `downtime` (`dt_id`) ON DELETE CASCADE;
+
+--
+-- Alter contactgroup for ldap group
+--
+ ALTER TABLE `contactgroup` ADD `cg_type` varchar(10) default 'local';
+ ALTER TABLE `contactgroup` ADD `cg_ldap_dn` varchar(255) default NULL;
+
+
+ ALTER TABLE `contact` ADD `contact_register` TINYINT( 6 ) NOT NULL DEFAULT '0';
+
+INSERT INTO `topology` (`topology_id`, `topology_name`, `topology_icone`, `topology_parent`, `topology_page`, `topology_order`, `topology_group`, `topology_url`, `topology_url_opt`, `topology_popup`, `topology_modules`, `topology_show`, `topology_style_class`, `topology_style_id`, `topology_OnClick`) VALUES(NULL, 'Downtimes', NULL, 6, 606, 25, 1, NULL, NULL, '0', '0', '1', NULL, NULL, NULL);
+INSERT INTO `topology` (`topology_id`, `topology_name`, `topology_icone`, `topology_parent`, `topology_page`, `topology_order`, `topology_group`, `topology_url`, `topology_url_opt`, `topology_popup`, `topology_modules`, `topology_show`, `topology_style_class`, `topology_style_id`, `topology_OnClick`) VALUES(NULL, 'Downtime Scheduler', './img/icones/16x16/warning.gif', 606, 60600, 40, 1, './include/configuration/configDowntime/downtime.php', NULL, '0', '0', '1', NULL, NULL, NULL);
+INSERT INTO `topology` (`topology_id`, `topology_name`, `topology_icone`, `topology_parent`, `topology_page`, `topology_order`, `topology_group`, `topology_url`, `topology_url_opt`, `topology_popup`, `topology_modules`, `topology_show`, `topology_style_class`, `topology_style_id`, `topology_OnClick`) VALUES(NULL, 'Ajax forms', NULL, 606, 60601, 40, 1, './include/configuration/configDowntime/ajaxForms.php', NULL, '0', '0', '0', NULL, NULL, NULL);
+
+INSERT INTO `topology_JS` (`id_t_js`, `id_page`, `o`, `PathName_js`, `Init`) VALUES(NULL, 60600, 'a', './include/common/javascript/changetab.js', 'initChangeTab');
+INSERT INTO `topology_JS` (`id_t_js`, `id_page`, `o`, `PathName_js`, `Init`) VALUES(NULL, 60600, 'c', './include/common/javascript/changetab.js', 'initChangeTab');
+INSERT INTO `topology_JS` (`id_t_js`, `id_page`, `o`, `PathName_js`, `Init`) VALUES(NULL, 60600, 'w', './include/common/javascript/changetab.js', 'initChangeTab');
+
+ALTER TABLE nagios_server ADD is_default INT DEFAULT '0' AFTER localhost;
+
+UPDATE topology SET topology_name = 'Monitoring' WHERE topology_page = '5010102' AND topology_name = 'Nagios';
+
+INSERT INTO `topology` (`topology_id`, `topology_name`, `topology_icone`, `topology_parent`, `topology_page`, `topology_order`, `topology_group`, `topology_url`, `topology_url_opt`, `topology_popup`, `topology_modules`, `topology_show`, `topology_style_class`, `topology_style_id`, `topology_OnClick`) VALUES(NULL, 'NDOutils', NULL, 609, NULL, NULL, 10, NULL, NULL, '0', '0', '1', NULL, NULL, NULL);
+UPDATE `topology` SET `topology_group` = '10' WHERE `topology_parent` = 609 AND topology_name = 'ndo2db.cfg' LIMIT 1 ;
+UPDATE `topology` SET `topology_group` = '10' WHERE `topology_parent` = 609 AND topology_name = 'ndomod.cfg' LIMIT 1 ;
+
+INSERT INTO `options` (`key`, `value`) VALUES ('ldap_contact_tmpl', '0');
+INSERT INTO `options` (`key`, `value`) VALUES ('ldap_search_timeout', '60');
+INSERT INTO `options` (`key`, `value`) VALUES ('ldap_search_limit', '60');
+INSERT INTO `options` (`key`, `value`) VALUES ('ldap_auto_import', '0');
+INSERT INTO `options` (`key`, `value`) VALUES ('ldap_last_acl_update', '0');
+
+DELETE FROM topology WHERE topology_page IN (
+'2021501',
+'2021502',
+'2021503',
+'2020201',
+'2020202',
+'2020203',
+'2020101',
+'2020102',
+'2020103',
+'2020104');
+
+DELETE FROM topology_JS WHERE id_page IN (
+'2021501',
+'2021502',
+'2021503',
+'2020201',
+'2020202',
+'2020203',
+'2020101',
+'2020102',
+'2020103',
+'2020104');
+
+
+INSERT INTO `options` (`key`, `value`) VALUES('monitoring_ack_svc', '1');
+INSERT INTO `options` (`key`, `value`) VALUES('monitoring_dwt_duration', '3600');
+INSERT INTO `options` (`key`, `value`) VALUES('monitoring_ack_active_checks', '1');
+INSERT INTO `options` (`key`, `value`) VALUES('monitoring_ack_persistent', '1');
+INSERT INTO `options` (`key`, `value`) VALUES('monitoring_ack_notify', '0');
+INSERT INTO `options` (`key`, `value`) VALUES('monitoring_ack_sticky', '1');
+INSERT INTO `options` (`key`, `value`) VALUES('monitoring_dwt_fixed', '1');
+INSERT INTO `options` (`key`, `value`) VALUES('monitoring_dwt_svc', '1');
+INSERT INTO `options` (`key`, `value`) VALUES('tactical_host_limit', '100');
+INSERT INTO `options` (`key`, `value`) VALUES('tactical_service_limit', '100');
+INSERT INTO `options` (`key`, `value`) VALUES('tactical_refresh_interval', '20');
+
+INSERT INTO `topology` (`topology_id`, `topology_name`, `topology_icone`, `topology_parent`, `topology_page`, `topology_order`, `topology_group`, `topology_url`, `topology_url_opt`, `topology_popup`, `topology_modules`, `topology_show`, `topology_style_class`, `topology_style_id`, `topology_OnClick`) VALUES(NULL, 'Centreon-Broker', NULL, 609, NULL, NULL, 11, NULL, NULL, '0', '0', '1', NULL, NULL, NULL);
+INSERT INTO `topology` (`topology_id`, `topology_name`, `topology_icone`, `topology_parent`, `topology_page`, `topology_order`, `topology_group`, `topology_url`, `topology_url_opt`, `topology_popup`, `topology_modules`, `topology_show`, `topology_style_class`, `topology_style_id`, `topology_OnClick`) VALUES(NULL, 'Configuration', './img/icones/16x16/text_code_colored.gif', 609, 60904, 40, 11, './include/configuration/configCentreonBroker/centreon-broker.php', NULL, '0', '0', '1', NULL, NULL, NULL);
+INSERT INTO `topology_JS` (`id_page`, `o`, `PathName_js`, `Init`) VALUES (60904, 'c', './include/common/javascript/changetab.js', 'initChangeTab');
+INSERT INTO `topology_JS` (`id_page`, `o`, `PathName_js`, `Init`) VALUES (60904, 'a', './include/common/javascript/changetab.js', 'initChangeTab');
+INSERT INTO `topology_JS` (`id_page`, `o`, `PathName_js`, `Init`) VALUES (60904, 'w', './include/common/javascript/changetab.js', 'initChangeTab');
+
+-- Tables for config Centreon-broker
+CREATE TABLE cfg_centreonbroker (
+ config_id INT NOT NULL AUTO_INCREMENT,
+ config_name VARCHAR(100) NOT NULL,
+ config_activate ENUM('0', '1') DEFAULT '0',
+ ns_nagios_server INT NOT NULL,
+ PRIMARY KEY (`config_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE cfg_centreonbroker_info (
+ config_id INT NOT NULL,
+ config_key VARCHAR(50) NOT NULL,
+ config_value VARCHAR(255) NOT NULL,
+ config_group VARCHAR (50) NOT NULL,
+ config_group_id INT DEFAULT NULL,
+ KEY cfg_centreonbroker_info_idx01 (config_id),
+ KEY cfg_centreonbroker_info_idx02 (config_id, config_group)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+ALTER TABLE `cfg_centreonbroker_info`
+ ADD CONSTRAINT `cfg_centreonbroker_info_ibfk_01` FOREIGN KEY (`config_id`) REFERENCES `cfg_centreonbroker` (`config_id`) ON DELETE CASCADE;
+
+-- Add column for Centreon Broker configuration path in pollers
+ALTER TABLE `nagios_server` ADD COLUMN `centreonbroker_cfg_path` VARCHAR(255) AFTER `nagios_perfdata`;
+
+-- Move Downtime to host and service page
+
+INSERT INTO `topology` (`topology_id`, `topology_name`, `topology_icone`, `topology_parent`, `topology_page`, `topology_order`, `topology_group`, `topology_url`, `topology_url_opt`, `topology_popup`, `topology_modules`, `topology_show`, `topology_style_class`, `topology_style_id`, `topology_OnClick`) VALUES (NULL, 'Downtimes', './img/icones/16x16/warning.gif', 601, 60106, 50, 1, './include/configuration/configDowntime/downtime.php', '&o=h', '0', '0', '1', NULL, NULL, NULL);
+INSERT INTO `topology` (`topology_id`, `topology_name`, `topology_icone`, `topology_parent`, `topology_page`, `topology_order`, `topology_group`, `topology_url`, `topology_url_opt`, `topology_popup`, `topology_modules`, `topology_show`, `topology_style_class`, `topology_style_id`, `topology_OnClick`) VALUES (NULL, 'Downtimes', './img/icones/16x16/warning.gif', 602, 60216, 100, 1, './include/configuration/configDowntime/downtime.php', '&o=s', '0', '0', '1', NULL, NULL, NULL);
+
+INSERT INTO `topology_JS` (`id_t_js`, `id_page`, `o`, `PathName_js`, `Init`) VALUES(NULL, 60106, 'a', './include/common/javascript/changetab.js', 'initChangeTab');
+INSERT INTO `topology_JS` (`id_t_js`, `id_page`, `o`, `PathName_js`, `Init`) VALUES(NULL, 60106, 'c', './include/common/javascript/changetab.js', 'initChangeTab');
+INSERT INTO `topology_JS` (`id_t_js`, `id_page`, `o`, `PathName_js`, `Init`) VALUES(NULL, 60106, 'w', './include/common/javascript/changetab.js', 'initChangeTab');
+
+INSERT INTO `topology_JS` (`id_t_js`, `id_page`, `o`, `PathName_js`, `Init`) VALUES(NULL, 60216, 'a', './include/common/javascript/changetab.js', 'initChangeTab');
+INSERT INTO `topology_JS` (`id_t_js`, `id_page`, `o`, `PathName_js`, `Init`) VALUES(NULL, 60216, 'c', './include/common/javascript/changetab.js', 'initChangeTab');
+INSERT INTO `topology_JS` (`id_t_js`, `id_page`, `o`, `PathName_js`, `Init`) VALUES(NULL, 60216, 'w', './include/common/javascript/changetab.js', 'initChangeTab');
+
+DELETE FROM topology WHERE topology_page = '606';
+DELETE FROM topology WHERE topology_parent = '606';
+
+UPDATE topology SET topology_order = 40 WHERE topology_page = '50501';
+UPDATE topology SET topology_order = 60, topology_page = '50503', topology_parent = '505', topology_icone = './img/icones/16x16/data_into.gif' WHERE topology_page = '503';
+
+-- Add column for templates curves : link curves by host/service too
+ALTER TABLE `giv_components_template` ADD `host_id` INT( 11 ) NULL AFTER `compo_id` ;
+ALTER TABLE `giv_components_template` ADD `service_id` INT( 11 ) NULL AFTER `host_id` ;
+
+INSERT INTO `topology_JS` (`id_t_js`, `id_page`, `o`, `PathName_js`, `Init`) VALUES(NULL, 607, NULL, './include/common/javascript/scriptaculous/s2.js ', NULL);
+INSERT INTO `topology_JS` (`id_t_js`, `id_page`, `o`, `PathName_js`, `Init`) VALUES(NULL, 60701, NULL, './include/common/javascript/scriptaculous/s2.js ', NULL);
+
+-- Add column for templates curves : ds_hidecurve / ds_legend / ds_jumpline
+ALTER TABLE `giv_components_template`
+ADD `ds_hidecurve` ENUM( '0', '1' ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL AFTER `ds_order`,
+ADD `ds_legend` VARCHAR( 200 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL AFTER `ds_invert` ,
+ADD `ds_jumpline` ENUM( '0', '1', '2', '3' ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL AFTER `ds_legend` ;
+
+-- Add table : 'virtual_metrics' : RRD:CDEF [Virtual/Metrics]
+CREATE TABLE IF NOT EXISTS `virtual_metrics` (
+ `vmetric_id` int(11) NOT NULL AUTO_INCREMENT,
+ `index_id` int(11) DEFAULT NULL,
+ `vmetric_name` varchar(255) DEFAULT NULL,
+ `def_type` enum('0','1') DEFAULT '0',
+ `rpn_function` varchar(255) DEFAULT NULL,
+ `warn` int(11) DEFAULT NULL,
+ `crit` int(11) DEFAULT NULL,
+ `unit_name` varchar(32) DEFAULT NULL,
+ `hidden` enum('0','1') DEFAULT '0',
+ `comment` text,
+ `vmetric_activate` enum('0','1') DEFAULT NULL,
+ `ck_state` enum('0','1','2') DEFAULT NULL,
+ PRIMARY KEY (`vmetric_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- Update 'topology' : RRD:CDEF [Virtual/Metrics]
+INSERT INTO `topology` (`topology_id`, `topology_name`, `topology_icone`, `topology_parent`, `topology_page`, `topology_order`, `topology_group`, `topology_url`, `topology_url_opt`, `topology_popup`, `topology_modules`, `topology_show`, `topology_style_class`, `topology_style_id`, `topology_OnClick`) VALUES
+(NULL, 'Virtuals', NULL, 402, NULL, NULL, 46, NULL, NULL, '0', '0', '1', NULL, NULL, NULL),
+(NULL, 'Metrics', './img/icones/16x16/chart.gif', 402, 40208, 80, 46, './include/views/graphs/virtualMetrics/virtualMetrics.php', NULL, '0', '0', '1', NULL, NULL, NULL);
+
+-- Change 'ods_view_details' field 'metric_id' from int(11) to varchar(12) : RRD:CDEF [Virtual/Metrics]
+ALTER TABLE `ods_view_details` CHANGE `metric_id` `metric_id` VARCHAR( 12 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL;
+
+-- Add column for display warning and critical area in split view graph
+ALTER TABLE `giv_components_template`
+ADD `ds_color_area_warn` VARCHAR(14) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL AFTER `ds_color_area` ,
+ADD `ds_color_area_crit` VARCHAR(14) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL AFTER `ds_color_area_warn`;
+
+INSERT INTO `topology_JS` (`id_t_js`, `id_page`, `o`, `PathName_js`, `Init`) VALUES(NULL, 60705, NULL, './include/common/javascript/changetab.js', 'initChangeTab');
+
+ALTER TABLE `host` CHANGE `host_register` `host_register` ENUM('0','1','2') NOT NULL DEFAULT '0';
+ALTER TABLE `service` CHANGE `service_register` `service_register` ENUM('0','1','2') NOT NULL DEFAULT '0';
+
+-- Update 'topology_JS' : move color_picker under modalbox
+
+INSERT INTO `topology_JS` (`id_t_js`, `id_page`, `o`, `PathName_js`, `Init`) VALUES(NULL, 40204, 'a', './include/common/javascript/color_picker_mb.js', NULL);
+INSERT INTO `topology_JS` (`id_t_js`, `id_page`, `o`, `PathName_js`, `Init`) VALUES(NULL, 40204, 'c', './include/common/javascript/color_picker_mb.js', NULL);
+INSERT INTO `topology_JS` (`id_t_js`, `id_page`, `o`, `PathName_js`, `Init`) VALUES(NULL, 40205, 'a', './include/common/javascript/color_picker_mb.js', NULL);
+INSERT INTO `topology_JS` (`id_t_js`, `id_page`, `o`, `PathName_js`, `Init`) VALUES(NULL, 40205, 'c', './include/common/javascript/color_picker_mb.js', NULL);
+INSERT INTO `topology_JS` (`id_t_js`, `id_page`, `o`, `PathName_js`, `Init`) VALUES(NULL, 5010103, NULL, './include/common/javascript/color_picker_mb.js', NULL);
+
+DELETE FROM `topology_JS` WHERE `id_page` IN ('20215', '20202', '20201', '20105', '20103', '20102') AND `Init` = 'initM' ;
+
+-- Add column to save random line color
+ALTER TABLE `ods_view_details` ADD `rnd_color` VARCHAR(7) NULL DEFAULT NULL AFTER `metric_id`;
+
+UPDATE `options` SET `value` = 'ndo' WHERE `key` = 'broker' AND `value` = 'Ndo';
+
+UPDATE `informations` SET `value` = '2.3.0-RC1' WHERE CONVERT( `informations`.`key` USING utf8 ) = 'version' AND CONVERT ( `informations`.`value` USING utf8 ) = '2.2.0' LIMIT 1;
+
\ No newline at end of file
diff --git a/www/install/sql/centreon/Update-DB-2.3.0-b4_to_2.3.0-RC1.sql b/www/install/sql/centreon/Update-DB-2.3.0-b4_to_2.3.0-RC1.sql
new file mode 100644
index 0000000000..b49aea4464
--- /dev/null
+++ b/www/install/sql/centreon/Update-DB-2.3.0-b4_to_2.3.0-RC1.sql
@@ -0,0 +1 @@
+UPDATE `informations` SET `value` = '2.3.0-RC1' WHERE CONVERT( `informations`.`key` USING utf8 ) = 'version' AND CONVERT ( `informations`.`value` USING utf8 ) = '2.3.0-b4' LIMIT 1;
\ No newline at end of file
diff --git a/www/install/sql/centstorage/Update-CSTG-2.2.0_to_2.3.0-RC1.sql b/www/install/sql/centstorage/Update-CSTG-2.2.0_to_2.3.0-RC1.sql
new file mode 100644
index 0000000000..4183586fab
--- /dev/null
+++ b/www/install/sql/centstorage/Update-CSTG-2.2.0_to_2.3.0-RC1.sql
@@ -0,0 +1,741 @@
+ALTER TABLE `index_data` CHANGE `host_name` `host_name` varchar(255) DEFAULT NULL;
+ALTER TABLE `index_data` CHANGE `service_description` `service_description` varchar(255) DEFAULT NULL;
+
+ALTER TABLE `log_archive_host` ADD `MaintenanceTime` INT NULL DEFAULT '0' AFTER `UNDETERMINEDTimeScheduled` ;
+ALTER TABLE `log_archive_service` ADD `MaintenanceTime` INT NULL DEFAULT '0' AFTER `UNDETERMINEDTimeScheduled` ;
+
+CREATE TABLE IF NOT EXISTS IF NOT EXISTS `centreon_acl` (
+ `id` int(11) NOT NULL auto_increment,
+ `host_id` int(11) default NULL,
+ `host_name` varchar(255) default NULL,
+ `service_id` int(11) default NULL,
+ `service_description` varchar(255) default NULL,
+ `group_id` int(11) default NULL,
+ PRIMARY KEY (`id`),
+ KEY `host_name` (`host_name`),
+ KEY `service_description` (`service_description`),
+ KEY `group_id_by_name` (`host_name`(70),`service_description`(120),`group_id`),
+ KEY `group_id_by_id` (`host_id`,`service_id`,`group_id`),
+ KEY `group_id_for_host` (`host_name`,`group_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+ALTER TABLE `metrics` ADD `data_source_type` ENUM( '0', '1', '2', '3' ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' AFTER `metric_name` ;
+
+-- ------------------------------------
+-- --
+-- Centreon Broker's database schema --
+-- --
+-- ------------------------------------
+
+-- acknowledgements
+-- comments
+-- customvariables
+-- downtimes
+-- eventhandlers
+-- flappingstatuses
+-- hosts
+-- hostgroups
+-- hosts_hostgroups
+-- hosts_hosts_dependencies
+-- hosts_hosts_parents
+-- hoststateevents
+-- instances
+-- issues
+-- issues_issues_parents
+-- logs
+-- modules
+-- notifications
+-- schemaversion
+-- services
+-- servicegroups
+-- services_servicegroups
+-- services_services_dependencies
+-- servicestateevents
+
+
+--
+-- Holds the current version of the database schema.
+--
+CREATE TABLE IF NOT EXISTS schemaversion (
+ software varchar(128) NOT NULL,
+ version int NOT NULL
+) ENGINE=InnoDB;
+INSERT INTO schemaversion (software, version) VALUES ('centreon-broker', 1);
+
+
+--
+-- Store information about Nagios instances.
+--
+CREATE TABLE IF NOT EXISTS instances (
+ instance_id int NOT NULL,
+ name varchar(255) NOT NULL default 'localhost',
+
+ active_host_checks boolean default NULL,
+ active_service_checks boolean default NULL,
+ address varchar(128) default NULL,
+ check_hosts_freshness boolean default NULL,
+ check_services_freshness boolean default NULL,
+ daemon_mode boolean default NULL,
+ description varchar(128) default NULL,
+ end_time int default NULL,
+ engine varchar(64) default NULL,
+ event_handlers boolean default NULL,
+ failure_prediction boolean default NULL,
+ flap_detection boolean default NULL,
+ global_host_event_handler text default NULL,
+ global_service_event_handler text default NULL,
+ last_alive int default NULL,
+ last_command_check int default NULL,
+ last_log_rotation int default NULL,
+ modified_host_attributes int default NULL,
+ modified_service_attributes int default NULL,
+ notifications boolean default NULL,
+ obsess_over_hosts boolean default NULL,
+ obsess_over_services boolean default NULL,
+ passive_host_checks boolean default NULL,
+ passive_service_checks boolean default NULL,
+ pid int default NULL,
+ process_perfdata boolean default NULL,
+ running boolean default NULL,
+ start_time int default NULL,
+ version varchar(16) default NULL,
+
+ PRIMARY KEY (instance_id)
+) ENGINE=InnoDB;
+
+
+--
+-- Monitored hosts.
+--
+CREATE TABLE IF NOT EXISTS hosts (
+ host_id int NOT NULL,
+ name varchar(255) NOT NULL,
+ instance_id int NOT NULL,
+
+ acknowledged boolean default NULL,
+ acknowledgement_type smallint default NULL,
+ action_url varchar(255) default NULL,
+ active_checks boolean default NULL,
+ address varchar(75) default NULL,
+ alias varchar(100) default NULL,
+ check_attempt smallint default NULL,
+ check_command text default NULL,
+ check_freshness boolean default NULL,
+ check_interval double default NULL,
+ check_period varchar(75) default NULL,
+ check_type smallint default NULL,
+ checked boolean default NULL,
+ command_line text default NULL,
+ default_active_checks boolean default NULL,
+ default_event_handler_enabled boolean default NULL,
+ default_failure_prediction boolean default NULL,
+ default_flap_detection boolean default NULL,
+ default_notify boolean default NULL,
+ default_passive_checks boolean default NULL,
+ default_process_perfdata boolean default NULL,
+ display_name varchar(100) default NULL,
+ enabled bool NOT NULL default true,
+ event_handler varchar(255) default NULL,
+ event_handler_enabled boolean default NULL,
+ execution_time double default NULL,
+ failure_prediction boolean default NULL,
+ first_notification_delay double default NULL,
+ flap_detection boolean default NULL,
+ flap_detection_on_down boolean default NULL,
+ flap_detection_on_unreachable boolean default NULL,
+ flap_detection_on_up boolean default NULL,
+ flapping boolean default NULL,
+ freshness_threshold double default NULL,
+ high_flap_threshold double default NULL,
+ icon_image varchar(255) default NULL,
+ icon_image_alt varchar(255) default NULL,
+ last_check int default NULL,
+ last_hard_state smallint default NULL,
+ last_hard_state_change int default NULL,
+ last_notification int default NULL,
+ last_state_change int default NULL,
+ last_time_down int default NULL,
+ last_time_unreachable int default NULL,
+ last_time_up int default NULL,
+ last_update int default NULL,
+ latency double default NULL,
+ low_flap_threshold double default NULL,
+ max_check_attempts smallint default NULL,
+ modified_attributes int default NULL,
+ next_check int default NULL,
+ next_host_notification int default NULL,
+ no_more_notifications boolean default NULL,
+ notes varchar(255) default NULL,
+ notes_url varchar(255) default NULL,
+ notification_interval double default NULL,
+ notification_number smallint default NULL,
+ notification_period varchar(75) default NULL,
+ notify boolean default NULL,
+ notify_on_down boolean default NULL,
+ notify_on_downtime boolean default NULL,
+ notify_on_flapping boolean default NULL,
+ notify_on_recovery boolean default NULL,
+ notify_on_unreachable boolean default NULL,
+ obsess_over_host boolean default NULL,
+ output text default NULL,
+ passive_checks boolean default NULL,
+ percent_state_change double default NULL,
+ perfdata text default NULL,
+ process_perfdata boolean default NULL,
+ retain_nonstatus_information boolean default NULL,
+ retain_status_information boolean default NULL,
+ retry_interval double default NULL,
+ scheduled_downtime_depth smallint default NULL,
+ should_be_scheduled boolean default NULL,
+ stalk_on_down boolean default NULL,
+ stalk_on_unreachable boolean default NULL,
+ stalk_on_up boolean default NULL,
+ state smallint default NULL,
+ state_type smallint default NULL,
+ statusmap_image varchar(255) default NULL,
+
+ UNIQUE (host_id),
+ UNIQUE (instance_id, name),
+ FOREIGN KEY (instance_id) REFERENCES instances (instance_id)
+ ON DELETE CASCADE
+) ENGINE=InnoDB;
+
+
+--
+-- Host groups.
+--
+CREATE TABLE IF NOT EXISTS hostgroups (
+ hostgroup_id int NOT NULL auto_increment,
+ instance_id int NOT NULL,
+ name varchar(255) NOT NULL,
+
+ action_url varchar(160) default NULL,
+ alias varchar(255) default NULL,
+ notes varchar(160) default NULL,
+ notes_url varchar(160) default NULL,
+
+ PRIMARY KEY (hostgroup_id),
+ UNIQUE (name, instance_id),
+ FOREIGN KEY (instance_id) REFERENCES instances (instance_id)
+ ON DELETE CASCADE
+) ENGINE=InnoDB;
+
+
+--
+-- Relationships between hosts and host groups.
+--
+CREATE TABLE IF NOT EXISTS hosts_hostgroups (
+ host_id int NOT NULL,
+ hostgroup_id int NOT NULL,
+
+ UNIQUE (host_id, hostgroup_id),
+ FOREIGN KEY (host_id) REFERENCES hosts (host_id)
+ ON DELETE CASCADE,
+ FOREIGN KEY (hostgroup_id) REFERENCES hostgroups (hostgroup_id)
+ ON DELETE CASCADE
+) ENGINE=InnoDB;
+
+
+--
+-- Hosts dependencies.
+--
+CREATE TABLE IF NOT EXISTS hosts_hosts_dependencies (
+ dependent_host_id int NOT NULL,
+ host_id int NOT NULL,
+
+ dependency_period varchar(75) default NULL,
+ execution_failure_options varchar(15) default NULL,
+ inherits_parent boolean default NULL,
+ notification_failure_options varchar(15) default NULL,
+
+ UNIQUE (dependent_host_id, host_id),
+ FOREIGN KEY (dependent_host_id) REFERENCES hosts (host_id)
+ ON DELETE CASCADE,
+ FOREIGN KEY (host_id) REFERENCES hosts (host_id)
+ ON DELETE CASCADE
+) ENGINE=InnoDB;
+
+
+--
+-- Hosts parenting relationships.
+--
+CREATE TABLE IF NOT EXISTS hosts_hosts_parents (
+ child_id int NOT NULL,
+ parent_id int NOT NULL,
+
+ UNIQUE (child_id, parent_id),
+ FOREIGN KEY (child_id) REFERENCES hosts (host_id)
+ ON DELETE CASCADE,
+ FOREIGN KEY (parent_id) REFERENCES hosts (host_id)
+ ON DELETE CASCADE
+) ENGINE=InnoDB;
+
+
+--
+-- Monitored services.
+--
+CREATE TABLE IF NOT EXISTS services (
+ host_id int NOT NULL,
+ description varchar(255) NOT NULL,
+ service_id int NOT NULL,
+
+ acknowledged boolean default NULL,
+ acknowledgement_type smallint default NULL,
+ action_url varchar(255) default NULL,
+ active_checks boolean default NULL,
+ check_attempt smallint default NULL,
+ check_command text default NULL,
+ check_freshness boolean default NULL,
+ check_interval double default NULL,
+ check_period varchar(75) default NULL,
+ check_type smallint default NULL,
+ checked boolean default NULL,
+ command_line text default NULL,
+ default_active_checks boolean default NULL,
+ default_event_handler_enabled boolean default NULL,
+ default_failure_prediction boolean default NULL,
+ default_flap_detection boolean default NULL,
+ default_notify boolean default NULL,
+ default_passive_checks boolean default NULL,
+ default_process_perfdata boolean default NULL,
+ display_name varchar(160) default NULL,
+ enabled bool NOT NULL default true,
+ event_handler varchar(255) default NULL,
+ event_handler_enabled boolean default NULL,
+ execution_time double default NULL,
+ failure_prediction boolean default NULL,
+ failure_prediction_options varchar(64) default NULL,
+ first_notification_delay double default NULL,
+ flap_detection boolean default NULL,
+ flap_detection_on_critical boolean default NULL,
+ flap_detection_on_ok boolean default NULL,
+ flap_detection_on_unknown boolean default NULL,
+ flap_detection_on_warning boolean default NULL,
+ flapping boolean default NULL,
+ freshness_threshold double default NULL,
+ high_flap_threshold double default NULL,
+ icon_image varchar(255) default NULL,
+ icon_image_alt varchar(255) default NULL,
+ last_check int default NULL,
+ last_hard_state smallint default NULL,
+ last_hard_state_change int default NULL,
+ last_notification int default NULL,
+ last_state_change int default NULL,
+ last_time_critical int default NULL,
+ last_time_ok int default NULL,
+ last_time_unknown int default NULL,
+ last_time_warning int default NULL,
+ last_update int default NULL,
+ latency double default NULL,
+ low_flap_threshold double default NULL,
+ max_check_attempts smallint default NULL,
+ modified_attributes int default NULL,
+ next_check int default NULL,
+ next_notification int default NULL,
+ no_more_notifications boolean default NULL,
+ notes varchar(255) default NULL,
+ notes_url varchar(255) default NULL,
+ notification_interval double default NULL,
+ notification_number smallint default NULL,
+ notification_period varchar(75) default NULL,
+ notify boolean default NULL,
+ notify_on_critical boolean default NULL,
+ notify_on_downtime boolean default NULL,
+ notify_on_flapping boolean default NULL,
+ notify_on_recovery boolean default NULL,
+ notify_on_unknown boolean default NULL,
+ notify_on_warning boolean default NULL,
+ obsess_over_service boolean default NULL,
+ output text default NULL,
+ passive_checks boolean default NULL,
+ percent_state_change double default NULL,
+ perfdata text default NULL,
+ process_perfdata boolean default NULL,
+ retain_nonstatus_information boolean default NULL,
+ retain_status_information boolean default NULL,
+ retry_interval double default NULL,
+ scheduled_downtime_depth smallint default NULL,
+ should_be_scheduled boolean default NULL,
+ stalk_on_critical boolean default NULL,
+ stalk_on_ok boolean default NULL,
+ stalk_on_unknown boolean default NULL,
+ stalk_on_warning boolean default NULL,
+ state smallint default NULL,
+ state_type smallint default NULL,
+ volatile boolean default NULL,
+
+ UNIQUE (host_id, service_id),
+ FOREIGN KEY (host_id) REFERENCES hosts (host_id)
+ ON DELETE CASCADE
+) ENGINE=InnoDB;
+
+
+--
+-- Groups of services.
+--
+CREATE TABLE IF NOT EXISTS servicegroups (
+ servicegroup_id int NOT NULL auto_increment,
+ instance_id int NOT NULL,
+ name varchar(255) NOT NULL,
+
+ action_url varchar(160) default NULL,
+ alias varchar(255) default NULL,
+ notes varchar(160) default NULL,
+ notes_url varchar(160) default NULL,
+
+ PRIMARY KEY (servicegroup_id),
+ FOREIGN KEY (instance_id) REFERENCES instances (instance_id)
+ ON DELETE CASCADE
+) ENGINE=InnoDB;
+
+
+--
+-- Relationships between services and service groups.
+--
+CREATE TABLE IF NOT EXISTS services_servicegroups (
+ host_id int NOT NULL,
+ service_id int NOT NULL,
+ servicegroup_id int NOT NULL,
+
+ UNIQUE (host_id, service_id, servicegroup_id),
+ FOREIGN KEY (host_id) REFERENCES hosts (host_id)
+ ON DELETE CASCADE,
+ FOREIGN KEY (servicegroup_id) REFERENCES servicegroups (servicegroup_id)
+ ON DELETE CASCADE
+) ENGINE=InnoDB;
+
+
+--
+-- Services dependencies.
+--
+CREATE TABLE IF NOT EXISTS services_services_dependencies (
+ dependent_host_id int NOT NULL,
+ dependent_service_id int NOT NULL,
+ host_id int NOT NULL,
+ service_id int NOT NULL,
+
+ dependency_period varchar(75) default NULL,
+ execution_failure_options varchar(15) default NULL,
+ inherits_parent boolean default NULL,
+ notification_failure_options varchar(15) default NULL,
+
+ UNIQUE (dependent_host_id, dependent_service_id, host_id, service_id),
+ FOREIGN KEY (dependent_host_id) REFERENCES hosts (host_id)
+ ON DELETE CASCADE,
+ FOREIGN KEY (host_id) REFERENCES hosts (host_id)
+ ON DELETE CASCADE
+) ENGINE=InnoDB;
+
+
+--
+-- Holds acknowledgedments information.
+--
+CREATE TABLE IF NOT EXISTS acknowledgements (
+ acknowledgement_id int NOT NULL auto_increment,
+ entry_time int NOT NULL,
+ host_id int NOT NULL,
+ service_id int default NULL,
+
+ author varchar(64) default NULL,
+ comment_data varchar(255) default NULL,
+ instance_id int default NULL,
+ notify_contacts boolean default NULL,
+ persistent_comment boolean default NULL,
+ state smallint default NULL,
+ sticky boolean default NULL,
+ type smallint default NULL,
+
+ PRIMARY KEY (acknowledgement_id),
+ UNIQUE (entry_time, host_id, service_id),
+ FOREIGN KEY (host_id) REFERENCES hosts (host_id)
+ ON DELETE CASCADE,
+ FOREIGN KEY (instance_id) REFERENCES instances (instance_id)
+ ON DELETE SET NULL
+) ENGINE=InnoDB;
+
+
+--
+-- Holds comments information.
+--
+CREATE TABLE IF NOT EXISTS comments (
+ comment_id int NOT NULL auto_increment,
+ entry_time int NOT NULL,
+ host_id int NOT NULL,
+ service_id int default NULL,
+
+ author varchar(64) default NULL,
+ data text default NULL,
+ deletion_time int default NULL,
+ entry_type smallint default NULL,
+ expire_time int default NULL,
+ expires boolean default NULL,
+ instance_id int default NULL,
+ internal_id int NOT NULL,
+ persistent boolean default NULL,
+ source smallint default NULL,
+ type smallint default NULL,
+
+ PRIMARY KEY (comment_id),
+ UNIQUE (entry_time, host_id, service_id),
+ FOREIGN KEY (host_id) REFERENCES hosts (host_id)
+ ON DELETE CASCADE,
+ FOREIGN KEY (instance_id) REFERENCES instances (instance_id)
+ ON DELETE SET NULL
+) ENGINE=InnoDB;
+
+
+--
+-- Custom variables.
+--
+CREATE TABLE IF NOT EXISTS customvariables (
+ customvariable_id int NOT NULL auto_increment,
+ host_id int default NULL,
+ name varchar(255) default NULL,
+ service_id int default NULL,
+
+ default_value varchar(255) default NULL,
+ modified boolean default NULL,
+ type smallint default NULL,
+ update_time int default NULL,
+ value varchar(255) default NULL,
+
+ PRIMARY KEY (customvariable_id),
+ UNIQUE (host_id, name, service_id)
+) ENGINE=InnoDB;
+
+
+--
+-- Downtimes.
+--
+CREATE TABLE IF NOT EXISTS downtimes (
+ downtime_id int NOT NULL auto_increment,
+ entry_time int default NULL,
+ host_id int NOT NULL,
+ service_id int default NULL,
+
+ author varchar(64) default NULL,
+ cancelled boolean default NULL,
+ comment_data text default NULL,
+ duration int default NULL,
+ end_time int default NULL,
+ fixed boolean default NULL,
+ instance_id int default NULL,
+ internal_id int default NULL,
+ start_time int default NULL,
+ started boolean default NULL,
+ triggered_by int default NULL,
+ type smallint default NULL,
+
+ PRIMARY KEY (downtime_id),
+ UNIQUE (entry_time, host_id, service_id),
+ FOREIGN KEY (host_id) REFERENCES hosts (host_id)
+ ON DELETE CASCADE,
+ FOREIGN KEY (instance_id) REFERENCES instances (instance_id)
+ ON DELETE SET NULL
+) ENGINE=InnoDB;
+
+
+--
+-- Event handlers.
+--
+CREATE TABLE IF NOT EXISTS eventhandlers (
+ eventhandler_id int NOT NULL auto_increment,
+ host_id int default NULL,
+ service_id int default NULL,
+ start_time int default NULL,
+
+ command_args varchar(255) default NULL,
+ command_line varchar(255) default NULL,
+ early_timeout smallint default NULL,
+ end_time int default NULL,
+ execution_time double default NULL,
+ output varchar(255) default NULL,
+ return_code smallint default NULL,
+ state smallint default NULL,
+ state_type smallint default NULL,
+ timeout smallint default NULL,
+ type smallint default NULL,
+
+ PRIMARY KEY (eventhandler_id),
+ UNIQUE (host_id, service_id, start_time),
+ FOREIGN KEY (host_id) REFERENCES hosts (host_id)
+ ON DELETE CASCADE
+) ENGINE=InnoDB;
+
+
+--
+-- Historization of flapping statuses.
+--
+CREATE TABLE IF NOT EXISTS flappingstatuses (
+ flappingstatus_id int NOT NULL auto_increment,
+ host_id int default NULL,
+ service_id int default NULL,
+ event_time int default NULL,
+
+ comment_time int default NULL,
+ event_type smallint default NULL,
+ high_threshold double default NULL,
+ internal_comment_id int default NULL,
+ low_threshold double default NULL,
+ percent_state_change double default NULL,
+ reason_type smallint default NULL,
+ type smallint default NULL,
+
+ PRIMARY KEY (flappingstatus_id),
+ UNIQUE (host_id, service_id, event_time),
+ FOREIGN KEY (host_id) REFERENCES hosts (host_id)
+ ON DELETE CASCADE
+) ENGINE=InnoDB;
+
+
+--
+-- Correlated issues.
+--
+CREATE TABLE IF NOT EXISTS issues (
+ issue_id int NOT NULL auto_increment,
+ host_id int default NULL,
+ service_id int default NULL,
+ start_time int NOT NULL,
+
+ ack_time int default NULL,
+ end_time int default NULL,
+
+ PRIMARY KEY (issue_id),
+ UNIQUE (host_id, service_id, start_time),
+ FOREIGN KEY (host_id) REFERENCES hosts (host_id)
+ ON DELETE CASCADE
+) ENGINE=InnoDB;
+
+
+--
+-- Issues parenting.
+--
+CREATE TABLE IF NOT EXISTS issues_issues_parents (
+ child_id int NOT NULL,
+ end_time int default NULL,
+ start_time int NOT NULL,
+ parent_id int NOT NULL,
+
+ FOREIGN KEY (child_id) REFERENCES issues (issue_id)
+ ON DELETE CASCADE,
+ FOREIGN KEY (parent_id) REFERENCES issues (issue_id)
+ ON DELETE CASCADE
+) ENGINE=InnoDB;
+
+
+--
+-- Nagios logs.
+--
+CREATE TABLE IF NOT EXISTS logs (
+ log_id int NOT NULL auto_increment,
+
+ ctime int default NULL,
+ host_id int default NULL,
+ host_name varchar(255) default NULL,
+ instance_name varchar(255) NOT NULL,
+ issue_id int default NULL,
+ msg_type tinyint default NULL,
+ notification_cmd varchar(255) default NULL,
+ notification_contact varchar(255) default NULL,
+ output text default NULL,
+ retry int default NULL,
+ service_description varchar(255) default NULL,
+ service_id int default NULL,
+ status enum('0', '1', '2', '3', '4') default NULL,
+ type smallint default NULL,
+
+ PRIMARY KEY (log_id),
+ FOREIGN KEY (host_id) REFERENCES hosts (host_id)
+ ON DELETE SET NULL
+) ENGINE=MyISAM;
+
+
+--
+-- Nagios modules.
+--
+CREATE TABLE IF NOT EXISTS modules (
+ module_id int NOT NULL auto_increment,
+ instance_id int NOT NULL,
+
+ args varchar(255) default NULL,
+ filename varchar(255) default NULL,
+ loaded boolean default NULL,
+ should_be_loaded boolean default NULL,
+
+ PRIMARY KEY (module_id),
+ FOREIGN KEY (instance_id) REFERENCES instances (instance_id)
+ ON DELETE CASCADE
+) ENGINE=InnoDB;
+
+
+--
+-- Notifications.
+--
+CREATE TABLE IF NOT EXISTS notifications (
+ notification_id int NOT NULL auto_increment,
+ host_id int default NULL,
+ service_id int default NULL,
+ start_time int default NULL,
+
+ ack_author varchar(255) default NULL,
+ ack_data text default NULL,
+ command_name varchar(255) default NULL,
+ contact_name varchar(255) default NULL,
+ contacts_notified boolean default NULL,
+ end_time int default NULL,
+ escalated boolean default NULL,
+ output text default NULL,
+ reason_type int default NULL,
+ state int default NULL,
+ type int default NULL,
+
+ PRIMARY KEY (notification_id),
+ UNIQUE (host_id, service_id, start_time),
+ FOREIGN KEY (host_id) REFERENCES hosts (host_id)
+ ON DELETE CASCADE
+) ENGINE=InnoDB;
+
+
+--
+-- Host states.
+--
+CREATE TABLE IF NOT EXISTS hoststateevents (
+ hoststateevent_id int NOT NULL auto_increment,
+ host_id int NOT NULL,
+ start_time int NOT NULL,
+
+ end_time int default NULL,
+ in_downtime boolean default NULL,
+ last_update int default NULL,
+ state int default NULL,
+
+ PRIMARY KEY (hoststateevent_id),
+ UNIQUE (host_id, start_time),
+ FOREIGN KEY (host_id) REFERENCES hosts (host_id)
+ ON DELETE CASCADE
+) ENGINE=InnoDB;
+
+
+--
+-- Service states.
+--
+CREATE TABLE IF NOT EXISTS servicestateevents (
+ servicestateevent_id int NOT NULL auto_increment,
+ host_id int NOT NULL,
+ service_id int NOT NULL,
+ start_time int NOT NULL,
+
+ end_time int default NULL,
+ in_downtime boolean default NULL,
+ last_update int default NULL,
+ state int default NULL,
+
+ PRIMARY KEY (servicestateevent_id),
+ UNIQUE (host_id, service_id, start_time),
+ FOREIGN KEY (host_id, service_id) REFERENCES services (host_id, service_id)
+ ON DELETE CASCADE
+) ENGINE=InnoDB;
+
+
+ALTER TABLE `log` ADD COLUMN `instance` int(11) NOT NULL default '1' AFTER `msg_type`;
+ALTER TABLE `log` ADD INDEX(`instance`);
\ No newline at end of file
diff --git a/www/install/sql/centstorage/Update-CSTG-2.3.0-b1_to_2.3.0-b2.sql b/www/install/sql/centstorage/Update-CSTG-2.3.0-b1_to_2.3.0-b2.sql
index f1363edab0..9ca0a2d3ca 100644
--- a/www/install/sql/centstorage/Update-CSTG-2.3.0-b1_to_2.3.0-b2.sql
+++ b/www/install/sql/centstorage/Update-CSTG-2.3.0-b1_to_2.3.0-b2.sql
@@ -14,7 +14,7 @@ CREATE TABLE IF NOT EXISTS `hoststateevents` (
`last_update` tinyint(4) NOT NULL default '0',
`in_downtime` tinyint(4) NOT NULL,
PRIMARY KEY (`hoststateevents_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=212 ;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -32,4 +32,4 @@ CREATE TABLE IF NOT EXISTS `servicestateevents` (
`last_update` tinyint(4) NOT NULL default '0',
`in_downtime` tinyint(4) NOT NULL,
PRIMARY KEY (`servicestateevents_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=63812 ;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
diff --git a/www/install/sql/centstorage/Update-CSTG-2.3.0-b2_to_2.3.0-b3.sql b/www/install/sql/centstorage/Update-CSTG-2.3.0-b2_to_2.3.0-b3.sql
index f1363edab0..9ca0a2d3ca 100644
--- a/www/install/sql/centstorage/Update-CSTG-2.3.0-b2_to_2.3.0-b3.sql
+++ b/www/install/sql/centstorage/Update-CSTG-2.3.0-b2_to_2.3.0-b3.sql
@@ -14,7 +14,7 @@ CREATE TABLE IF NOT EXISTS `hoststateevents` (
`last_update` tinyint(4) NOT NULL default '0',
`in_downtime` tinyint(4) NOT NULL,
PRIMARY KEY (`hoststateevents_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=212 ;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -32,4 +32,4 @@ CREATE TABLE IF NOT EXISTS `servicestateevents` (
`last_update` tinyint(4) NOT NULL default '0',
`in_downtime` tinyint(4) NOT NULL,
PRIMARY KEY (`servicestateevents_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=63812 ;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
--
GitLab