Modified: trunk/opsview-core/t/78configdumpend.t
===================================================================
--- trunk/opsview-core/t/78configdumpend.t 2012-08-15 22:11:28 UTC (rev 9852)
+++ trunk/opsview-core/t/78configdumpend.t 2012-08-15 22:23:41 UTC (rev 9853)
@@ -18,7 +18,7 @@
ok( defined $dbh, "Connect to db" );
my @tables =
- qw(opsview_contacts opsview_contact_services opsview_host_services opsview_hostgroups opsview_hostgroup_hosts opsview_monitoringclusters
+ qw(opsview_contacts opsview_contact_services opsview_host_services opsview_hostgroups opsview_hostgroup_hosts opsview_monitoringservers
opsview_monitoringclusternodes opsview_hosts opsview_viewports opsview_performance_metrics opsview_host_objects opsview_servicechecks opsview_servicegroups);
my $mysqldump =
Modified: trunk/opsview-core/t/var/configdumpend.expected
===================================================================
--- trunk/opsview-core/t/var/configdumpend.expected 2012-08-15 22:11:28 UTC (rev 9852)
+++ trunk/opsview-core/t/var/configdumpend.expected 2012-08-15 22:23:41 UTC (rev 9853)
@@ -177,23 +177,24 @@
INSERT INTO `opsview_hostgroup_hosts` VALUES (6,138);
/*!40000 ALTER TABLE `opsview_hostgroup_hosts` ENABLE KEYS */;
UNLOCK TABLES;
-DROP TABLE IF EXISTS `opsview_monitoringclusters`;
-CREATE TABLE `opsview_monitoringclusters` (
+DROP TABLE IF EXISTS `opsview_monitoringservers`;
+CREATE TABLE `opsview_monitoringservers` (
`id` int(11) NOT NULL default '0',
`name` varchar(64) NOT NULL default '',
- `hostname` varchar(64) default NULL,
- `ip` varchar(255) default NULL,
+ `activated` tinyint(1) NOT NULL default '1',
+ `passive` tinyint(1) NOT NULL default '0',
+ `nodes` text NOT NULL,
PRIMARY KEY (`id`)
-) TYPE=InnoDB;
+) TYPE=InnoDB COMMENT='Runtime list of monitoring servers';
-LOCK TABLES `opsview_monitoringclusters` WRITE;
-/*!40000 ALTER TABLE `opsview_monitoringclusters` DISABLE KEYS */;
-INSERT INTO `opsview_monitoringclusters` VALUES (1,'Master Monitoring Server','opsview','opsviewdev46');
-INSERT INTO `opsview_monitoringclusters` VALUES (2,'ClusterA',NULL,NULL);
-INSERT INTO `opsview_monitoringclusters` VALUES (3,'Cluster',NULL,NULL);
-INSERT INTO `opsview_monitoringclusters` VALUES (4,'PassiveSlave',NULL,NULL);
-INSERT INTO `opsview_monitoringclusters` VALUES (5,'Deactivated',NULL,NULL);
-/*!40000 ALTER TABLE `opsview_monitoringclusters` ENABLE KEYS */;
+LOCK TABLES `opsview_monitoringservers` WRITE;
+/*!40000 ALTER TABLE `opsview_monitoringservers` DISABLE KEYS */;
+INSERT INTO `opsview_monitoringservers` VALUES (1,'Master Monitoring Server',1,0,'opsview');
+INSERT INTO `opsview_monitoringservers` VALUES (2,'ClusterA',1,0,'');
+INSERT INTO `opsview_monitoringservers` VALUES (3,'Cluster',1,0,'');
+INSERT INTO `opsview_monitoringservers` VALUES (4,'PassiveSlave',1,1,'');
+INSERT INTO `opsview_monitoringservers` VALUES (5,'Deactivated',0,0,'');
+/*!40000 ALTER TABLE `opsview_monitoringservers` ENABLE KEYS */;
UNLOCK TABLES;
DROP TABLE IF EXISTS `opsview_monitoringclusternodes`;
CREATE TABLE `opsview_monitoringclusternodes` (
@@ -201,7 +202,7 @@
`name` varchar(64) NOT NULL default '',
`ip` varchar(255) NOT NULL default '',
PRIMARY KEY (`id`)
-) TYPE=InnoDB;
+) TYPE=InnoDB COMMENT='Runtime list of monitoring cluster nodes';
LOCK TABLES `opsview_monitoringclusternodes` WRITE;
/*!40000 ALTER TABLE `opsview_monitoringclusternodes` DISABLE KEYS */;
