Sophie

Sophie

distrib > * > 2008.0 > x86_64 > by-pkgid > e8cfcc056dc78dfcc0ea13e783b7bc22 > files > 2

ndoutils-1.4-0.b7.5mdv2008.0.src.rpm

diff -Naur --exclude '*~' ndoutils-1.4b7/db/mysql.sql ndoutils-1.4b7-no-database-prefix/db/mysql.sql
--- ndoutils-1.4b7/db/mysql.sql	2007-08-29 17:20:44.000000000 +0200
+++ ndoutils-1.4b7-no-database-prefix/db/mysql.sql	2007-12-19 13:58:02.000000000 +0100
@@ -13,10 +13,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_acknowledgements`
+-- Table structure for table `acknowledgements`
 -- 
 
-CREATE TABLE `nagios_acknowledgements` (
+CREATE TABLE `acknowledgements` (
   `acknowledgement_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `entry_time` datetime NOT NULL default '0000-00-00 00:00:00',
@@ -35,10 +35,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_commands`
+-- Table structure for table `commands`
 -- 
 
-CREATE TABLE `nagios_commands` (
+CREATE TABLE `commands` (
   `command_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `config_type` smallint(6) NOT NULL default '0',
@@ -51,10 +51,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_commenthistory`
+-- Table structure for table `commenthistory`
 -- 
 
-CREATE TABLE `nagios_commenthistory` (
+CREATE TABLE `commenthistory` (
   `commenthistory_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `entry_time` datetime NOT NULL default '0000-00-00 00:00:00',
@@ -79,10 +79,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_comments`
+-- Table structure for table `comments`
 -- 
 
-CREATE TABLE `nagios_comments` (
+CREATE TABLE `comments` (
   `comment_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `entry_time` datetime NOT NULL default '0000-00-00 00:00:00',
@@ -105,10 +105,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_configfiles`
+-- Table structure for table `configfiles`
 -- 
 
-CREATE TABLE `nagios_configfiles` (
+CREATE TABLE `configfiles` (
   `configfile_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `configfile_type` smallint(6) NOT NULL default '0',
@@ -120,10 +120,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_configfilevariables`
+-- Table structure for table `configfilevariables`
 -- 
 
-CREATE TABLE `nagios_configfilevariables` (
+CREATE TABLE `configfilevariables` (
   `configfilevariable_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `configfile_id` int(11) NOT NULL default '0',
@@ -136,10 +136,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_conninfo`
+-- Table structure for table `conninfo`
 -- 
 
-CREATE TABLE `nagios_conninfo` (
+CREATE TABLE `conninfo` (
   `conninfo_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `agent_name` varchar(32) NOT NULL default '',
@@ -161,10 +161,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_contact_addresses`
+-- Table structure for table `contact_addresses`
 -- 
 
-CREATE TABLE `nagios_contact_addresses` (
+CREATE TABLE `contact_addresses` (
   `contact_address_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `contact_id` int(11) NOT NULL default '0',
@@ -177,10 +177,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_contact_notificationcommands`
+-- Table structure for table `contact_notificationcommands`
 -- 
 
-CREATE TABLE `nagios_contact_notificationcommands` (
+CREATE TABLE `contact_notificationcommands` (
   `contact_notificationcommand_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `contact_id` int(11) NOT NULL default '0',
@@ -194,10 +194,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_contactgroup_members`
+-- Table structure for table `contactgroup_members`
 -- 
 
-CREATE TABLE `nagios_contactgroup_members` (
+CREATE TABLE `contactgroup_members` (
   `contactgroup_member_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `contactgroup_id` int(11) NOT NULL default '0',
@@ -209,10 +209,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_contactgroups`
+-- Table structure for table `contactgroups`
 -- 
 
-CREATE TABLE `nagios_contactgroups` (
+CREATE TABLE `contactgroups` (
   `contactgroup_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `config_type` smallint(6) NOT NULL default '0',
@@ -225,10 +225,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_contactnotificationmethods`
+-- Table structure for table `contactnotificationmethods`
 -- 
 
-CREATE TABLE `nagios_contactnotificationmethods` (
+CREATE TABLE `contactnotificationmethods` (
   `contactnotificationmethod_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `contactnotification_id` int(11) NOT NULL default '0',
@@ -245,10 +245,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_contactnotifications`
+-- Table structure for table `contactnotifications`
 -- 
 
-CREATE TABLE `nagios_contactnotifications` (
+CREATE TABLE `contactnotifications` (
   `contactnotification_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `notification_id` int(11) NOT NULL default '0',
