Modified: trunk/opsview-core/t/var/opsview.test.db
===================================================================
--- trunk/opsview-core/t/var/opsview.test.db 2013-02-28 13:31:18 UTC (rev 11620)
+++ trunk/opsview-core/t/var/opsview.test.db 2013-02-28 13:34:50 UTC (rev 11621)
@@ -650,30 +650,30 @@
LOCK TABLES `hosts` WRITE;
/*!40000 ALTER TABLE `hosts` DISABLE KEYS */;
-INSERT INTO `hosts` VALUES (1,'opsview','opsviewdev46','Opsview Master Server',60,2,1,'0','1','2','LOGO - Opsview',0,'','u,d,r',1,1,NULL,NULL,1,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,0,'');
-INSERT INTO `hosts` VALUES (2,'opsviewdev1','opsviewdev1.der.altinity','',60,2,1,'0','1','2','SYMBOL - Wireless network',1,'','u,d,r',1,1,NULL,NULL,1,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',1,0,0,0,0,'');
-INSERT INTO `hosts` VALUES (3,'host_locally_monitored','hostname1','',60,4,2,'3','2','3','SYMBOL - Router',1,'public','u,d,r',1,NULL,NULL,NULL,1,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,0,'');
-INSERT INTO `hosts` VALUES (4,'monitored_by_slave','monitored_by_slave','Host to be monitored by slave',60,5,3,'5','4','5','SYMBOL - Wireless network',1,'slave','u,d,r',1,7,NULL,NULL,2,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,1,'server',1,0,0,0,0,'');
-INSERT INTO `hosts` VALUES (5,'opslave','opslave','Slave',60,2,1,'0','1','2','LOGO - Opsview',0,'','u,d,r',1,3,NULL,NULL,2,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,0,'');
-INSERT INTO `hosts` VALUES (6,'resolved_services','resolved_services','Host with services based on templates, exceptions and timed exceptions',60,5,1,'0','1','2','SYMBOL - Switch',0,'','u,d,r',1,7,NULL,NULL,1,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,0,'');
-INSERT INTO `hosts` VALUES (7,'cisco','192.168.10.20','',0,4,1,'0','1','2','SYMBOL - Environment Monitor',0,'shouldnotcreate','u,d,r',1,1,NULL,NULL,1,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,0,'');
-INSERT INTO `hosts` VALUES (8,'cisco1','192.168.10.23','',60,4,1,'0','1','2','SYMBOL - *DSL',0,'','u,d,r',1,1,NULL,NULL,1,0,'10.20.20.20,docs.opsview.org,nonexistant','2c',161,'',NULL,'',NULL,'',1,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,0,'');
-INSERT INTO `hosts` VALUES (9,'cisco2','192.168.10.22','',60,4,1,'0','1','2','SYMBOL - Firewall',0,'','u,d,r',1,1,NULL,NULL,5,0,'','2c',161,'',NULL,'',NULL,'',1,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,0,'');
-INSERT INTO `hosts` VALUES (10,'cisco3','192.168.10.22','',60,4,1,'0','1','2','LOGO - NetBSD',0,'','',1,1,NULL,NULL,2,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,0,'');
-INSERT INTO `hosts` VALUES (11,'cisco4','not_a_real_host','',60,4,1,'0','1','2','SYMBOL - Network',1,'public','u,d,r',1,1,NULL,NULL,1,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,1,'switch',0,0,0,0,0,'');
-INSERT INTO `hosts` VALUES (12,'toclone','toclone','Host to clone, testing API',60,5,1,'0','1','2','SYMBOL - Proxy',1,'$tr!ng@','u,d',3,4,NULL,NULL,1,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,0,'');
-INSERT INTO `hosts` VALUES (13,'host_locally_monitored_v3','hostname1','',60,4,1,'0','1','2','SYMBOL - Application',1,'','u,d,r',1,NULL,NULL,NULL,1,0,'','3',161,'u$ernam3','md5','p3ssw0rdmd5','aes128','aes128aes128',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,0,'');
-INSERT INTO `hosts` VALUES (14,'doesnt_exist_1','192.168.50.10','problem host - Handled',60,4,1,'0','1','2','SYMBOL - Hub',0,'','u,d,r,f',1,15,NULL,NULL,1,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,0,'');
-INSERT INTO `hosts` VALUES (15,'doesnt_exist_2','192.168.50.11','problem host - Unhandled',60,4,1,'0','1','2','SYMBOL - Proxy',0,'','u,d,r,f',1,15,NULL,NULL,1,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,0,'');
-INSERT INTO `hosts` VALUES (16,'singlehostgroup','nonexistent','',60,7,1,'0','1','2','LOGO - OpenBSD',0,'','u,d,r,f',1,15,NULL,NULL,1,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,0,'');
-INSERT INTO `hosts` VALUES (17,'fake_ipv6','2001:0db8:0:0::1428:57ab','Test host for IPv6 addresses',60,4,1,'0','1','2','LOGO - Opsview',0,'','u,d,r,f',1,17,NULL,NULL,1,0,'2001:0db8::1428:57ab','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,0,'');
-INSERT INTO `hosts` VALUES (18,'opsviewdev46','192.168.101.46','',60,2,1,'0','1','2','SYMBOL - VPN',1,'public','u,d,r',1,18,NULL,NULL,1,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',1,0,0,0,0,'');
-INSERT INTO `hosts` VALUES (19,'opslaveclusterA','opslaveclusterAip','Slave',60,2,1,'0','1','2','LOGO - Opsview',0,'','u,d,r',1,3,NULL,NULL,3,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,0,'');
-INSERT INTO `hosts` VALUES (20,'opslaveclusterB','opslaveclusterBip','Slave',60,2,1,'0','1','2','LOGO - Opsview',0,'','u,d,r',1,3,NULL,NULL,3,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,0,'');
-INSERT INTO `hosts` VALUES (21,'opslaveclusterC','opslaveclusterCip','Slave',60,2,1,'0','1','2','LOGO - Opsview',0,'','u,d,r',1,3,NULL,NULL,3,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,0,'');
-INSERT INTO `hosts` VALUES (22,'monitored_by_cluster','monitored_by_clusterip','Host to be monitored by slave',60,5,3,'5','4','5','SYMBOL - Wireless network',1,'slave','u,d,r',1,7,NULL,NULL,3,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,1,'server',1,0,0,0,0,'');
-INSERT INTO `hosts` VALUES (23,'PassiveSlave','192.168.105.15','',60,2,1,'0','1','2','LOGO - Opsview',0,'','u,d,r,f',1,15,NULL,NULL,4,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,0,'');
-INSERT INTO `hosts` VALUES (24,'PassiveNode','192.168.105.20','',60,10,1,'0','1','2','LOGO - Debian Linux',0,'','u,d,r,f',1,15,NULL,NULL,4,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,0,'');
+INSERT INTO `hosts` VALUES (1,'opsview','opsviewdev46','Opsview Master Server',60,2,1,'0','1','2','LOGO - Opsview',0,'','u,d,r',1,1,NULL,NULL,1,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,'');
+INSERT INTO `hosts` VALUES (2,'opsviewdev1','opsviewdev1.der.altinity','',60,2,1,'0','1','2','SYMBOL - Wireless network',1,'','u,d,r',1,1,NULL,NULL,1,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',1,0,0,0,'');
+INSERT INTO `hosts` VALUES (3,'host_locally_monitored','hostname1','',60,4,2,'3','2','3','SYMBOL - Router',1,'public','u,d,r',1,NULL,NULL,NULL,1,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,'');
+INSERT INTO `hosts` VALUES (4,'monitored_by_slave','monitored_by_slave','Host to be monitored by slave',60,5,3,'5','4','5','SYMBOL - Wireless network',1,'slave','u,d,r',1,7,NULL,NULL,2,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,1,'server',1,0,0,0,'');
+INSERT INTO `hosts` VALUES (5,'opslave','opslave','Slave',60,2,1,'0','1','2','LOGO - Opsview',0,'','u,d,r',1,3,NULL,NULL,2,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,'');
+INSERT INTO `hosts` VALUES (6,'resolved_services','resolved_services','Host with services based on templates, exceptions and timed exceptions',60,5,1,'0','1','2','SYMBOL - Switch',0,'','u,d,r',1,7,NULL,NULL,1,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,'');
+INSERT INTO `hosts` VALUES (7,'cisco','192.168.10.20','',0,4,1,'0','1','2','SYMBOL - Environment Monitor',0,'shouldnotcreate','u,d,r',1,1,NULL,NULL,1,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,'');
+INSERT INTO `hosts` VALUES (8,'cisco1','192.168.10.23','',60,4,1,'0','1','2','SYMBOL - *DSL',0,'','u,d,r',1,1,NULL,NULL,1,0,'10.20.20.20,docs.opsview.org,nonexistant','2c',161,'',NULL,'',NULL,'',1,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,'');
+INSERT INTO `hosts` VALUES (9,'cisco2','192.168.10.22','',60,4,1,'0','1','2','SYMBOL - Firewall',0,'','u,d,r',1,1,NULL,NULL,5,0,'','2c',161,'',NULL,'',NULL,'',1,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,'');
+INSERT INTO `hosts` VALUES (10,'cisco3','192.168.10.22','',60,4,1,'0','1','2','LOGO - NetBSD',0,'','',1,1,NULL,NULL,2,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,'');
+INSERT INTO `hosts` VALUES (11,'cisco4','not_a_real_host','',60,4,1,'0','1','2','SYMBOL - Network',1,'public','u,d,r',1,1,NULL,NULL,1,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,1,'switch',0,0,0,0,'');
+INSERT INTO `hosts` VALUES (12,'toclone','toclone','Host to clone, testing API',60,5,1,'0','1','2','SYMBOL - Proxy',1,'$tr!ng@','u,d',3,4,NULL,NULL,1,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,'');
+INSERT INTO `hosts` VALUES (13,'host_locally_monitored_v3','hostname1','',60,4,1,'0','1','2','SYMBOL - Application',1,'','u,d,r',1,NULL,NULL,NULL,1,0,'','3',161,'u$ernam3','md5','p3ssw0rdmd5','aes128','aes128aes128',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,'');
+INSERT INTO `hosts` VALUES (14,'doesnt_exist_1','192.168.50.10','problem host - Handled',60,4,1,'0','1','2','SYMBOL - Hub',0,'','u,d,r,f',1,15,NULL,NULL,1,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,'');
+INSERT INTO `hosts` VALUES (15,'doesnt_exist_2','192.168.50.11','problem host - Unhandled',60,4,1,'0','1','2','SYMBOL - Proxy',0,'','u,d,r,f',1,15,NULL,NULL,1,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,'');
+INSERT INTO `hosts` VALUES (16,'singlehostgroup','nonexistent','',60,7,1,'0','1','2','LOGO - OpenBSD',0,'','u,d,r,f',1,15,NULL,NULL,1,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,'');
+INSERT INTO `hosts` VALUES (17,'fake_ipv6','2001:0db8:0:0::1428:57ab','Test host for IPv6 addresses',60,4,1,'0','1','2','LOGO - Opsview',0,'','u,d,r,f',1,17,NULL,NULL,1,0,'2001:0db8::1428:57ab','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,'');
+INSERT INTO `hosts` VALUES (18,'opsviewdev46','192.168.101.46','',60,2,1,'0','1','2','SYMBOL - VPN',1,'public','u,d,r',1,18,NULL,NULL,1,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',1,0,0,0,'');
+INSERT INTO `hosts` VALUES (19,'opslaveclusterA','opslaveclusterAip','Slave',60,2,1,'0','1','2','LOGO - Opsview',0,'','u,d,r',1,3,NULL,NULL,3,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,'');
+INSERT INTO `hosts` VALUES (20,'opslaveclusterB','opslaveclusterBip','Slave',60,2,1,'0','1','2','LOGO - Opsview',0,'','u,d,r',1,3,NULL,NULL,3,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,'');
+INSERT INTO `hosts` VALUES (21,'opslaveclusterC','opslaveclusterCip','Slave',60,2,1,'0','1','2','LOGO - Opsview',0,'','u,d,r',1,3,NULL,NULL,3,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,'');
+INSERT INTO `hosts` VALUES (22,'monitored_by_cluster','monitored_by_clusterip','Host to be monitored by slave',60,5,3,'5','4','5','SYMBOL - Wireless network',1,'slave','u,d,r',1,7,NULL,NULL,3,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,1,'server',1,0,0,0,'');
+INSERT INTO `hosts` VALUES (23,'PassiveSlave','192.168.105.15','',60,2,1,'0','1','2','LOGO - Opsview',0,'','u,d,r,f',1,15,NULL,NULL,4,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,'');
+INSERT INTO `hosts` VALUES (24,'PassiveNode','192.168.105.20','',60,10,1,'0','1','2','LOGO - Debian Linux',0,'','u,d,r,f',1,15,NULL,NULL,4,0,'','2c',161,'',NULL,'',NULL,'',0,1,0,NULL,NULL,NULL,'ssh',0,0,'router',0,0,0,0,'');
/*!40000 ALTER TABLE `hosts` ENABLE KEYS */;
UNLOCK TABLES;
@@ -2063,7 +2063,6 @@
INSERT INTO `schema_version` VALUES ('20130115envvars','all','Support for envvars in plugins','2013-01-15 09:37:25',0);
INSERT INTO `schema_version` VALUES ('20130122snmpport','all','Increasing the size of snmp_port','2013-01-22 10:18:48',0);
INSERT INTO `schema_version` VALUES ('20130204baduuid','all','Checking for bad UUID','2013-02-04 14:40:14',0);
-INSERT INTO `schema_version` VALUES ('20130221snmpthro','all','Increasing the size of snmp.throughput_*','2013-02-21 15:30:52',0);
INSERT INTO `schema_version` VALUES ('20130219hsteh','all','Host event handlers','2013-02-19 14:49:43',0);
INSERT INTO `schema_version` VALUES ('20130221snmpthro','all','Increasing the size of snmp.throughput_*','2013-02-21 15:30:52',0);
INSERT INTO `schema_version` VALUES ('3.0','4',NULL,NULL,NULL);
