Modified: trunk/opsview-core/lib/Opsview/Utils/NDOLogsImporter.pm
===================================================================
--- trunk/opsview-core/lib/Opsview/Utils/NDOLogsImporter.pm 2013-01-28 16:31:16 UTC (rev 11263)
+++ trunk/opsview-core/lib/Opsview/Utils/NDOLogsImporter.pm 2013-01-28 16:33:25 UTC (rev 11264)
@@ -2312,7 +2312,7 @@
passive_host_checks_enabled=?,
event_handlers_enabled=?,
flap_detection_enabled=?,
- failure_prediction_enabled=?,
+ failure_prediction_enabled=0,
process_performance_data=?,
obsess_over_hosts=?,
obsess_over_services=?,
@@ -2345,7 +2345,7 @@
passive_host_checks_enabled=?,
event_handlers_enabled=?,
flap_detection_enabled=?,
- failure_prediction_enabled=?,
+ failure_prediction_enabled=0,
process_performance_data=?,
obsess_over_hosts=?,
obsess_over_services=?,
@@ -2389,7 +2389,6 @@
NDO_DATA_PASSIVEHOSTCHECKSENABLED(),
NDO_DATA_EVENTHANDLERSENABLED(),
NDO_DATA_FLAPDETECTIONENABLED(),
- NDO_DATA_FAILUREPREDICTIONENABLED(),
NDO_DATA_PROCESSPERFORMANCEDATA(),
NDO_DATA_OBSESSOVERHOSTS(),
NDO_DATA_OBSESSOVERSERVICES(),
@@ -2457,7 +2456,7 @@
percent_state_change=?,
latency=?,
execution_time=?,
- failure_prediction_enabled=?,
+ failure_prediction_enabled=0,
process_performance_data=?,
obsess_over_host=?,
modified_host_attributes=?,
@@ -2510,7 +2509,7 @@
percent_state_change=?,
latency=?,
execution_time=?,
- failure_prediction_enabled=?,
+ failure_prediction_enabled=0,
process_performance_data=?,
obsess_over_host=?,
modified_host_attributes=?,
@@ -2565,7 +2564,7 @@
percent_state_change=?,
latency=?,
execution_time=?,
- failure_prediction_enabled=?,
+ failure_prediction_enabled=0,
process_performance_data=?,
obsess_over_host=?,
modified_host_attributes=?,
@@ -2617,7 +2616,7 @@
percent_state_change=?,
latency=?,
execution_time=?,
- failure_prediction_enabled=?,
+ failure_prediction_enabled=0,
process_performance_data=?,
obsess_over_host=?,
modified_host_attributes=?,
@@ -2695,7 +2694,6 @@
NDO_DATA_PERCENTSTATECHANGE(),
NDO_DATA_LATENCY(),
NDO_DATA_EXECUTIONTIME(),
- NDO_DATA_FAILUREPREDICTIONENABLED(),
NDO_DATA_PROCESSPERFORMANCEDATA(),
NDO_DATA_OBSESSOVERHOST(),
NDO_DATA_MODIFIEDHOSTATTRIBUTES(),
@@ -2797,7 +2795,7 @@
percent_state_change=?,
latency=?,
execution_time=?,
- failure_prediction_enabled=?,
+ failure_prediction_enabled=0,
process_performance_data=?,
obsess_over_service=?,
modified_service_attributes=?,
@@ -2851,7 +2849,7 @@
percent_state_change=?,
latency=?,
execution_time=?,
- failure_prediction_enabled=?,
+ failure_prediction_enabled=0,
process_performance_data=?,
obsess_over_service=?,
modified_service_attributes=?,
@@ -2907,7 +2905,7 @@
percent_state_change=?,
latency=?,
execution_time=?,
- failure_prediction_enabled=?,
+ failure_prediction_enabled=0,
process_performance_data=?,
obsess_over_service=?,
modified_service_attributes=?,
@@ -2960,7 +2958,7 @@
percent_state_change=?,
latency=?,
execution_time=?,
- failure_prediction_enabled=?,
+ failure_prediction_enabled=0,
process_performance_data=?,
obsess_over_service=?,
modified_service_attributes=?,
@@ -3045,7 +3043,6 @@
NDO_DATA_PERCENTSTATECHANGE(),
NDO_DATA_LATENCY(),
NDO_DATA_EXECUTIONTIME(),
- NDO_DATA_FAILUREPREDICTIONENABLED(),
NDO_DATA_PROCESSPERFORMANCEDATA(),
NDO_DATA_OBSESSOVERSERVICE(),
NDO_DATA_MODIFIEDSERVICEATTRIBUTES(),
@@ -3922,7 +3919,7 @@
retain_nonstatus_information=?,
notifications_enabled=?,
obsess_over_host=?,
- failure_prediction_enabled=?,
+ failure_prediction_enabled=0,
notes=?,
notes_url=?,
action_url=?,
@@ -3992,7 +3989,7 @@
retain_nonstatus_information=?,
notifications_enabled=?,
obsess_over_host=?,
- failure_prediction_enabled=?,
+ failure_prediction_enabled=0,
notes=?,
notes_url=?,
action_url=?,
@@ -4093,7 +4090,6 @@
NDO_DATA_RETAINHOSTNONSTATUSINFORMATION(),
NDO_DATA_HOSTNOTIFICATIONSENABLED(),
NDO_DATA_OBSESSOVERHOST(),
- NDO_DATA_HOSTFAILUREPREDICTIONENABLED(),
],
$event->[ NDO_DATA_NOTES() ] || '',
$event->[ NDO_DATA_NOTESURL() ] || '',
@@ -4209,7 +4205,7 @@
retain_nonstatus_information=?,
notifications_enabled=?,
obsess_over_service=?,
- failure_prediction_enabled=?,
+ failure_prediction_enabled=0,
notes=?,
notes_url=?,
action_url=?,
@@ -4273,7 +4269,7 @@
retain_nonstatus_information=?,
notifications_enabled=?,
obsess_over_service=?,
- failure_prediction_enabled=?,
+ failure_prediction_enabled=0,
notes=?,
notes_url=?,
action_url=?,
@@ -4374,7 +4370,6 @@
NDO_DATA_RETAINSERVICENONSTATUSINFORMATION(),
NDO_DATA_SERVICENOTIFICATIONSENABLED(),
NDO_DATA_OBSESSOVERSERVICE(),
- NDO_DATA_SERVICEFAILUREPREDICTIONENABLED(),
],
$event->[ NDO_DATA_NOTES() ] || '',
$event->[ NDO_DATA_NOTESURL() ] || '',
Modified: trunk/opsview-core/t/var/ndologs/log-imported.diff.expected
===================================================================
--- trunk/opsview-core/t/var/ndologs/log-imported.diff.expected 2013-01-28 16:31:16 UTC (rev 11263)
+++ trunk/opsview-core/t/var/ndologs/log-imported.diff.expected 2013-01-28 16:33:25 UTC (rev 11264)
@@ -26,8 +26,8 @@
+INSERT INTO `nagios_hostgroup_members` VALUES (3,1,1,25);
+INSERT INTO `nagios_hostgroup_members` VALUES (4,1,1,26);
+INSERT INTO `nagios_hostgroups` VALUES (1,1,1,22,'HG 1');
-+INSERT INTO `nagios_hosts` VALUES (1,1,1,10,'host123','host123','www.domain.com',0,'',0,'',3,3,'',0,1,2,0,60,1,1,1,1,0,0,0,0,1,1,1,1,0,0,1,0,0,1,0,1,1,1,1,0,1,'','','/info/host/123','network_cloud.png','SYMBOL - Network Cloud','network_cloud.png','network_cloud.png',0,-1,0,0,0,0,0);
-+INSERT INTO `nagios_hoststatus` VALUES (1,1,28,'2012-01-10 12:50:39','CRITICAL - 1.2.3.4 Host unreachable @ 1.2.3.4. rta nan, lost 100%','rta=0.000ms;500.000;1000.000;0; pl=100%;80;100;; rtmax=0.000ms;;;; rtmin=0.000ms;;;;',1,1,1,2,2,'2012-08-14 15:49:57','1970-01-01 00:00:00',1,'2012-06-25 15:40:21','2012-06-25 15:40:21',1,'2012-06-01 02:40:53','2012-08-14 15:49:59','2012-05-16 06:26:55',1,'2012-11-19 12:02:29','2012-11-19 13:02:29',0,1,0,0,743,1,0,0,1,0,0,0.811,0,0,1,1,0,0,'','',0,0,3);
++INSERT INTO `nagios_hosts` VALUES (1,1,1,10,'host123','host123','www.domain.com',0,'',0,'',3,3,'',0,1,2,0,60,1,1,1,1,0,0,0,0,1,1,1,1,0,0,1,0,0,1,0,1,1,1,1,0,0,'','','/info/host/123','network_cloud.png','SYMBOL - Network Cloud','network_cloud.png','network_cloud.png',0,-1,0,0,0,0,0);
++INSERT INTO `nagios_hoststatus` VALUES (1,1,28,'2012-01-10 12:50:39','CRITICAL - 1.2.3.4 Host unreachable @ 1.2.3.4. rta nan, lost 100%','rta=0.000ms;500.000;1000.000;0; pl=100%;80;100;; rtmax=0.000ms;;;; rtmin=0.000ms;;;;',1,1,1,2,2,'2012-08-14 15:49:57','1970-01-01 00:00:00',1,'2012-06-25 15:40:21','2012-06-25 15:40:21',1,'2012-06-01 02:40:53','2012-08-14 15:49:59','2012-05-16 06:26:55',1,'2012-11-19 12:02:29','2012-11-19 13:02:29',0,1,0,0,743,1,0,0,1,0,0,0.811,0,0,0,1,0,0,'','',0,0,3);
INSERT INTO `nagios_instances` VALUES (1,'default','');
+INSERT INTO `nagios_notifications` VALUES (1,1,1,0,8771,5,'2012-11-19 13:05:01',66431,'1970-01-01 00:00:00',0,1,'DISK WARNING - free space: /srv/released 14253 MB (9% inode=99%):',0,0);
+INSERT INTO `nagios_objects` VALUES (1,1,2,'ov-build-hardy-32','SSH 1022',0);
@@ -65,7 +65,7 @@
+INSERT INTO `nagios_processevents` VALUES (1,1,106,'2012-01-10 12:50:37',51069,4776,'Nagios','3.2.3','10-03-2010');
+INSERT INTO `nagios_processevents` VALUES (2,1,102,'2012-01-10 12:50:37',51072,4776,'Nagios','3.2.3','10-03-2010');
+INSERT INTO `nagios_processevents` VALUES (3,1,100,'2012-01-10 12:50:39',26468,4776,'Nagios','3.2.3','10-03-2010');
-+INSERT INTO `nagios_programstatus` VALUES (1,1,'2012-11-19 13:05:01','2012-11-19 12:57:51','0000-00-00 00:00:00',0,7273,1,'2012-11-19 13:05:01','1970-01-01 00:00:00',1,1,1,1,1,1,1,1,1,0,0,1,1,'','');
++INSERT INTO `nagios_programstatus` VALUES (1,1,'2012-11-19 13:05:01','2012-11-19 12:57:51','0000-00-00 00:00:00',0,7273,1,'2012-11-19 13:05:01','1970-01-01 00:00:00',1,1,1,1,1,1,1,0,1,0,0,1,1,'','');
+INSERT INTO `nagios_scheduleddowntime` VALUES (1,1,1,30,'2011-08-31 08:20:56','dummyuser','Host moved to new location',8978,0,1,32767,'2011-08-31 08:20:34','2012-08-30 08:20:34',0,'0000-00-00 00:00:00',0);
INSERT INTO `nagios_schema_version` VALUES ('2.10','1');
INSERT INTO `nagios_schema_version` VALUES ('3.0','5');
@@ -81,9 +81,9 @@
+INSERT INTO `nagios_service_contactgroups` VALUES (8,1,1,19);
+INSERT INTO `nagios_servicechecks` VALUES (1,1,1,1,2,2,2,1,'2012-11-19 13:04:59',0,'2012-11-19 13:04:59',0,2,'','',60,0,0,0.38589,2,'No route to host','');
+INSERT INTO `nagios_servicedependencies` VALUES (1,1,1,32,30,2,0,0,0,1,1,1);
-+INSERT INTO `nagios_services` VALUES (1,1,1,10,20,'host123 check',2,'',0,'',3,3,'',5,1,3,0,60,1,1,1,1,1,0,0,0,0,0,0,1,1,1,1,1,0,0,1,1,0,1,1,0,1,1,1,0,1,'check host123','/graph?host=$HOSTNAME$&service=$SERVICEDESC$','','graph.png','View graphs');
-+INSERT INTO `nagios_servicestatus` VALUES (1,1,1,'2012-11-19 13:05:01','No route to host','',2,1,0,2,2,'2012-11-19 13:04:59','2012-11-05 05:05:47',1,'2012-06-25 15:39:15','2012-06-25 15:39:15',2,'2012-06-25 15:37:05','1970-01-01 00:00:00','2012-06-11 07:43:45','2012-11-19 13:04:59',1,'1970-01-01 00:00:00','1970-01-01 00:00:00',0,1,0,0,0,1,0,1,1,0,0,0.38589,0,0,1,1,0,0,'','set_to_stale',2,1,3);
-+INSERT INTO `nagios_servicestatus` VALUES (2,1,4,'2012-11-19 13:05:05','OPSVIEW_SERVICES OK - Total unhandled services 1 (critical=>0, warning=> 0, unknown=> 1 )','unhandled_services=1;5;10',0,1,1,1,3,'2012-11-19 13:05:01','2012-11-19 13:10:01',0,'2012-10-15 16:12:54','2012-10-15 16:12:54',0,'2012-11-19 13:05:01','2012-04-28 14:12:15','1970-01-01 00:00:00','2012-10-15 16:07:54',1,'1970-01-01 00:00:00','1970-01-01 00:00:00',0,1,0,0,0,1,1,1,1,0,0,0.78,2.48909,0,1,1,0,0,'','check_opsview_services!--hostgroup=\'Production Systems\' -w 5 -c 10',5,1,3);
++INSERT INTO `nagios_services` VALUES (1,1,1,10,20,'host123 check',2,'',0,'',3,3,'',5,1,3,0,60,1,1,1,1,1,0,0,0,0,0,0,1,1,1,1,1,0,0,1,1,0,1,1,0,1,1,1,0,0,'check host123','/graph?host=$HOSTNAME$&service=$SERVICEDESC$','','graph.png','View graphs');
++INSERT INTO `nagios_servicestatus` VALUES (1,1,1,'2012-11-19 13:05:01','No route to host','',2,1,0,2,2,'2012-11-19 13:04:59','2012-11-05 05:05:47',1,'2012-06-25 15:39:15','2012-06-25 15:39:15',2,'2012-06-25 15:37:05','1970-01-01 00:00:00','2012-06-11 07:43:45','2012-11-19 13:04:59',1,'1970-01-01 00:00:00','1970-01-01 00:00:00',0,1,0,0,0,1,0,1,1,0,0,0.38589,0,0,0,1,0,0,'','set_to_stale',2,1,3);
++INSERT INTO `nagios_servicestatus` VALUES (2,1,4,'2012-11-19 13:05:05','OPSVIEW_SERVICES OK - Total unhandled services 1 (critical=>0, warning=> 0, unknown=> 1 )','unhandled_services=1;5;10',0,1,1,1,3,'2012-11-19 13:05:01','2012-11-19 13:10:01',0,'2012-10-15 16:12:54','2012-10-15 16:12:54',0,'2012-11-19 13:05:01','2012-04-28 14:12:15','1970-01-01 00:00:00','2012-10-15 16:07:54',1,'1970-01-01 00:00:00','1970-01-01 00:00:00',0,1,0,0,0,1,1,1,1,0,0,0.78,2.48909,0,0,1,0,0,'','check_opsview_services!--hostgroup=\'Production Systems\' -w 5 -c 10',5,1,3);
+INSERT INTO `nagios_statehistory` VALUES (1,1,'2012-11-19 13:05:01',66482,5,1,1,1,3,3,1,1,0,NULL,0,0,0,1,'DISK WARNING - free space: /srv/released 14253 MB (9% inode=99%):');
+INSERT INTO `nagios_timeperiod_timeranges` VALUES (1,1,1,1,32400,63000);
+INSERT INTO `nagios_timeperiod_timeranges` VALUES (2,1,1,2,32400,63000);