@@ -264,10 +264,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_contacts`
+-- Table structure for table `contacts`
 -- 
 
-CREATE TABLE `nagios_contacts` (
+CREATE TABLE `contacts` (
   `contact_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `config_type` smallint(6) NOT NULL default '0',
@@ -298,10 +298,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_contactstatus`
+-- Table structure for table `contactstatus`
 -- 
 
-CREATE TABLE `nagios_contactstatus` (
+CREATE TABLE `contactstatus` (
   `contactstatus_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `contact_object_id` int(11) NOT NULL default '0',
@@ -320,10 +320,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_customvariables`
+-- Table structure for table `customvariables`
 -- 
 
-CREATE TABLE `nagios_customvariables` (
+CREATE TABLE `customvariables` (
   `customvariable_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `object_id` int(11) NOT NULL default '0',
@@ -339,10 +339,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_customvariablestatus`
+-- Table structure for table `customvariablestatus`
 -- 
 
-CREATE TABLE `nagios_customvariablestatus` (
+CREATE TABLE `customvariablestatus` (
   `customvariablestatus_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `object_id` int(11) NOT NULL default '0',
@@ -358,10 +358,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_dbversion`
+-- Table structure for table `dbversion`
 -- 
 
-CREATE TABLE `nagios_dbversion` (
+CREATE TABLE `dbversion` (
   `name` varchar(10) NOT NULL default '',
   `version` varchar(10) NOT NULL default ''
 ) ENGINE=InnoDB;
@@ -369,10 +369,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_downtimehistory`
+-- Table structure for table `downtimehistory`
 -- 
 
