From: Ethan G. <ega...@us...> - 2007-08-29 15:21:22
|
Update of /cvsroot/nagios/ndoutils/db In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15328/db Modified Files: installdb mysql-upgrade-1.3.sql mysql-upgrade-1.4b1.sql mysql-upgrade-1.4b2.sql mysql.sql upgradedb Added Files: mysql-mods-1.4b5.sql mysql-upgrade-1.4b3.sql mysql-upgrade-1.4b4.sql Log Message: Prep for new release Index: mysql.sql =================================================================== RCS file: /cvsroot/nagios/ndoutils/db/mysql.sql,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mysql.sql 19 Feb 2007 04:48:11 -0000 1.3 --- mysql.sql 29 Aug 2007 15:20:44 -0000 1.4 *************** *** 4,8 **** -- -- Host: localhost ! -- Generation Time: Feb 18, 2007 at 10:44 PM -- Server version: 4.1.20 -- PHP Version: 5.0.4 --- 4,8 ---- -- -- Host: localhost ! -- Generation Time: Aug 29, 2007 at 09:08 AM -- Server version: 4.1.20 -- PHP Version: 5.0.4 *************** *** 31,35 **** `notify_contacts` smallint(6) NOT NULL default '0', PRIMARY KEY (`acknowledgement_id`) ! ) ENGINE=MyISAM COMMENT='Current and historical host and service acknowledgements'; -- -------------------------------------------------------- --- 31,35 ---- `notify_contacts` smallint(6) NOT NULL default '0', PRIMARY KEY (`acknowledgement_id`) ! ) ENGINE=InnoDB COMMENT='Current and historical host and service acknowledgements'; -- -------------------------------------------------------- *************** *** 47,51 **** PRIMARY KEY (`command_id`), UNIQUE KEY `instance_id` (`instance_id`,`object_id`,`config_type`) ! ) ENGINE=MyISAM COMMENT='Command definitions'; -- -------------------------------------------------------- --- 47,51 ---- PRIMARY KEY (`command_id`), UNIQUE KEY `instance_id` (`instance_id`,`object_id`,`config_type`) ! ) ENGINE=InnoDB COMMENT='Command definitions'; -- -------------------------------------------------------- *************** *** 75,79 **** PRIMARY KEY (`commenthistory_id`), UNIQUE KEY `instance_id` (`instance_id`,`comment_time`,`internal_comment_id`) ! ) ENGINE=MyISAM COMMENT='Historical host and service comments'; -- -------------------------------------------------------- --- 75,79 ---- PRIMARY KEY (`commenthistory_id`), UNIQUE KEY `instance_id` (`instance_id`,`comment_time`,`internal_comment_id`) ! ) ENGINE=InnoDB COMMENT='Historical host and service comments'; -- -------------------------------------------------------- *************** *** 101,105 **** PRIMARY KEY (`comment_id`), UNIQUE KEY `instance_id` (`instance_id`,`comment_time`,`internal_comment_id`) ! ) ENGINE=MyISAM; -- -------------------------------------------------------- --- 101,105 ---- PRIMARY KEY (`comment_id`), UNIQUE KEY `instance_id` (`instance_id`,`comment_time`,`internal_comment_id`) ! ) ENGINE=InnoDB; -- -------------------------------------------------------- *************** *** 116,120 **** PRIMARY KEY (`configfile_id`), UNIQUE KEY `instance_id` (`instance_id`,`configfile_type`,`configfile_path`) ! ) ENGINE=MyISAM COMMENT='Configuration files'; -- -------------------------------------------------------- --- 116,120 ---- PRIMARY KEY (`configfile_id`), UNIQUE KEY `instance_id` (`instance_id`,`configfile_type`,`configfile_path`) ! ) ENGINE=InnoDB COMMENT='Configuration files'; -- -------------------------------------------------------- *************** *** 132,136 **** PRIMARY KEY (`configfilevariable_id`), UNIQUE KEY `instance_id` (`instance_id`,`configfile_id`,`varname`) ! ) ENGINE=MyISAM COMMENT='Configuration file variables'; -- -------------------------------------------------------- --- 132,136 ---- PRIMARY KEY (`configfilevariable_id`), UNIQUE KEY `instance_id` (`instance_id`,`configfile_id`,`varname`) ! ) ENGINE=InnoDB COMMENT='Configuration file variables'; -- -------------------------------------------------------- *************** *** 157,161 **** `entries_processed` int(11) NOT NULL default '0', PRIMARY KEY (`conninfo_id`) ! ) ENGINE=MyISAM COMMENT='NDO2DB daemon connection information'; -- -------------------------------------------------------- --- 157,161 ---- `entries_processed` int(11) NOT NULL default '0', PRIMARY KEY (`conninfo_id`) ! ) ENGINE=InnoDB COMMENT='NDO2DB daemon connection information'; -- -------------------------------------------------------- *************** *** 173,177 **** PRIMARY KEY (`contact_address_id`), UNIQUE KEY `contact_id` (`contact_id`,`address_number`) ! ) ENGINE=MyISAM COMMENT='Contact addresses'; -- -------------------------------------------------------- --- 173,177 ---- PRIMARY KEY (`contact_address_id`), UNIQUE KEY `contact_id` (`contact_id`,`address_number`) ! ) ENGINE=InnoDB COMMENT='Contact addresses'; -- -------------------------------------------------------- *************** *** 190,194 **** PRIMARY KEY (`contact_notificationcommand_id`), UNIQUE KEY `contact_id` (`contact_id`,`notification_type`,`command_object_id`,`command_args`) ! ) ENGINE=MyISAM COMMENT='Contact host and service notification commands'; -- -------------------------------------------------------- --- 190,194 ---- PRIMARY KEY (`contact_notificationcommand_id`), UNIQUE KEY `contact_id` (`contact_id`,`notification_type`,`command_object_id`,`command_args`) ! ) ENGINE=InnoDB COMMENT='Contact host and service notification commands'; -- -------------------------------------------------------- *************** *** 205,209 **** PRIMARY KEY (`contactgroup_member_id`), UNIQUE KEY `instance_id` (`contactgroup_id`,`contact_object_id`) ! ) ENGINE=MyISAM COMMENT='Contactgroup members'; -- -------------------------------------------------------- --- 205,209 ---- PRIMARY KEY (`contactgroup_member_id`), UNIQUE KEY `instance_id` (`contactgroup_id`,`contact_object_id`) ! ) ENGINE=InnoDB COMMENT='Contactgroup members'; -- -------------------------------------------------------- *************** *** 221,225 **** PRIMARY KEY (`contactgroup_id`), UNIQUE KEY `instance_id` (`instance_id`,`config_type`,`contactgroup_object_id`) ! ) ENGINE=MyISAM COMMENT='Contactgroup definitions'; -- -------------------------------------------------------- --- 221,225 ---- PRIMARY KEY (`contactgroup_id`), UNIQUE KEY `instance_id` (`instance_id`,`config_type`,`contactgroup_object_id`) ! ) ENGINE=InnoDB COMMENT='Contactgroup definitions'; -- -------------------------------------------------------- *************** *** 241,245 **** PRIMARY KEY (`contactnotificationmethod_id`), UNIQUE KEY `instance_id` (`instance_id`,`contactnotification_id`,`start_time`,`start_time_usec`) ! ) ENGINE=MyISAM COMMENT='Historical record of contact notification methods'; -- -------------------------------------------------------- --- 241,245 ---- PRIMARY KEY (`contactnotificationmethod_id`), UNIQUE KEY `instance_id` (`instance_id`,`contactnotification_id`,`start_time`,`start_time_usec`) ! ) ENGINE=InnoDB COMMENT='Historical record of contact notification methods'; -- -------------------------------------------------------- *************** *** 260,264 **** PRIMARY KEY (`contactnotification_id`), UNIQUE KEY `instance_id` (`instance_id`,`contact_object_id`,`start_time`,`start_time_usec`) ! ) ENGINE=MyISAM COMMENT='Historical record of contact notifications'; -- -------------------------------------------------------- --- 260,264 ---- PRIMARY KEY (`contactnotification_id`), UNIQUE KEY `instance_id` (`instance_id`,`contact_object_id`,`start_time`,`start_time_usec`) ! ) ENGINE=InnoDB COMMENT='Historical record of contact notifications'; -- -------------------------------------------------------- *************** *** 294,298 **** PRIMARY KEY (`contact_id`), UNIQUE KEY `instance_id` (`instance_id`,`config_type`,`contact_object_id`) ! ) ENGINE=MyISAM COMMENT='Contact definitions'; -- -------------------------------------------------------- --- 294,298 ---- PRIMARY KEY (`contact_id`), UNIQUE KEY `instance_id` (`instance_id`,`config_type`,`contact_object_id`) ! ) ENGINE=InnoDB COMMENT='Contact definitions'; -- -------------------------------------------------------- *************** *** 316,320 **** PRIMARY KEY (`contactstatus_id`), UNIQUE KEY `contact_object_id` (`contact_object_id`) ! ) ENGINE=MyISAM COMMENT='Contact status'; -- -------------------------------------------------------- --- 316,320 ---- PRIMARY KEY (`contactstatus_id`), UNIQUE KEY `contact_object_id` (`contact_object_id`) ! ) ENGINE=InnoDB COMMENT='Contact status'; -- -------------------------------------------------------- *************** *** 335,339 **** UNIQUE KEY `object_id_2` (`object_id`,`config_type`,`varname`), KEY `varname` (`varname`) ! ) ENGINE=MyISAM COMMENT='Custom variables'; -- -------------------------------------------------------- --- 335,339 ---- UNIQUE KEY `object_id_2` (`object_id`,`config_type`,`varname`), KEY `varname` (`varname`) ! ) ENGINE=InnoDB COMMENT='Custom variables'; -- -------------------------------------------------------- *************** *** 354,358 **** UNIQUE KEY `object_id_2` (`object_id`,`varname`), KEY `varname` (`varname`) ! ) ENGINE=MyISAM COMMENT='Custom variable status information'; -- -------------------------------------------------------- --- 354,358 ---- UNIQUE KEY `object_id_2` (`object_id`,`varname`), KEY `varname` (`varname`) ! ) ENGINE=InnoDB COMMENT='Custom variable status information'; -- -------------------------------------------------------- *************** *** 365,369 **** `name` varchar(10) NOT NULL default '', `version` varchar(10) NOT NULL default '' ! ) ENGINE=MyISAM; -- -------------------------------------------------------- --- 365,369 ---- `name` varchar(10) NOT NULL default '', `version` varchar(10) NOT NULL default '' ! ) ENGINE=InnoDB; -- -------------------------------------------------------- *************** *** 395,399 **** PRIMARY KEY (`downtimehistory_id`), UNIQUE KEY `instance_id` (`instance_id`,`object_id`,`entry_time`,`internal_downtime_id`) ! ) ENGINE=MyISAM COMMENT='Historical scheduled host and service downtime'; -- -------------------------------------------------------- --- 395,399 ---- PRIMARY KEY (`downtimehistory_id`), UNIQUE KEY `instance_id` (`instance_id`,`object_id`,`entry_time`,`internal_downtime_id`) ! ) ENGINE=InnoDB COMMENT='Historical scheduled host and service downtime'; -- -------------------------------------------------------- *************** *** 424,428 **** PRIMARY KEY (`eventhandler_id`), UNIQUE KEY `instance_id` (`instance_id`,`object_id`,`start_time`,`start_time_usec`) ! ) ENGINE=MyISAM COMMENT='Historical host and service event handlers'; -- -------------------------------------------------------- --- 424,428 ---- PRIMARY KEY (`eventhandler_id`), UNIQUE KEY `instance_id` (`instance_id`,`object_id`,`start_time`,`start_time_usec`) ! ) ENGINE=InnoDB COMMENT='Historical host and service event handlers'; -- -------------------------------------------------------- *************** *** 440,444 **** `command_args` varchar(255) NOT NULL default '', PRIMARY KEY (`externalcommand_id`) ! ) ENGINE=MyISAM COMMENT='Historical record of processed external commands'; -- -------------------------------------------------------- --- 440,444 ---- `command_args` varchar(255) NOT NULL default '', PRIMARY KEY (`externalcommand_id`) ! ) ENGINE=InnoDB COMMENT='Historical record of processed external commands'; -- -------------------------------------------------------- *************** *** 463,467 **** `internal_comment_id` int(11) NOT NULL default '0', PRIMARY KEY (`flappinghistory_id`) ! ) ENGINE=MyISAM COMMENT='Current and historical record of host and service flapping'; -- -------------------------------------------------------- --- 463,482 ---- `internal_comment_id` int(11) NOT NULL default '0', PRIMARY KEY (`flappinghistory_id`) ! ) ENGINE=InnoDB COMMENT='Current and historical record of host and service flapping'; ! ! -- -------------------------------------------------------- ! ! -- ! -- Table structure for table `nagios_host_contactgroups` ! -- ! ! CREATE TABLE `nagios_host_contactgroups` ( ! `host_contactgroup_id` int(11) NOT NULL auto_increment, ! `instance_id` smallint(6) NOT NULL default '0', ! `host_id` int(11) NOT NULL default '0', ! `contactgroup_object_id` int(11) NOT NULL default '0', ! PRIMARY KEY (`host_contactgroup_id`), ! UNIQUE KEY `instance_id` (`host_id`,`contactgroup_object_id`) ! ) ENGINE=InnoDB COMMENT='Host contact groups'; -- -------------------------------------------------------- *************** *** 478,482 **** PRIMARY KEY (`host_contact_id`), UNIQUE KEY `instance_id` (`instance_id`,`host_id`,`contact_object_id`) ! ) ENGINE=MyISAM; -- -------------------------------------------------------- --- 493,497 ---- PRIMARY KEY (`host_contact_id`), UNIQUE KEY `instance_id` (`instance_id`,`host_id`,`contact_object_id`) ! ) ENGINE=InnoDB; -- -------------------------------------------------------- *************** *** 493,497 **** PRIMARY KEY (`host_parenthost_id`), UNIQUE KEY `instance_id` (`host_id`,`parent_host_object_id`) ! ) ENGINE=MyISAM COMMENT='Parent hosts'; -- -------------------------------------------------------- --- 508,512 ---- PRIMARY KEY (`host_parenthost_id`), UNIQUE KEY `instance_id` (`host_id`,`parent_host_object_id`) ! ) ENGINE=InnoDB COMMENT='Parent hosts'; -- -------------------------------------------------------- *************** *** 527,531 **** PRIMARY KEY (`hostcheck_id`), UNIQUE KEY `instance_id` (`instance_id`,`host_object_id`,`start_time`,`start_time_usec`) ! ) ENGINE=MyISAM COMMENT='Historical host checks'; -- -------------------------------------------------------- --- 542,546 ---- PRIMARY KEY (`hostcheck_id`), UNIQUE KEY `instance_id` (`instance_id`,`host_object_id`,`start_time`,`start_time_usec`) ! ) ENGINE=InnoDB COMMENT='Historical host checks'; -- -------------------------------------------------------- *************** *** 549,553 **** PRIMARY KEY (`hostdependency_id`), UNIQUE KEY `instance_id` (`instance_id`,`config_type`,`host_object_id`,`dependent_host_object_id`,`dependency_type`,`inherits_parent`,`fail_on_up`,`fail_on_down`,`fail_on_unreachable`) ! ) ENGINE=MyISAM COMMENT='Host dependency definitions'; -- -------------------------------------------------------- --- 564,583 ---- PRIMARY KEY (`hostdependency_id`), UNIQUE KEY `instance_id` (`instance_id`,`config_type`,`host_object_id`,`dependent_host_object_id`,`dependency_type`,`inherits_parent`,`fail_on_up`,`fail_on_down`,`fail_on_unreachable`) ! ) ENGINE=InnoDB COMMENT='Host dependency definitions'; ! ! -- -------------------------------------------------------- ! ! -- ! -- Table structure for table `nagios_hostescalation_contactgroups` ! -- ! ! CREATE TABLE `nagios_hostescalation_contactgroups` ( ! `hostescalation_contactgroup_id` int(11) NOT NULL auto_increment, ! `instance_id` smallint(6) NOT NULL default '0', ! `hostescalation_id` int(11) NOT NULL default '0', ! `contactgroup_object_id` int(11) NOT NULL default '0', ! PRIMARY KEY (`hostescalation_contactgroup_id`), ! UNIQUE KEY `instance_id` (`hostescalation_id`,`contactgroup_object_id`) ! ) ENGINE=InnoDB COMMENT='Host escalation contact groups'; -- -------------------------------------------------------- *************** *** 564,568 **** PRIMARY KEY (`hostescalation_contact_id`), UNIQUE KEY `instance_id` (`instance_id`,`hostescalation_id`,`contact_object_id`) ! ) ENGINE=MyISAM; -- -------------------------------------------------------- --- 594,598 ---- PRIMARY KEY (`hostescalation_contact_id`), UNIQUE KEY `instance_id` (`instance_id`,`hostescalation_id`,`contact_object_id`) ! ) ENGINE=InnoDB; -- -------------------------------------------------------- *************** *** 586,590 **** PRIMARY KEY (`hostescalation_id`), UNIQUE KEY `instance_id` (`instance_id`,`config_type`,`host_object_id`,`timeperiod_object_id`,`first_notification`,`last_notification`) ! ) ENGINE=MyISAM COMMENT='Host escalation definitions'; -- -------------------------------------------------------- --- 616,620 ---- PRIMARY KEY (`hostescalation_id`), UNIQUE KEY `instance_id` (`instance_id`,`config_type`,`host_object_id`,`timeperiod_object_id`,`first_notification`,`last_notification`) ! ) ENGINE=InnoDB COMMENT='Host escalation definitions'; -- -------------------------------------------------------- *************** *** 601,605 **** PRIMARY KEY (`hostgroup_member_id`), UNIQUE KEY `instance_id` (`hostgroup_id`,`host_object_id`) ! ) ENGINE=MyISAM COMMENT='Hostgroup members'; -- -------------------------------------------------------- --- 631,635 ---- PRIMARY KEY (`hostgroup_member_id`), UNIQUE KEY `instance_id` (`hostgroup_id`,`host_object_id`) ! ) ENGINE=InnoDB COMMENT='Hostgroup members'; -- -------------------------------------------------------- *************** *** 617,621 **** PRIMARY KEY (`hostgroup_id`), UNIQUE KEY `instance_id` (`instance_id`,`hostgroup_object_id`) ! ) ENGINE=MyISAM COMMENT='Hostgroup definitions'; -- -------------------------------------------------------- --- 647,651 ---- PRIMARY KEY (`hostgroup_id`), UNIQUE KEY `instance_id` (`instance_id`,`hostgroup_object_id`) ! ) ENGINE=InnoDB COMMENT='Hostgroup definitions'; -- -------------------------------------------------------- *************** *** 686,690 **** PRIMARY KEY (`host_id`), UNIQUE KEY `instance_id` (`instance_id`,`config_type`,`host_object_id`) ! ) ENGINE=MyISAM COMMENT='Host definitions'; -- -------------------------------------------------------- --- 716,720 ---- PRIMARY KEY (`host_id`), UNIQUE KEY `instance_id` (`instance_id`,`config_type`,`host_object_id`) ! ) ENGINE=InnoDB COMMENT='Host definitions'; -- -------------------------------------------------------- *************** *** 743,747 **** PRIMARY KEY (`hoststatus_id`), UNIQUE KEY `object_id` (`host_object_id`) ! ) ENGINE=MyISAM COMMENT='Current host status information'; -- -------------------------------------------------------- --- 773,777 ---- PRIMARY KEY (`hoststatus_id`), UNIQUE KEY `object_id` (`host_object_id`) ! ) ENGINE=InnoDB COMMENT='Current host status information'; -- -------------------------------------------------------- *************** *** 756,760 **** `instance_description` varchar(128) NOT NULL default '', PRIMARY KEY (`instance_id`) ! ) ENGINE=MyISAM COMMENT='Location names of various Nagios installations'; -- -------------------------------------------------------- --- 786,790 ---- `instance_description` varchar(128) NOT NULL default '', PRIMARY KEY (`instance_id`) ! ) ENGINE=InnoDB COMMENT='Location names of various Nagios installations'; -- -------------------------------------------------------- *************** *** 775,779 **** `inferred_data_extracted` smallint(6) NOT NULL default '0', PRIMARY KEY (`logentry_id`) ! ) ENGINE=MyISAM COMMENT='Historical record of log entries'; -- -------------------------------------------------------- --- 805,809 ---- `inferred_data_extracted` smallint(6) NOT NULL default '0', PRIMARY KEY (`logentry_id`) ! ) ENGINE=InnoDB COMMENT='Historical record of log entries'; -- -------------------------------------------------------- *************** *** 799,803 **** PRIMARY KEY (`notification_id`), UNIQUE KEY `instance_id` (`instance_id`,`object_id`,`start_time`,`start_time_usec`) ! ) ENGINE=MyISAM COMMENT='Historical record of host and service notifications'; -- -------------------------------------------------------- --- 829,833 ---- PRIMARY KEY (`notification_id`), UNIQUE KEY `instance_id` (`instance_id`,`object_id`,`start_time`,`start_time_usec`) ! ) ENGINE=InnoDB COMMENT='Historical record of host and service notifications'; -- -------------------------------------------------------- *************** *** 816,820 **** PRIMARY KEY (`object_id`), KEY `objecttype_id` (`objecttype_id`,`name1`,`name2`) ! ) ENGINE=MyISAM COMMENT='Current and historical objects of all kinds'; -- -------------------------------------------------------- --- 846,850 ---- PRIMARY KEY (`object_id`), KEY `objecttype_id` (`objecttype_id`,`name1`,`name2`) ! ) ENGINE=InnoDB COMMENT='Current and historical objects of all kinds'; -- -------------------------------------------------------- *************** *** 835,839 **** `program_date` varchar(10) NOT NULL default '', PRIMARY KEY (`processevent_id`) ! ) ENGINE=MyISAM COMMENT='Historical Nagios process events'; -- -------------------------------------------------------- --- 865,869 ---- `program_date` varchar(10) NOT NULL default '', PRIMARY KEY (`processevent_id`) ! ) ENGINE=InnoDB COMMENT='Historical Nagios process events'; -- -------------------------------------------------------- *************** *** 871,875 **** PRIMARY KEY (`programstatus_id`), UNIQUE KEY `instance_id` (`instance_id`) ! ) ENGINE=MyISAM COMMENT='Current program status information'; -- -------------------------------------------------------- --- 901,905 ---- PRIMARY KEY (`programstatus_id`), UNIQUE KEY `instance_id` (`instance_id`) ! ) ENGINE=InnoDB COMMENT='Current program status information'; -- -------------------------------------------------------- *************** *** 886,890 **** PRIMARY KEY (`runtimevariable_id`), UNIQUE KEY `instance_id` (`instance_id`,`varname`) ! ) ENGINE=MyISAM COMMENT='Runtime variables from the Nagios daemon'; -- -------------------------------------------------------- --- 916,920 ---- PRIMARY KEY (`runtimevariable_id`), UNIQUE KEY `instance_id` (`instance_id`,`varname`) ! ) ENGINE=InnoDB COMMENT='Runtime variables from the Nagios daemon'; -- -------------------------------------------------------- *************** *** 913,917 **** PRIMARY KEY (`scheduleddowntime_id`), UNIQUE KEY `instance_id` (`instance_id`,`object_id`,`entry_time`,`internal_downtime_id`) ! ) ENGINE=MyISAM COMMENT='Current scheduled host and service downtime'; -- -------------------------------------------------------- --- 943,962 ---- PRIMARY KEY (`scheduleddowntime_id`), UNIQUE KEY `instance_id` (`instance_id`,`object_id`,`entry_time`,`internal_downtime_id`) ! ) ENGINE=InnoDB COMMENT='Current scheduled host and service downtime'; ! ! -- -------------------------------------------------------- ! ! -- ! -- Table structure for table `nagios_service_contactgroups` ! -- ! ! CREATE TABLE `nagios_service_contactgroups` ( ! `service_contactgroup_id` int(11) NOT NULL auto_increment, ! `instance_id` smallint(6) NOT NULL default '0', ! `service_id` int(11) NOT NULL default '0', ! `contactgroup_object_id` int(11) NOT NULL default '0', ! PRIMARY KEY (`service_contactgroup_id`), ! UNIQUE KEY `instance_id` (`service_id`,`contactgroup_object_id`) ! ) ENGINE=InnoDB COMMENT='Service contact groups'; -- -------------------------------------------------------- *************** *** 928,932 **** PRIMARY KEY (`service_contact_id`), UNIQUE KEY `instance_id` (`instance_id`,`service_id`,`contact_object_id`) ! ) ENGINE=MyISAM; -- -------------------------------------------------------- --- 973,977 ---- PRIMARY KEY (`service_contact_id`), UNIQUE KEY `instance_id` (`instance_id`,`service_id`,`contact_object_id`) ! ) ENGINE=InnoDB; -- -------------------------------------------------------- *************** *** 961,965 **** PRIMARY KEY (`servicecheck_id`), UNIQUE KEY `instance_id` (`instance_id`,`service_object_id`,`start_time`,`start_time_usec`) ! ) ENGINE=MyISAM COMMENT='Historical service checks'; -- -------------------------------------------------------- --- 1006,1010 ---- PRIMARY KEY (`servicecheck_id`), UNIQUE KEY `instance_id` (`instance_id`,`service_object_id`,`start_time`,`start_time_usec`) ! ) ENGINE=InnoDB COMMENT='Historical service checks'; -- -------------------------------------------------------- *************** *** 984,988 **** PRIMARY KEY (`servicedependency_id`), UNIQUE KEY `instance_id` (`instance_id`,`config_type`,`service_object_id`,`dependent_service_object_id`,`dependency_type`,`inherits_parent`,`fail_on_ok`,`fail_on_warning`,`fail_on_unknown`,`fail_on_critical`) ! ) ENGINE=MyISAM COMMENT='Service dependency definitions'; -- -------------------------------------------------------- --- 1029,1048 ---- PRIMARY KEY (`servicedependency_id`), UNIQUE KEY `instance_id` (`instance_id`,`config_type`,`service_object_id`,`dependent_service_object_id`,`dependency_type`,`inherits_parent`,`fail_on_ok`,`fail_on_warning`,`fail_on_unknown`,`fail_on_critical`) ! ) ENGINE=InnoDB COMMENT='Service dependency definitions'; ! ! -- -------------------------------------------------------- ! ! -- ! -- Table structure for table `nagios_serviceescalation_contactgroups` ! -- ! ! CREATE TABLE `nagios_serviceescalation_contactgroups` ( ! `serviceescalation_contactgroup_id` int(11) NOT NULL auto_increment, ! `instance_id` smallint(6) NOT NULL default '0', ! `serviceescalation_id` int(11) NOT NULL default '0', ! `contactgroup_object_id` int(11) NOT NULL default '0', ! PRIMARY KEY (`serviceescalation_contactgroup_id`), ! UNIQUE KEY `instance_id` (`serviceescalation_id`,`contactgroup_object_id`) ! ) ENGINE=InnoDB COMMENT='Service escalation contact groups'; -- -------------------------------------------------------- *************** *** 999,1003 **** PRIMARY KEY (`serviceescalation_contact_id`), UNIQUE KEY `instance_id` (`instance_id`,`serviceescalation_id`,`contact_object_id`) ! ) ENGINE=MyISAM; -- -------------------------------------------------------- --- 1059,1063 ---- PRIMARY KEY (`serviceescalation_contact_id`), UNIQUE KEY `instance_id` (`instance_id`,`serviceescalation_id`,`contact_object_id`) ! ) ENGINE=InnoDB; -- -------------------------------------------------------- *************** *** 1022,1026 **** PRIMARY KEY (`serviceescalation_id`), UNIQUE KEY `instance_id` (`instance_id`,`config_type`,`service_object_id`,`timeperiod_object_id`,`first_notification`,`last_notification`) ! ) ENGINE=MyISAM COMMENT='Service escalation definitions'; -- -------------------------------------------------------- --- 1082,1086 ---- PRIMARY KEY (`serviceescalation_id`), UNIQUE KEY `instance_id` (`instance_id`,`config_type`,`service_object_id`,`timeperiod_object_id`,`first_notification`,`last_notification`) ! ) ENGINE=InnoDB COMMENT='Service escalation definitions'; -- -------------------------------------------------------- *************** *** 1037,1041 **** PRIMARY KEY (`servicegroup_member_id`), UNIQUE KEY `instance_id` (`servicegroup_id`,`service_object_id`) ! ) ENGINE=MyISAM COMMENT='Servicegroup members'; -- -------------------------------------------------------- --- 1097,1101 ---- PRIMARY KEY (`servicegroup_member_id`), UNIQUE KEY `instance_id` (`servicegroup_id`,`service_object_id`) ! ) ENGINE=InnoDB COMMENT='Servicegroup members'; -- -------------------------------------------------------- *************** *** 1053,1057 **** PRIMARY KEY (`servicegroup_id`), UNIQUE KEY `instance_id` (`instance_id`,`config_type`,`servicegroup_object_id`) ! ) ENGINE=MyISAM COMMENT='Servicegroup definitions'; -- -------------------------------------------------------- --- 1113,1117 ---- PRIMARY KEY (`servicegroup_id`), UNIQUE KEY `instance_id` (`instance_id`,`config_type`,`servicegroup_object_id`) ! ) ENGINE=InnoDB COMMENT='Servicegroup definitions'; -- -------------------------------------------------------- *************** *** 1116,1120 **** PRIMARY KEY (`service_id`), UNIQUE KEY `instance_id` (`instance_id`,`config_type`,`service_object_id`) ! ) ENGINE=MyISAM COMMENT='Service definitions'; -- -------------------------------------------------------- --- 1176,1180 ---- PRIMARY KEY (`service_id`), UNIQUE KEY `instance_id` (`instance_id`,`config_type`,`service_object_id`) ! ) ENGINE=InnoDB COMMENT='Service definitions'; -- -------------------------------------------------------- *************** *** 1174,1178 **** PRIMARY KEY (`servicestatus_id`), UNIQUE KEY `object_id` (`service_object_id`) ! ) ENGINE=MyISAM COMMENT='Current service status information'; -- -------------------------------------------------------- --- 1234,1238 ---- PRIMARY KEY (`servicestatus_id`), UNIQUE KEY `object_id` (`service_object_id`) ! ) ENGINE=InnoDB COMMENT='Current service status information'; -- -------------------------------------------------------- *************** *** 1193,1199 **** `current_check_attempt` smallint(6) NOT NULL default '0', `max_check_attempts` smallint(6) NOT NULL default '0', `output` varchar(255) NOT NULL default '', PRIMARY KEY (`statehistory_id`) ! ) ENGINE=MyISAM COMMENT='Historical host and service state changes'; -- -------------------------------------------------------- --- 1253,1261 ---- `current_check_attempt` smallint(6) NOT NULL default '0', `max_check_attempts` smallint(6) NOT NULL default '0', + `last_state` smallint(6) NOT NULL default '-1', + `last_hard_state` smallint(6) NOT NULL default '-1', `output` varchar(255) NOT NULL default '', PRIMARY KEY (`statehistory_id`) ! ) ENGINE=InnoDB COMMENT='Historical host and service state changes'; -- -------------------------------------------------------- *************** *** 1218,1222 **** PRIMARY KEY (`systemcommand_id`), UNIQUE KEY `instance_id` (`instance_id`,`start_time`,`start_time_usec`) ! ) ENGINE=MyISAM COMMENT='Historical system commands that are executed'; -- -------------------------------------------------------- --- 1280,1284 ---- PRIMARY KEY (`systemcommand_id`), UNIQUE KEY `instance_id` (`instance_id`,`start_time`,`start_time_usec`) ! ) ENGINE=InnoDB COMMENT='Historical system commands that are executed'; -- -------------------------------------------------------- *************** *** 1236,1240 **** `object_id` int(11) NOT NULL default '0', PRIMARY KEY (`timedeventqueue_id`) ! ) ENGINE=MyISAM COMMENT='Current Nagios event queue'; -- -------------------------------------------------------- --- 1298,1302 ---- `object_id` int(11) NOT NULL default '0', PRIMARY KEY (`timedeventqueue_id`) ! ) ENGINE=InnoDB COMMENT='Current Nagios event queue'; -- -------------------------------------------------------- *************** *** 1259,1263 **** PRIMARY KEY (`timedevent_id`), UNIQUE KEY `instance_id` (`instance_id`,`event_type`,`scheduled_time`,`object_id`) ! ) ENGINE=MyISAM COMMENT='Historical events from the Nagios event queue'; -- -------------------------------------------------------- --- 1321,1325 ---- PRIMARY KEY (`timedevent_id`), UNIQUE KEY `instance_id` (`instance_id`,`event_type`,`scheduled_time`,`object_id`) ! ) ENGINE=InnoDB COMMENT='Historical events from the Nagios event queue'; -- -------------------------------------------------------- *************** *** 1276,1280 **** PRIMARY KEY (`timeperiod_timerange_id`), UNIQUE KEY `instance_id` (`timeperiod_id`,`day`,`start_sec`,`end_sec`) ! ) ENGINE=MyISAM COMMENT='Timeperiod definitions'; -- -------------------------------------------------------- --- 1338,1342 ---- PRIMARY KEY (`timeperiod_timerange_id`), UNIQUE KEY `instance_id` (`timeperiod_id`,`day`,`start_sec`,`end_sec`) ! ) ENGINE=InnoDB COMMENT='Timeperiod definitions'; -- -------------------------------------------------------- *************** *** 1292,1294 **** PRIMARY KEY (`timeperiod_id`), UNIQUE KEY `instance_id` (`instance_id`,`config_type`,`timeperiod_object_id`) ! ) ENGINE=MyISAM COMMENT='Timeperiod definitions'; --- 1354,1356 ---- PRIMARY KEY (`timeperiod_id`), UNIQUE KEY `instance_id` (`instance_id`,`config_type`,`timeperiod_object_id`) ! ) ENGINE=InnoDB COMMENT='Timeperiod definitions'; Index: mysql-upgrade-1.4b1.sql =================================================================== RCS file: /cvsroot/nagios/ndoutils/db/mysql-upgrade-1.4b1.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mysql-upgrade-1.4b1.sql 19 Feb 2007 04:48:11 -0000 1.2 --- mysql-upgrade-1.4b1.sql 29 Aug 2007 15:20:43 -0000 1.3 *************** *** 33,37 **** ALTER TABLE `nagios_services` ADD `host_object_id` INT NOT NULL AFTER `config_type` ; ! -- Start of mods from 1.4b3 ALTER TABLE `nagios_hosts` ADD `alias` VARCHAR( 64 ) NOT NULL AFTER `host_object_id` ; --- 33,167 ---- ALTER TABLE `nagios_services` ADD `host_object_id` INT NOT NULL AFTER `config_type` ; ! -- Start of mods from 1.4b3 -- ALTER TABLE `nagios_hosts` ADD `alias` VARCHAR( 64 ) NOT NULL AFTER `host_object_id` ; + + -- End of mods from 1.4b3 -- + + + -- BEGIN 1.4b5 MODS + + -- + -- Table structure for table `nagios_host_contactgroups` + -- + + CREATE TABLE IF NOT EXISTS `nagios_host_contactgroups` ( + `host_contactgroup_id` int(11) NOT NULL auto_increment, + `instance_id` smallint(6) NOT NULL default '0', + `host_id` int(11) NOT NULL default '0', + `contactgroup_object_id` int(11) NOT NULL default '0', + PRIMARY KEY (`host_contactgroup_id`), + UNIQUE KEY `instance_id` (`host_id`,`contactgroup_object_id`) + ) ENGINE=MyISAM DEFAULT CHARSET=ascii COMMENT='Host contact groups'; + + -- -------------------------------------------------------- + + -- + -- Table structure for table `nagios_hostescalation_contactgroups` + -- + + CREATE TABLE IF NOT EXISTS `nagios_hostescalation_contactgroups` ( + `hostescalation_contactgroup_id` int(11) NOT NULL auto_increment, + `instance_id` smallint(6) NOT NULL default '0', + `hostescalation_id` int(11) NOT NULL default '0', + `contactgroup_object_id` int(11) NOT NULL default '0', + PRIMARY KEY (`hostescalation_contactgroup_id`), + UNIQUE KEY `instance_id` (`hostescalation_id`,`contactgroup_object_id`) + ) ENGINE=MyISAM DEFAULT CHARSET=ascii COMMENT='Host escalation contact groups'; + + -- -------------------------------------------------------- + + -- + -- Table structure for table `nagios_service_contactgroups` + -- + + CREATE TABLE IF NOT EXISTS `nagios_service_contactgroups` ( + `service_contactgroup_id` int(11) NOT NULL auto_increment, + `instance_id` smallint(6) NOT NULL default '0', + `service_id` int(11) NOT NULL default '0', + `contactgroup_object_id` int(11) NOT NULL default '0', + PRIMARY KEY (`service_contactgroup_id`), + UNIQUE KEY `instance_id` (`service_id`,`contactgroup_object_id`) + ) ENGINE=MyISAM DEFAULT CHARSET=ascii COMMENT='Service contact groups'; + + -- -------------------------------------------------------- + + -- + -- Table structure for table `nagios_serviceescalation_contactgroups` + -- + + CREATE TABLE IF NOT EXISTS `nagios_serviceescalation_contactgroups` ( + `serviceescalation_contactgroup_id` int(11) NOT NULL auto_increment, + `instance_id` smallint(6) NOT NULL default '0', + `serviceescalation_id` int(11) NOT NULL default '0', + `contactgroup_object_id` int(11) NOT NULL default '0', + PRIMARY KEY (`serviceescalation_contactgroup_id`), + UNIQUE KEY `instance_id` (`serviceescalation_id`,`contactgroup_object_id`) + ) ENGINE=MyISAM DEFAULT CHARSET=ascii COMMENT='Service escalation contact groups'; + + -- -------------------------------------------------------- + + ALTER TABLE `nagios_acknowledgements` TYPE = innodb; + ALTER TABLE `nagios_commands` TYPE = innodb; + ALTER TABLE `nagios_commenthistory` TYPE = innodb; + ALTER TABLE `nagios_comments` TYPE = innodb; + ALTER TABLE `nagios_configfiles` TYPE = innodb; + ALTER TABLE `nagios_configfilevariables` TYPE = innodb; + ALTER TABLE `nagios_conninfo` TYPE = innodb; + ALTER TABLE `nagios_contact_addresses` TYPE = innodb; + ALTER TABLE `nagios_contact_notificationcommands` TYPE = innodb; + ALTER TABLE `nagios_contactgroup_members` TYPE = innodb; + ALTER TABLE `nagios_contactgroups` TYPE = innodb; + ALTER TABLE `nagios_contactnotificationmethods` TYPE = innodb; + ALTER TABLE `nagios_contactnotifications` TYPE = innodb; + ALTER TABLE `nagios_contacts` TYPE = innodb; + ALTER TABLE `nagios_contactstatus` TYPE = innodb; + ALTER TABLE `nagios_customvariables` TYPE = innodb; + ALTER TABLE `nagios_customvariablestatus` TYPE = innodb; + ALTER TABLE `nagios_dbversion` TYPE = innodb; + ALTER TABLE `nagios_downtimehistory` TYPE = innodb; + ALTER TABLE `nagios_eventhandlers` TYPE = innodb; + ALTER TABLE `nagios_externalcommands` TYPE = innodb; + ALTER TABLE `nagios_flappinghistory` TYPE = innodb; + ALTER TABLE `nagios_host_contactgroups` TYPE = innodb; + ALTER TABLE `nagios_host_contacts` TYPE = innodb; + ALTER TABLE `nagios_host_parenthosts` TYPE = innodb; + ALTER TABLE `nagios_hostchecks` TYPE = innodb; + ALTER TABLE `nagios_hostdependencies` TYPE = innodb; + ALTER TABLE `nagios_hostescalation_contactgroups` TYPE = innodb; + ALTER TABLE `nagios_hostescalation_contacts` TYPE = innodb; + ALTER TABLE `nagios_hostescalations` TYPE = innodb; + ALTER TABLE `nagios_hostgroup_members` TYPE = innodb; + ALTER TABLE `nagios_hostgroups` TYPE = innodb; + ALTER TABLE `nagios_hosts` TYPE = innodb; + ALTER TABLE `nagios_hoststatus` TYPE = innodb; + ALTER TABLE `nagios_instances` TYPE = innodb; + ALTER TABLE `nagios_logentries` TYPE = innodb; + ALTER TABLE `nagios_notifications` TYPE = innodb; + ALTER TABLE `nagios_objects` TYPE = innodb; + ALTER TABLE `nagios_processevents` TYPE = innodb; + ALTER TABLE `nagios_programstatus` TYPE = innodb; + ALTER TABLE `nagios_runtimevariables` TYPE = innodb; + ALTER TABLE `nagios_scheduleddowntime` TYPE = innodb; + ALTER TABLE `nagios_service_contactgroups` TYPE = innodb; + ALTER TABLE `nagios_service_contacts` TYPE = innodb; + ALTER TABLE `nagios_servicechecks` TYPE = innodb; + ALTER TABLE `nagios_servicedependencies` TYPE = innodb; + ALTER TABLE `nagios_serviceescalation_contactgroups` TYPE = innodb; + ALTER TABLE `nagios_serviceescalation_contacts` TYPE = innodb; + ALTER TABLE `nagios_serviceescalations` TYPE = innodb; + ALTER TABLE `nagios_servicegroup_members` TYPE = innodb; + ALTER TABLE `nagios_servicegroups` TYPE = innodb; + ALTER TABLE `nagios_services` TYPE = innodb; + ALTER TABLE `nagios_servicestatus` TYPE = innodb; + ALTER TABLE `nagios_statehistory` TYPE = innodb; + ALTER TABLE `nagios_systemcommands` TYPE = innodb; + ALTER TABLE `nagios_timedeventqueue` TYPE = innodb; + ALTER TABLE `nagios_timedevents` TYPE = innodb; + ALTER TABLE `nagios_timeperiod_timeranges` TYPE = innodb; + ALTER TABLE `nagios_timeperiods` TYPE = innodb; + + ALTER TABLE `nagios_statehistory` ADD `last_state` SMALLINT DEFAULT '-1' NOT NULL AFTER `max_check_attempts` , + ADD `last_hard_state` SMALLINT DEFAULT '-1' NOT NULL AFTER `last_state` ; + + -- END 1.4b5 MODS Index: installdb =================================================================== RCS file: /cvsroot/nagios/ndoutils/db/installdb,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** installdb 19 Jun 2007 23:20:33 -0000 1.2 --- installdb 29 Aug 2007 15:20:41 -0000 1.3 *************** *** 46,50 **** # Current database version ! my $thisversion="1.4b4"; # Create version table if it doesn't exist --- 46,50 ---- # Current database version ! my $thisversion="1.4b5"; # Create version table if it doesn't exist --- NEW FILE: mysql-mods-1.4b5.sql --- -- BEGIN 1.4b5 MODS -- -- Table structure for table `nagios_host_contactgroups` -- CREATE TABLE IF NOT EXISTS `nagios_host_contactgroups` ( `host_contactgroup_id` int(11) NOT NULL auto_increment, `instance_id` smallint(6) NOT NULL default '0', `host_id` int(11) NOT NULL default '0', `contactgroup_object_id` int(11) NOT NULL default '0', PRIMARY KEY (`host_contactgroup_id`), UNIQUE KEY `instance_id` (`host_id`,`contactgroup_object_id`) ) ENGINE=MyISAM DEFAULT CHARSET=ascii COMMENT='Host contact groups'; -- -------------------------------------------------------- -- -- Table structure for table `nagios_hostescalation_contactgroups` -- CREATE TABLE IF NOT EXISTS `nagios_hostescalation_contactgroups` ( `hostescalation_contactgroup_id` int(11) NOT NULL auto_increment, `instance_id` smallint(6) NOT NULL default '0', `hostescalation_id` int(11) NOT NULL default '0', `contactgroup_object_id` int(11) NOT NULL default '0', PRIMARY KEY (`hostescalation_contactgroup_id`), UNIQUE KEY `instance_id` (`hostescalation_id`,`contactgroup_object_id`) ) ENGINE=MyISAM DEFAULT CHARSET=ascii COMMENT='Host escalation contact groups'; -- -------------------------------------------------------- -- -- Table structure for table `nagios_service_contactgroups` -- CREATE TABLE IF NOT EXISTS `nagios_service_contactgroups` ( `service_contactgroup_id` int(11) NOT NULL auto_increment, `instance_id` smallint(6) NOT NULL default '0', `service_id` int(11) NOT NULL default '0', `contactgroup_object_id` int(11) NOT NULL default '0', PRIMARY KEY (`service_contactgroup_id`), UNIQUE KEY `instance_id` (`service_id`,`contactgroup_object_id`) ) ENGINE=MyISAM DEFAULT CHARSET=ascii COMMENT='Service contact groups'; -- -------------------------------------------------------- -- -- Table structure for table `nagios_serviceescalation_contactgroups` -- CREATE TABLE IF NOT EXISTS `nagios_serviceescalation_contactgroups` ( `serviceescalation_contactgroup_id` int(11) NOT NULL auto_increment, `instance_id` smallint(6) NOT NULL default '0', `serviceescalation_id` int(11) NOT NULL default '0', `contactgroup_object_id` int(11) NOT NULL default '0', PRIMARY KEY (`serviceescalation_contactgroup_id`), UNIQUE KEY `instance_id` (`serviceescalation_id`,`contactgroup_object_id`) ) ENGINE=MyISAM DEFAULT CHARSET=ascii COMMENT='Service escalation contact groups'; -- -------------------------------------------------------- ALTER TABLE `nagios_acknowledgements` TYPE = innodb; ALTER TABLE `nagios_commands` TYPE = innodb; ALTER TABLE `nagios_commenthistory` TYPE = innodb; ALTER TABLE `nagios_comments` TYPE = innodb; ALTER TABLE `nagios_configfiles` TYPE = innodb; ALTER TABLE `nagios_configfilevariables` TYPE = innodb; ALTER TABLE `nagios_conninfo` TYPE = innodb; ALTER TABLE `nagios_contact_addresses` TYPE = innodb; ALTER TABLE `nagios_contact_notificationcommands` TYPE = innodb; ALTER TABLE `nagios_contactgroup_members` TYPE = innodb; ALTER TABLE `nagios_contactgroups` TYPE = innodb; ALTER TABLE `nagios_contactnotificationmethods` TYPE = innodb; ALTER TABLE `nagios_contactnotifications` TYPE = innodb; ALTER TABLE `nagios_contacts` TYPE = innodb; ALTER TABLE `nagios_contactstatus` TYPE = innodb; ALTER TABLE `nagios_customvariables` TYPE = innodb; ALTER TABLE `nagios_customvariablestatus` TYPE = innodb; ALTER TABLE `nagios_dbversion` TYPE = innodb; ALTER TABLE `nagios_downtimehistory` TYPE = innodb; ALTER TABLE `nagios_eventhandlers` TYPE = innodb; ALTER TABLE `nagios_externalcommands` TYPE = innodb; ALTER TABLE `nagios_flappinghistory` TYPE = innodb; ALTER TABLE `nagios_host_contactgroups` TYPE = innodb; ALTER TABLE `nagios_host_contacts` TYPE = innodb; ALTER TABLE `nagios_host_parenthosts` TYPE = innodb; ALTER TABLE `nagios_hostchecks` TYPE = innodb; ALTER TABLE `nagios_hostdependencies` TYPE = innodb; ALTER TABLE `nagios_hostescalation_contactgroups` TYPE = innodb; ALTER TABLE `nagios_hostescalation_contacts` TYPE = innodb; ALTER TABLE `nagios_hostescalations` TYPE = innodb; ALTER TABLE `nagios_hostgroup_members` TYPE = innodb; ALTER TABLE `nagios_hostgroups` TYPE = innodb; ALTER TABLE `nagios_hosts` TYPE = innodb; ALTER TABLE `nagios_hoststatus` TYPE = innodb; ALTER TABLE `nagios_instances` TYPE = innodb; ALTER TABLE `nagios_logentries` TYPE = innodb; ALTER TABLE `nagios_notifications` TYPE = innodb; ALTER TABLE `nagios_objects` TYPE = innodb; ALTER TABLE `nagios_processevents` TYPE = innodb; ALTER TABLE `nagios_programstatus` TYPE = innodb; ALTER TABLE `nagios_runtimevariables` TYPE = innodb; ALTER TABLE `nagios_scheduleddowntime` TYPE = innodb; ALTER TABLE `nagios_service_contactgroups` TYPE = innodb; ALTER TABLE `nagios_service_contacts` TYPE = innodb; ALTER TABLE `nagios_servicechecks` TYPE = innodb; ALTER TABLE `nagios_servicedependencies` TYPE = innodb; ALTER TABLE `nagios_serviceescalation_contactgroups` TYPE = innodb; ALTER TABLE `nagios_serviceescalation_contacts` TYPE = innodb; ALTER TABLE `nagios_serviceescalations` TYPE = innodb; ALTER TABLE `nagios_servicegroup_members` TYPE = innodb; ALTER TABLE `nagios_servicegroups` TYPE = innodb; ALTER TABLE `nagios_services` TYPE = innodb; ALTER TABLE `nagios_servicestatus` TYPE = innodb; ALTER TABLE `nagios_statehistory` TYPE = innodb; ALTER TABLE `nagios_systemcommands` TYPE = innodb; ALTER TABLE `nagios_timedeventqueue` TYPE = innodb; ALTER TABLE `nagios_timedevents` TYPE = innodb; ALTER TABLE `nagios_timeperiod_timeranges` TYPE = innodb; ALTER TABLE `nagios_timeperiods` TYPE = innodb; ALTER TABLE `nagios_statehistory` ADD `last_state` SMALLINT DEFAULT '-1' NOT NULL AFTER `max_check_attempts` , ADD `last_hard_state` SMALLINT DEFAULT '-1' NOT NULL AFTER `last_state` ; -- END 1.4b5 MODS Index: upgradedb =================================================================== RCS file: /cvsroot/nagios/ndoutils/db/upgradedb,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** upgradedb 19 Jun 2007 23:20:34 -0000 1.4 --- upgradedb 29 Aug 2007 15:20:45 -0000 1.5 *************** *** 15,19 **** # GNU GPLv2 # ! # Last Updated: 02/18/2007 # --- 15,19 ---- # GNU GPLv2 # ! # Last Updated: 08/02/2007 # *************** *** 54,64 **** # Get current database version my $version; ! my $thisversion="1.4b4"; ! my $lastversion="1.4b4"; ! my $legacyversion="1.4b4"; $version = $dbh->selectrow_array("SELECT version FROM nagios_dbversion WHERE name='ndoutils'"); if ($version eq "") { ! # Assume last release print "*** Assuming version $legacyversion of nodutils installed",$/; $dbh->do("INSERT nagios_dbversion SET name='ndoutils', version='$legacyversion';"); --- 54,64 ---- # Get current database version my $version; ! my $thisversion="1.4b5"; ! my $lastversion="1.4b5"; ! my $legacyversion="1.4b5"; $version = $dbh->selectrow_array("SELECT version FROM nagios_dbversion WHERE name='ndoutils'"); if ($version eq "") { ! # Assume last legacy release (didn't have version table) print "*** Assuming version $legacyversion of nodutils installed",$/; $dbh->do("INSERT nagios_dbversion SET name='ndoutils', version='$legacyversion';"); --- NEW FILE: mysql-upgrade-1.4b3.sql --- -- BEGIN 1.4b5 MODS -- -- Table structure for table `nagios_host_contactgroups` -- CREATE TABLE IF NOT EXISTS `nagios_host_contactgroups` ( `host_contactgroup_id` int(11) NOT NULL auto_increment, `instance_id` smallint(6) NOT NULL default '0', `host_id` int(11) NOT NULL default '0', `contactgroup_object_id` int(11) NOT NULL default '0', PRIMARY KEY (`host_contactgroup_id`), UNIQUE KEY `instance_id` (`host_id`,`contactgroup_object_id`) ) ENGINE=MyISAM DEFAULT CHARSET=ascii COMMENT='Host contact groups'; -- -------------------------------------------------------- -- -- Table structure for table `nagios_hostescalation_contactgroups` -- CREATE TABLE IF NOT EXISTS `nagios_hostescalation_contactgroups` ( `hostescalation_contactgroup_id` int(11) NOT NULL auto_increment, `instance_id` smallint(6) NOT NULL default '0', `hostescalation_id` int(11) NOT NULL default '0', `contactgroup_object_id` int(11) NOT NULL default '0', PRIMARY KEY (`hostescalation_contactgroup_id`), UNIQUE KEY `instance_id` (`hostescalation_id`,`contactgroup_object_id`) ) ENGINE=MyISAM DEFAULT CHARSET=ascii COMMENT='Host escalation contact groups'; -- -------------------------------------------------------- -- -- Table structure for table `nagios_service_contactgroups` -- CREATE TABLE IF NOT EXISTS `nagios_service_contactgroups` ( `service_contactgroup_id` int(11) NOT NULL auto_increment, `instance_id` smallint(6) NOT NULL default '0', `service_id` int(11) NOT NULL default '0', `contactgroup_object_id` int(11) NOT NULL default '0', PRIMARY KEY (`service_contactgroup_id`), UNIQUE KEY `instance_id` (`service_id`,`contactgroup_object_id`) ) ENGINE=MyISAM DEFAULT CHARSET=ascii COMMENT='Service contact groups'; -- -------------------------------------------------------- -- -- Table structure for table `nagios_serviceescalation_contactgroups` -- CREATE TABLE IF NOT EXISTS `nagios_serviceescalation_contactgroups` ( `serviceescalation_contactgroup_id` int(11) NOT NULL auto_increment, `instance_id` smallint(6) NOT NULL default '0', `serviceescalation_id` int(11) NOT NULL default '0', `contactgroup_object_id` int(11) NOT NULL default '0', PRIMARY KEY (`serviceescalation_contactgroup_id`), UNIQUE KEY `instance_id` (`serviceescalation_id`,`contactgroup_object_id`) ) ENGINE=MyISAM DEFAULT CHARSET=ascii COMMENT='Service escalation contact groups'; -- -------------------------------------------------------- ALTER TABLE `nagios_acknowledgements` TYPE = innodb; ALTER TABLE `nagios_commands` TYPE = innodb; ALTER TABLE `nagios_commenthistory` TYPE = innodb; ALTER TABLE `nagios_comments` TYPE = innodb; ALTER TABLE `nagios_configfiles` TYPE = innodb; ALTER TABLE `nagios_configfilevariables` TYPE = innodb; ALTER TABLE `nagios_conninfo` TYPE = innodb; ALTER TABLE `nagios_contact_addresses` TYPE = innodb; ALTER TABLE `nagios_contact_notificationcommands` TYPE = innodb; ALTER TABLE `nagios_contactgroup_members` TYPE = innodb; ALTER TABLE `nagios_contactgroups` TYPE = innodb; ALTER TABLE `nagios_contactnotificationmethods` TYPE = innodb; ALTER TABLE `nagios_contactnotifications` TYPE = innodb; ALTER TABLE `nagios_contacts` TYPE = innodb; ALTER TABLE `nagios_contactstatus` TYPE = innodb; ALTER TABLE `nagios_customvariables` TYPE = innodb; ALTER TABLE `nagios_customvariablestatus` TYPE = innodb; ALTER TABLE `nagios_dbversion` TYPE = innodb; ALTER TABLE `nagios_downtimehistory` TYPE = innodb; ALTER TABLE `nagios_eventhandlers` TYPE = innodb; ALTER TABLE `nagios_externalcommands` TYPE = innodb; ALTER TABLE `nagios_flappinghistory` TYPE = innodb; ALTER TABLE `nagios_host_contactgroups` TYPE = innodb; ALTER TABLE `nagios_host_contacts` TYPE = innodb; ALTER TABLE `nagios_host_parenthosts` TYPE = innodb; ALTER TABLE `nagios_hostchecks` TYPE = innodb; ALTER TABLE `nagios_hostdependencies` TYPE = innodb; ALTER TABLE `nagios_hostescalation_contactgroups` TYPE = innodb; ALTER TABLE `nagios_hostescalation_contacts` TYPE = innodb; ALTER TABLE `nagios_hostescalations` TYPE = innodb; ALTER TABLE `nagios_hostgroup_members` TYPE = innodb; ALTER TABLE `nagios_hostgroups` TYPE = innodb; ALTER TABLE `nagios_hosts` TYPE = innodb; ALTER TABLE `nagios_hoststatus` TYPE = innodb; ALTER TABLE `nagios_instances` TYPE = innodb; ALTER TABLE `nagios_logentries` TYPE = innodb; ALTER TABLE `nagios_notifications` TYPE = innodb; ALTER TABLE `nagios_objects` TYPE = innodb; ALTER TABLE `nagios_processevents` TYPE = innodb; ALTER TABLE `nagios_programstatus` TYPE = innodb; ALTER TABLE `nagios_runtimevariables` TYPE = innodb; ALTER TABLE `nagios_scheduleddowntime` TYPE = innodb; ALTER TABLE `nagios_service_contactgroups` TYPE = innodb; ALTER TABLE `nagios_service_contacts` TYPE = innodb; ALTER TABLE `nagios_servicechecks` TYPE = innodb; ALTER TABLE `nagios_servicedependencies` TYPE = innodb; ALTER TABLE `nagios_serviceescalation_contactgroups` TYPE = innodb; ALTER TABLE `nagios_serviceescalation_contacts` TYPE = innodb; ALTER TABLE `nagios_serviceescalations` TYPE = innodb; ALTER TABLE `nagios_servicegroup_members` TYPE = innodb; ALTER TABLE `nagios_servicegroups` TYPE = innodb; ALTER TABLE `nagios_services` TYPE = innodb; ALTER TABLE `nagios_servicestatus` TYPE = innodb; ALTER TABLE `nagios_statehistory` TYPE = innodb; ALTER TABLE `nagios_systemcommands` TYPE = innodb; ALTER TABLE `nagios_timedeventqueue` TYPE = innodb; ALTER TABLE `nagios_timedevents` TYPE = innodb; ALTER TABLE `nagios_timeperiod_timeranges` TYPE = innodb; ALTER TABLE `nagios_timeperiods` TYPE = innodb; ALTER TABLE `nagios_statehistory` ADD `last_state` SMALLINT DEFAULT '-1' NOT NULL AFTER `max_check_attempts` , ADD `last_hard_state` SMALLINT DEFAULT '-1' NOT NULL AFTER `last_state` ; -- END 1.4b5 MODS Index: mysql-upgrade-1.4b2.sql =================================================================== RCS file: /cvsroot/nagios/ndoutils/db/mysql-upgrade-1.4b2.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mysql-upgrade-1.4b2.sql 18 Feb 2007 20:18:55 -0000 1.1 --- mysql-upgrade-1.4b2.sql 29 Aug 2007 15:20:43 -0000 1.2 *************** *** 1,2 **** --- 1,129 ---- ALTER TABLE `nagios_hosts` ADD `alias` VARCHAR( 64 ) NOT NULL AFTER `host_object_id` ; + + -- BEGIN 1.4b5 MODS + + -- + -- Table structure for table `nagios_host_contactgroups` + -- + + CREATE TABLE IF NOT EXISTS `nagios_host_contactgroups` ( + `host_contactgroup_id` int(11) NOT NULL auto_increment, + `instance_id` smallint(6) NOT NULL default '0', + `host_id` int(11) NOT NULL default '0', + `contactgroup_object_id` int(11) NOT NULL default '0', + PRIMARY KEY (`host_contactgroup_id`), + UNIQUE KEY `instance_id` (`host_id`,`contactgroup_object_id`) + ) ENGINE=MyISAM DEFAULT CHARSET=ascii COMMENT='Host contact groups'; + + -- -------------------------------------------------------- + + -- + -- Table structure for table `nagios_hostescalation_contactgroups` + -- + + CREATE TABLE IF NOT EXISTS `nagios_hostescalation_contactgroups` ( + `hostescalation_contactgroup_id` int(11) NOT NULL auto_increment, + `instance_id` smallint(6) NOT NULL default '0', + `hostescalation_id` int(11) NOT NULL default '0', + `contactgroup_object_id` int(11) NOT NULL default '0', + PRIMARY KEY (`hostescalation_contactgroup_id`), + UNIQUE KEY `instance_id` (`hostescalation_id`,`contactgroup_object_id`) + ) ENGINE=MyISAM DEFAULT CHARSET=ascii COMMENT='Host escalation contact groups'; + + -- -------------------------------------------------------- + + -- + -- Table structure for table `nagios_service_contactgroups` + -- + + CREATE TABLE IF NOT EXISTS `nagios_service_contactgroups` ( + `service_contactgroup_id` int(11) NOT NULL auto_increment, + `instance_id` smallint(6) NOT NULL default '0', + `service_id` int(11) NOT NULL default '0', + `contactgroup_object_id` int(11) NOT NULL default '0', + PRIMARY KEY (`service_contactgroup_id`), + UNIQUE KEY `instance_id` (`service_id`,`contactgroup_object_id`) + ) ENGINE=MyISAM DEFAULT CHARSET=ascii COMMENT='Service contact groups'; + + -- -------------------------------------------------------- + + -- + -- Table structure for table `nagios_serviceescalation_contactgroups` + -- + + CREATE TABLE IF NOT EXISTS `nagios_serviceescalation_contactgroups` ( + `serviceescalation_contactgroup_id` int(11) NOT NULL auto_increment, + `instance_id` smallint(6) NOT NULL default '0', + `serviceescalation_id` int(11) NOT NULL default '0', + `contactgroup_object_id` int(11) NOT NULL default '0', + PRIMARY KEY (`serviceescalation_contactgroup_id`), + UNIQUE KEY `instance_id` (`serviceescalation_id`,`contactgroup_object_id`) + ) ENGINE=MyISAM DEFAULT CHARSET=ascii COMMENT='Service escalation contact groups'; + + -- -------------------------------------------------------- + + ALTER TABLE `nagios_acknowledgements` TYPE = innodb; + ALTER TABLE `nagios_commands` TYPE = innodb; + ALTER TABLE `nagios_commenthistory` TYPE = innodb; + ALTER TABLE `nagios_comments` TYPE = innodb; + ALTER TABLE `nagios_configfiles` TYPE = innodb; + ALTER TABLE `nagios_configfilevariables` TYPE = innodb; + ALTER TABLE `nagios_conninfo` TYPE = innodb; + ALTER TABLE `nagios_contact_addresses` TYPE = innodb; + ALTER TABLE `nagios_contact_notificationcommands` TYPE = innodb; + ALTER TABLE `nagios_contactgroup_members` TYPE = innodb; + ALTER TABLE `nagios_contactgroups` TYPE = innodb; + ALTER TABLE `nagios_contactnotificationmethods` TYPE = innodb; + ALTER TABLE `nagios_contactnotifications` TYPE = innodb; + ALTER TABLE `nagios_contacts` TYPE = innodb; + ALTER TABLE `nagios_contactstatus` TYPE = innodb; + ALTER TABLE `nagios_customvariables` TYPE = innodb; + ALTER TABLE `nagios_customvariablestatus` TYPE = innodb; + ALTER TABLE `nagios_dbversion` TYPE = innodb; + ALTER TABLE `nagios_downtimehistory` TYPE = innodb; + ALTER TABLE `nagios_eventhandlers` TYPE = innodb; + ALTER TABLE `nagios_externalcommands` TYPE = innodb; + ALTER TABLE `nagios_flappinghistory` TYPE = innodb; + ALTER TABLE `nagios_host_contactgroups` TYPE = innodb; + ALTER TABLE `nagios_host_contacts` TYPE = innodb; + ALTER TABLE `nagios_host_parenthosts` TYPE = innodb; + ALTER TABLE `nagios_hostchecks` TYPE = innodb; + ALTER TABLE `nagios_hostdependencies` TYPE = innodb; + ALTER TABLE `nagios_hostescalation_contactgroups` TYPE = innodb; + ALTER TABLE `nagios_hostescalation_contacts` TYPE = innodb; + ALTER TABLE `nagios_hostescalations` TYPE = innodb; + ALTER TABLE `nagios_hostgroup_members` TYPE = innodb; + ALTER TABLE `nagios_hostgroups` TYPE = innodb; + ALTER TABLE `nagios_hosts` TYPE = innodb; + ALTER TABLE `nagios_hoststatus` TYPE = innodb; + ALTER TABLE `nagios_instances` TYPE = innodb; + ALTER TABLE `nagios_logentries` TYPE = innodb; + ALTER TABLE `nagios_notifications` TYPE = innodb; + ALTER TABLE `nagios_objects` TYPE = innodb; + ALTER TABLE `nagios_processevents` TYPE = innodb; + ALTER TABLE `nagios_programstatus` TYPE = innodb; + ALTER TABLE `nagios_runtimevariables` TYPE = innodb; + ALTER TABLE `nagios_scheduleddowntime` TYPE = innodb; + ALTER TABLE `nagios_service_contactgroups` TYPE = innodb; + ALTER TABLE `nagios_service_contacts` TYPE = innodb; + ALTER TABLE `nagios_servicechecks` TYPE = innodb; + ALTER TABLE `nagios_servicedependencies` TYPE = innodb; + ALTER TABLE `nagios_serviceescalation_contactgroups` TYPE = innodb; + ALTER TABLE `nagios_serviceescalation_contacts` TYPE = innodb; + ALTER TABLE `nagios_serviceescalations` TYPE = innodb; + ALTER TABLE `nagios_servicegroup_members` TYPE = innodb; + ALTER TABLE `nagios_servicegroups` TYPE = innodb; + ALTER TABLE `nagios_services` TYPE = innodb; + ALTER TABLE `nagios_servicestatus` TYP... [truncated message content] |