-CREATE TABLE `nagios_downtimehistory` (
+CREATE TABLE `downtimehistory` (
   `downtimehistory_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `downtime_type` smallint(6) NOT NULL default '0',
@@ -399,10 +399,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_eventhandlers`
+-- Table structure for table `eventhandlers`
 -- 
 
-CREATE TABLE `nagios_eventhandlers` (
+CREATE TABLE `eventhandlers` (
   `eventhandler_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `eventhandler_type` smallint(6) NOT NULL default '0',
@@ -428,10 +428,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_externalcommands`
+-- Table structure for table `externalcommands`
 -- 
 
-CREATE TABLE `nagios_externalcommands` (
+CREATE TABLE `externalcommands` (
   `externalcommand_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `entry_time` datetime NOT NULL default '0000-00-00 00:00:00',
@@ -444,10 +444,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_flappinghistory`
+-- Table structure for table `flappinghistory`
 -- 
 
-CREATE TABLE `nagios_flappinghistory` (
+CREATE TABLE `flappinghistory` (
   `flappinghistory_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `event_time` datetime NOT NULL default '0000-00-00 00:00:00',
@@ -467,10 +467,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_host_contactgroups`
+-- Table structure for table `host_contactgroups`
 -- 
 
-CREATE TABLE `nagios_host_contactgroups` (
+CREATE TABLE `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',
@@ -482,10 +482,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_host_contacts`
+-- Table structure for table `host_contacts`
 -- 
 
-CREATE TABLE `nagios_host_contacts` (
+CREATE TABLE `host_contacts` (
   `host_contact_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `host_id` int(11) NOT NULL default '0',
@@ -497,10 +497,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_host_parenthosts`
+-- Table structure for table `host_parenthosts`
 -- 
 
-CREATE TABLE `nagios_host_parenthosts` (
+CREATE TABLE `host_parenthosts` (
   `host_parenthost_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `host_id` int(11) NOT NULL default '0',
@@ -512,10 +512,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_hostchecks`
+-- Table structure for table `hostchecks`
 -- 
 
-CREATE TABLE `nagios_hostchecks` (
+CREATE TABLE `hostchecks` (
   `hostcheck_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `host_object_id` int(11) NOT NULL default '0',
@@ -546,10 +546,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_hostdependencies`
+-- Table structure for table `hostdependencies`
 -- 
 
-CREATE TABLE `nagios_hostdependencies` (
+CREATE TABLE `hostdependencies` (
   `hostdependency_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `config_type` smallint(6) NOT NULL default '0',
@@ -568,10 +568,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_hostescalation_contactgroups`
+-- Table structure for table `hostescalation_contactgroups`
 -- 
 
-CREATE TABLE `nagios_hostescalation_contactgroups` (
+CREATE TABLE `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',
@@ -583,10 +583,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_hostescalation_contacts`
+-- Table structure for table `hostescalation_contacts`
 -- 
 
-CREATE TABLE `nagios_hostescalation_contacts` (
+CREATE TABLE `hostescalation_contacts` (
   `hostescalation_contact_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `hostescalation_id` int(11) NOT NULL default '0',
@@ -598,10 +598,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_hostescalations`
+-- Table structure for table `hostescalations`
 -- 
 
-CREATE TABLE `nagios_hostescalations` (
+CREATE TABLE `hostescalations` (
   `hostescalation_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `config_type` smallint(6) NOT NULL default '0',
@@ -620,10 +620,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_hostgroup_members`
+-- Table structure for table `hostgroup_members`
 -- 
 
-CREATE TABLE `nagios_hostgroup_members` (
+CREATE TABLE `hostgroup_members` (
   `hostgroup_member_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `hostgroup_id` int(11) NOT NULL default '0',
@@ -635,10 +635,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_hostgroups`
+-- Table structure for table `hostgroups`
 -- 
 
-CREATE TABLE `nagios_hostgroups` (
+CREATE TABLE `hostgroups` (
   `hostgroup_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `config_type` smallint(6) NOT NULL default '0',
@@ -651,10 +651,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_hosts`
+-- Table structure for table `hosts`
 -- 
 
-CREATE TABLE `nagios_hosts` (
+CREATE TABLE `hosts` (
   `host_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `config_type` smallint(6) NOT NULL default '0',
@@ -720,10 +720,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_hoststatus`
+-- Table structure for table `hoststatus`
 -- 
 
-CREATE TABLE `nagios_hoststatus` (
+CREATE TABLE `hoststatus` (
   `hoststatus_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `host_object_id` int(11) NOT NULL default '0',
@@ -777,10 +777,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_instances`
+-- Table structure for table `instances`
 -- 
 
-CREATE TABLE `nagios_instances` (
+CREATE TABLE `instances` (
   `instance_id` smallint(6) NOT NULL auto_increment,
   `instance_name` varchar(64) NOT NULL default '',
   `instance_description` varchar(128) NOT NULL default '',
@@ -790,10 +790,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_logentries`
+-- Table structure for table `logentries`
 -- 
 
-CREATE TABLE `nagios_logentries` (
+CREATE TABLE `logentries` (
   `logentry_id` int(11) NOT NULL auto_increment,
   `instance_id` int(11) NOT NULL default '0',
   `logentry_time` datetime NOT NULL default '0000-00-00 00:00:00',
@@ -809,10 +809,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_notifications`
+-- Table structure for table `notifications`
 -- 
 
-CREATE TABLE `nagios_notifications` (
+CREATE TABLE `notifications` (
   `notification_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `notification_type` smallint(6) NOT NULL default '0',
@@ -833,10 +833,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_objects`
+-- Table structure for table `objects`
 -- 
 
-CREATE TABLE `nagios_objects` (
+CREATE TABLE `objects` (
   `object_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `objecttype_id` smallint(6) NOT NULL default '0',
@@ -850,10 +850,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_processevents`
+-- Table structure for table `processevents`
 -- 
 
-CREATE TABLE `nagios_processevents` (
+CREATE TABLE `processevents` (
   `processevent_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `event_type` smallint(6) NOT NULL default '0',
@@ -869,10 +869,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_programstatus`
+-- Table structure for table `programstatus`
 -- 
 
-CREATE TABLE `nagios_programstatus` (
+CREATE TABLE `programstatus` (
   `programstatus_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `status_update_time` datetime NOT NULL default '0000-00-00 00:00:00',
@@ -905,10 +905,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_runtimevariables`
+-- Table structure for table `runtimevariables`
 -- 
 
-CREATE TABLE `nagios_runtimevariables` (
+CREATE TABLE `runtimevariables` (
   `runtimevariable_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `varname` varchar(64) NOT NULL default '',
@@ -920,10 +920,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_scheduleddowntime`
+-- Table structure for table `scheduleddowntime`
 -- 
 
-CREATE TABLE `nagios_scheduleddowntime` (
+CREATE TABLE `scheduleddowntime` (
   `scheduleddowntime_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `downtime_type` smallint(6) NOT NULL default '0',
@@ -947,10 +947,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_service_contactgroups`
+-- Table structure for table `service_contactgroups`
 -- 
 
-CREATE TABLE `nagios_service_contactgroups` (
+CREATE TABLE `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',
@@ -962,10 +962,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_service_contacts`
+-- Table structure for table `service_contacts`
 -- 
 
-CREATE TABLE `nagios_service_contacts` (
+CREATE TABLE `service_contacts` (
   `service_contact_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `service_id` int(11) NOT NULL default '0',
@@ -977,10 +977,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_servicechecks`
+-- Table structure for table `servicechecks`
 -- 
 
-CREATE TABLE `nagios_servicechecks` (
+CREATE TABLE `servicechecks` (
   `servicecheck_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `service_object_id` int(11) NOT NULL default '0',
@@ -1010,10 +1010,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_servicedependencies`
+-- Table structure for table `servicedependencies`
 -- 
 
-CREATE TABLE `nagios_servicedependencies` (
+CREATE TABLE `servicedependencies` (
   `servicedependency_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `config_type` smallint(6) NOT NULL default '0',
@@ -1033,10 +1033,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_serviceescalation_contactgroups`
+-- Table structure for table `serviceescalation_contactgroups`
 -- 
 
-CREATE TABLE `nagios_serviceescalation_contactgroups` (
+CREATE TABLE `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',
@@ -1048,10 +1048,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_serviceescalation_contacts`
+-- Table structure for table `serviceescalation_contacts`
 -- 
 
-CREATE TABLE `nagios_serviceescalation_contacts` (
+CREATE TABLE `serviceescalation_contacts` (
   `serviceescalation_contact_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `serviceescalation_id` int(11) NOT NULL default '0',
@@ -1063,10 +1063,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_serviceescalations`
+-- Table structure for table `serviceescalations`
 -- 
 
-CREATE TABLE `nagios_serviceescalations` (
+CREATE TABLE `serviceescalations` (
   `serviceescalation_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `config_type` smallint(6) NOT NULL default '0',
@@ -1086,10 +1086,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_servicegroup_members`
+-- Table structure for table `servicegroup_members`
 -- 
 
-CREATE TABLE `nagios_servicegroup_members` (
+CREATE TABLE `servicegroup_members` (
   `servicegroup_member_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `servicegroup_id` int(11) NOT NULL default '0',
@@ -1101,10 +1101,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_servicegroups`
+-- Table structure for table `servicegroups`
 -- 
 
-CREATE TABLE `nagios_servicegroups` (
+CREATE TABLE `servicegroups` (
   `servicegroup_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `config_type` smallint(6) NOT NULL default '0',
@@ -1117,10 +1117,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_services`
+-- Table structure for table `services`
 -- 
 
-CREATE TABLE `nagios_services` (
+CREATE TABLE `services` (
   `service_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `config_type` smallint(6) NOT NULL default '0',
@@ -1180,10 +1180,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_servicestatus`
+-- Table structure for table `servicestatus`
 -- 
 
-CREATE TABLE `nagios_servicestatus` (
+CREATE TABLE `servicestatus` (
   `servicestatus_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `service_object_id` int(11) NOT NULL default '0',
@@ -1238,10 +1238,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_statehistory`
+-- Table structure for table `statehistory`
 -- 
 
-CREATE TABLE `nagios_statehistory` (
+CREATE TABLE `statehistory` (
   `statehistory_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `state_time` datetime NOT NULL default '0000-00-00 00:00:00',
@@ -1261,10 +1261,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_systemcommands`
+-- Table structure for table `systemcommands`
 -- 
 
-CREATE TABLE `nagios_systemcommands` (
+CREATE TABLE `systemcommands` (
   `systemcommand_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `start_time` datetime NOT NULL default '0000-00-00 00:00:00',
@@ -1284,10 +1284,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_timedeventqueue`
+-- Table structure for table `timedeventqueue`
 -- 
 
-CREATE TABLE `nagios_timedeventqueue` (
+CREATE TABLE `timedeventqueue` (
   `timedeventqueue_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `event_type` smallint(6) NOT NULL default '0',
@@ -1302,10 +1302,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_timedevents`
+-- Table structure for table `timedevents`
 -- 
 
-CREATE TABLE `nagios_timedevents` (
+CREATE TABLE `timedevents` (
   `timedevent_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `event_type` smallint(6) NOT NULL default '0',
@@ -1325,10 +1325,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_timeperiod_timeranges`
+-- Table structure for table `timeperiod_timeranges`
 -- 
 
-CREATE TABLE `nagios_timeperiod_timeranges` (
+CREATE TABLE `timeperiod_timeranges` (
   `timeperiod_timerange_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `timeperiod_id` int(11) NOT NULL default '0',
@@ -1342,10 +1342,10 @@
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `nagios_timeperiods`
+-- Table structure for table `timeperiods`
 -- 
 
-CREATE TABLE `nagios_timeperiods` (
+CREATE TABLE `timeperiods` (
   `timeperiod_id` int(11) NOT NULL auto_increment,
   `instance_id` smallint(6) NOT NULL default '0',
   `config_type` smallint(6) NOT NULL default '0',