Menu
▾
▴
[Nagios-checkins] SF.net SVN: nagios:[2118] nagioscore/trunk
|
From: <ag...@us...> - 2012-08-28 09:56:10
|
Revision: 2118
http://nagios.svn.sourceforge.net/nagios/?rev=2118&view=rev
Author: ageric
Date: 2012-08-28 09:55:57 +0000 (Tue, 28 Aug 2012)
Log Message:
-----------
Remove incomplete failure prediction code
Failure prediction analysis is difficult and requires knowledge of
plugin values. One of the very strong points about Nagios is that
it doesn't have to care about plugin output (beyond storing and showing
it), so adding failure prediction on a global scope makes very little
sense. It would be doable by something that recognizes performance data
and can spot trends in such data. That's an excellent task for an
addon, but we'd do better not to riddle the core with such code.
Signed-off-by: Andreas Ericsson <ae...@op...>
Modified Paths:
--------------
nagioscore/trunk/base/broker.c
nagioscore/trunk/base/commands.c
nagioscore/trunk/base/config.c
nagioscore/trunk/base/nagios.c
nagioscore/trunk/base/utils.c
nagioscore/trunk/cgi/cmd.c
nagioscore/trunk/cgi/config.c
nagioscore/trunk/cgi/extcmd_list.c
nagioscore/trunk/cgi/extinfo.c
nagioscore/trunk/common/objects.c
nagioscore/trunk/contrib/convertcfg.c
nagioscore/trunk/include/common.h
nagioscore/trunk/include/nagios.h
nagioscore/trunk/include/nebstructs.h
nagioscore/trunk/include/objects.h
nagioscore/trunk/include/statusdata.h
nagioscore/trunk/t/var/objects.cache
nagioscore/trunk/t/var/objects.cache.hosturgencies
nagioscore/trunk/t/var/objects.precache.expected
nagioscore/trunk/t/var/status-hosturgencies.dat
nagioscore/trunk/t/var/status.dat
nagioscore/trunk/xdata/xodtemplate.c
nagioscore/trunk/xdata/xodtemplate.h
nagioscore/trunk/xdata/xrddefault.c
nagioscore/trunk/xdata/xsddefault.c
Modified: nagioscore/trunk/base/broker.c
===================================================================
--- nagioscore/trunk/base/broker.c 2012-08-27 15:03:39 UTC (rev 2117)
+++ nagioscore/trunk/base/broker.c 2012-08-28 09:55:57 UTC (rev 2118)
@@ -44,7 +44,6 @@
extern int obsess_over_services;
extern int obsess_over_hosts;
extern int enable_flap_detection;
-extern int enable_failure_prediction;
extern int process_performance_data;
extern unsigned long modified_host_process_attributes;
extern unsigned long modified_service_process_attributes;
@@ -491,7 +490,6 @@
ds.passive_host_checks_enabled = accept_passive_host_checks;
ds.event_handlers_enabled = enable_event_handlers;
ds.flap_detection_enabled = enable_flap_detection;
- ds.failure_prediction_enabled = enable_failure_prediction;
ds.process_performance_data = process_performance_data;
ds.obsess_over_hosts = obsess_over_hosts;
ds.obsess_over_services = obsess_over_services;
Modified: nagioscore/trunk/base/commands.c
===================================================================
--- nagioscore/trunk/base/commands.c 2012-08-27 15:03:39 UTC (rev 2117)
+++ nagioscore/trunk/base/commands.c 2012-08-28 09:55:57 UTC (rev 2118)
@@ -40,7 +40,6 @@
extern int obsess_over_hosts;
extern int check_service_freshness;
extern int check_host_freshness;
-extern int enable_failure_prediction;
extern int process_performance_data;
extern int log_external_commands;
@@ -188,11 +187,6 @@
else if(!strcmp(command_id, "FLUSH_PENDING_COMMANDS"))
command_type = CMD_FLUSH_PENDING_COMMANDS;
- else if(!strcmp(command_id, "ENABLE_FAILURE_PREDICTION"))
- command_type = CMD_ENABLE_FAILURE_PREDICTION;
- else if(!strcmp(command_id, "DISABLE_FAILURE_PREDICTION"))
- command_type = CMD_DISABLE_FAILURE_PREDICTION;
-
else if(!strcmp(command_id, "ENABLE_PERFORMANCE_DATA"))
command_type = CMD_ENABLE_PERFORMANCE_DATA;
else if(!strcmp(command_id, "DISABLE_PERFORMANCE_DATA"))
@@ -784,14 +778,6 @@
disable_host_freshness_checks();
break;
- case CMD_ENABLE_FAILURE_PREDICTION:
- enable_all_failure_prediction();
- break;
-
- case CMD_DISABLE_FAILURE_PREDICTION:
- disable_all_failure_prediction();
- break;
-
case CMD_ENABLE_PERFORMANCE_DATA:
enable_performance_data();
break;
@@ -4713,58 +4699,6 @@
}
-/* enable failure prediction on a program-wide basis */
-void enable_all_failure_prediction(void) {
- unsigned long attr = MODATTR_FAILURE_PREDICTION_ENABLED;
-
- /* bail out if we're already set... */
- if(enable_failure_prediction == TRUE)
- return;
-
- /* set the attribute modified flag */
- modified_host_process_attributes |= attr;
- modified_service_process_attributes |= attr;
-
- enable_failure_prediction = TRUE;
-
-#ifdef USE_EVENT_BROKER
- /* send data to event broker */
- broker_adaptive_program_data(NEBTYPE_ADAPTIVEPROGRAM_UPDATE, NEBFLAG_NONE, NEBATTR_NONE, CMD_NONE, attr, modified_host_process_attributes, attr, modified_service_process_attributes, NULL);
-#endif
-
- /* update the status log */
- update_program_status(FALSE);
-
- return;
- }
-
-
-/* disable failure prediction on a program-wide basis */
-void disable_all_failure_prediction(void) {
- unsigned long attr = MODATTR_FAILURE_PREDICTION_ENABLED;
-
- /* bail out if we're already set... */
- if(enable_failure_prediction == FALSE)
- return;
-
- /* set the attribute modified flag */
- modified_host_process_attributes |= attr;
- modified_service_process_attributes |= attr;
-
- enable_failure_prediction = FALSE;
-
-#ifdef USE_EVENT_BROKER
- /* send data to event broker */
- broker_adaptive_program_data(NEBTYPE_ADAPTIVEPROGRAM_UPDATE, NEBFLAG_NONE, NEBATTR_NONE, CMD_NONE, attr, modified_host_process_attributes, attr, modified_service_process_attributes, NULL);
-#endif
-
- /* update the status log */
- update_program_status(FALSE);
-
- return;
- }
-
-
/* enable performance data on a program-wide basis */
void enable_performance_data(void) {
unsigned long attr = MODATTR_PERFORMANCE_DATA_ENABLED;
Modified: nagioscore/trunk/base/config.c
===================================================================
--- nagioscore/trunk/base/config.c 2012-08-27 15:03:39 UTC (rev 2117)
+++ nagioscore/trunk/base/config.c 2012-08-28 09:55:57 UTC (rev 2118)
@@ -149,7 +149,6 @@
extern int enable_event_handlers;
extern int obsess_over_services;
extern int obsess_over_hosts;
-extern int enable_failure_prediction;
extern int translate_passive_host_checks;
extern int passive_host_checks_are_soft;
@@ -1141,7 +1140,7 @@
enable_flap_detection = (atoi(value) > 0) ? TRUE : FALSE;
else if(!strcmp(variable, "enable_failure_prediction"))
- enable_failure_prediction = (atoi(value) > 0) ? TRUE : FALSE;
+ obsoleted_warning(variable, NULL);
else if(!strcmp(variable, "low_service_flap_threshold")) {
Modified: nagioscore/trunk/base/nagios.c
===================================================================
--- nagioscore/trunk/base/nagios.c 2012-08-27 15:03:39 UTC (rev 2117)
+++ nagioscore/trunk/base/nagios.c 2012-08-28 09:55:57 UTC (rev 2118)
@@ -195,7 +195,6 @@
int enable_event_handlers = TRUE;
int obsess_over_services = FALSE;
int obsess_over_hosts = FALSE;
-int enable_failure_prediction = TRUE;
int translate_passive_host_checks = DEFAULT_TRANSLATE_PASSIVE_HOST_CHECKS;
int passive_host_checks_are_soft = DEFAULT_PASSIVE_HOST_CHECKS_SOFT;
Modified: nagioscore/trunk/base/utils.c
===================================================================
--- nagioscore/trunk/base/utils.c 2012-08-27 15:03:39 UTC (rev 2117)
+++ nagioscore/trunk/base/utils.c 2012-08-28 09:55:57 UTC (rev 2118)
@@ -186,7 +186,6 @@
extern int enable_event_handlers;
extern int obsess_over_services;
extern int obsess_over_hosts;
-extern int enable_failure_prediction;
extern int process_performance_data;
extern int translate_passive_host_checks;
@@ -3505,7 +3504,6 @@
enable_event_handlers = TRUE;
obsess_over_services = FALSE;
obsess_over_hosts = FALSE;
- enable_failure_prediction = TRUE;
next_comment_id = 0L; /* comment and downtime id get initialized to nonzero elsewhere */
next_downtime_id = 0L;
Modified: nagioscore/trunk/cgi/cmd.c
===================================================================
--- nagioscore/trunk/cgi/cmd.c 2012-08-27 15:03:39 UTC (rev 2117)
+++ nagioscore/trunk/cgi/cmd.c 2012-08-28 09:55:57 UTC (rev 2118)
@@ -849,11 +849,6 @@
printf("cancel scheduled downtime for a particular %s", (cmd == CMD_DEL_HOST_DOWNTIME) ? "host" : "service");
break;
- case CMD_ENABLE_FAILURE_PREDICTION:
- case CMD_DISABLE_FAILURE_PREDICTION:
- printf("%s failure prediction for hosts and service", (cmd == CMD_ENABLE_FAILURE_PREDICTION) ? "enable" : "disable");
- break;
-
case CMD_ENABLE_PERFORMANCE_DATA:
case CMD_DISABLE_PERFORMANCE_DATA:
printf("%s performance data processing for hosts and services", (cmd == CMD_ENABLE_PERFORMANCE_DATA) ? "enable" : "disable");
@@ -1123,8 +1118,6 @@
case CMD_STOP_OBSESSING_OVER_SVC_CHECKS:
case CMD_ENABLE_FLAP_DETECTION:
case CMD_DISABLE_FLAP_DETECTION:
- case CMD_ENABLE_FAILURE_PREDICTION:
- case CMD_DISABLE_FAILURE_PREDICTION:
case CMD_ENABLE_PERFORMANCE_DATA:
case CMD_DISABLE_PERFORMANCE_DATA:
case CMD_START_EXECUTING_HOST_CHECKS:
@@ -1627,8 +1620,6 @@
case CMD_STOP_OBSESSING_OVER_SVC_CHECKS:
case CMD_ENABLE_FLAP_DETECTION:
case CMD_DISABLE_FLAP_DETECTION:
- case CMD_ENABLE_FAILURE_PREDICTION:
- case CMD_DISABLE_FAILURE_PREDICTION:
case CMD_ENABLE_PERFORMANCE_DATA:
case CMD_DISABLE_PERFORMANCE_DATA:
case CMD_START_EXECUTING_HOST_CHECKS:
@@ -1983,8 +1974,6 @@
case CMD_STOP_OBSESSING_OVER_SVC_CHECKS:
case CMD_ENABLE_FLAP_DETECTION:
case CMD_DISABLE_FLAP_DETECTION:
- case CMD_ENABLE_FAILURE_PREDICTION:
- case CMD_DISABLE_FAILURE_PREDICTION:
case CMD_ENABLE_PERFORMANCE_DATA:
case CMD_DISABLE_PERFORMANCE_DATA:
case CMD_START_EXECUTING_HOST_CHECKS:
@@ -2624,14 +2613,6 @@
printf("This command is used to cancel active or pending scheduled downtime for the specified service.\n");
break;
- case CMD_ENABLE_FAILURE_PREDICTION:
- printf("This command is used to enable failure prediction for hosts and services on a program-wide basis. Individual hosts and services may have failure prediction disabled.\n");
- break;
-
- case CMD_DISABLE_FAILURE_PREDICTION:
- printf("This command is used to disable failure prediction for hosts and services on a program-wide basis.\n");
- break;
-
case CMD_ENABLE_PERFORMANCE_DATA:
printf("This command is used to enable the processing of performance data for hosts and services on a program-wide basis. Individual hosts and services may have performance data processing disabled.\n");
break;
Modified: nagioscore/trunk/cgi/config.c
===================================================================
--- nagioscore/trunk/cgi/config.c 2012-08-27 15:03:39 UTC (rev 2117)
+++ nagioscore/trunk/cgi/config.c 2012-08-28 09:55:57 UTC (rev 2118)
@@ -493,8 +493,6 @@
printf("<TH CLASS='data'>High Flap Threshold</TH>");
printf("<TH CLASS='data'>Flap Detection Options</TH>\n");
printf("<TH CLASS='data'>Process Performance Data</TH>");
- printf("<TH CLASS='data'>Enable Failure Prediction</TH>");
- printf("<TH CLASS='data'>Failure Prediction Options</TH>");
printf("<TH CLASS='data'>Notes</TH>");
printf("<TH CLASS='data'>Notes URL</TH>");
printf("<TH CLASS='data'>Action URL</TH>");
@@ -709,12 +707,6 @@
printf("%s\n", (temp_host->process_performance_data == TRUE) ? "Yes" : "No");
printf("</TD>\n");
- printf("<TD CLASS='%s'>", bg_class);
- printf("%s\n", (temp_host->failure_prediction_enabled == TRUE) ? "Yes" : "No");
- printf("</TD>\n");
-
- printf("<TD CLASS='%s'>%s</TD>\n", bg_class, (temp_host->failure_prediction_options == NULL) ? " " : html_encode(temp_host->failure_prediction_options, FALSE));
-
printf("<TD CLASS='%s'>%s</TD>", bg_class, (temp_host->notes == NULL) ? " " : html_encode(temp_host->notes, FALSE));
printf("<TD CLASS='%s'>%s</TD>", bg_class, (temp_host->notes_url == NULL) ? " " : html_encode(temp_host->notes_url, FALSE));
@@ -1238,8 +1230,6 @@
printf("<TH CLASS='data'>High Flap Threshold</TH>");
printf("<TH CLASS='data'>Flap Detection Options</TH>");
printf("<TH CLASS='data'>Process Performance Data</TH>");
- printf("<TH CLASS='data'>Enable Failure Prediction</TH>");
- printf("<TH CLASS='data'>Failure Prediction Options</TH>");
printf("<TH CLASS='data'>Notes</TH>");
printf("<TH CLASS='data'>Notes URL</TH>");
printf("<TH CLASS='data'>Action URL</TH>");
@@ -1453,12 +1443,6 @@
printf("%s\n", (temp_service->process_performance_data == TRUE) ? "Yes" : "No");
printf("</TD>\n");
- printf("<TD CLASS='%s'>", bg_class);
- printf("%s\n", (temp_service->failure_prediction_enabled == TRUE) ? "Yes" : "No");
- printf("</TD>\n");
-
- printf("<TD CLASS='%s'>%s</TD>\n", bg_class, (temp_service->failure_prediction_options == NULL) ? " " : html_encode(temp_service->failure_prediction_options, FALSE));
-
printf("<TD CLASS='%s'>%s</TD>", bg_class, (temp_service->notes == NULL) ? " " : html_encode(temp_service->notes, FALSE));
printf("<TD CLASS='%s'>%s</TD>", bg_class, (temp_service->notes_url == NULL) ? " " : html_encode(temp_service->notes_url, FALSE));
Modified: nagioscore/trunk/cgi/extcmd_list.c
===================================================================
--- nagioscore/trunk/cgi/extcmd_list.c 2012-08-27 15:03:39 UTC (rev 2117)
+++ nagioscore/trunk/cgi/extcmd_list.c 2012-08-28 09:55:57 UTC (rev 2118)
@@ -95,8 +95,6 @@
CMD_DEF(FLUSH_PENDING_COMMANDS, 0, NULL),
CMD_DEF(DEL_HOST_DOWNTIME, 0, NULL),
CMD_DEF(DEL_SVC_DOWNTIME, 0, NULL),
- CMD_DEF(ENABLE_FAILURE_PREDICTION, 0, NULL),
- CMD_DEF(DISABLE_FAILURE_PREDICTION, 0, NULL),
CMD_DEF(ENABLE_PERFORMANCE_DATA, 0, NULL),
CMD_DEF(DISABLE_PERFORMANCE_DATA, 0, NULL),
CMD_DEF(SCHEDULE_HOSTGROUP_HOST_DOWNTIME, 0, NULL),
Modified: nagioscore/trunk/cgi/extinfo.c
===================================================================
--- nagioscore/trunk/cgi/extinfo.c 2012-08-27 15:03:39 UTC (rev 2117)
+++ nagioscore/trunk/cgi/extinfo.c 2012-08-28 09:55:57 UTC (rev 2118)
@@ -51,7 +51,6 @@
extern int obsess_over_services;
extern int obsess_over_hosts;
extern int enable_flap_detection;
-extern int enable_failure_prediction;
extern int process_performance_data;
extern int buffer_stats[1][3];
@@ -854,19 +853,9 @@
/* flap detection enabled */
printf("<TR><TD CLASS='dataVar'>Flap Detection Enabled?</TD><TD CLASS='dataVal'>%s</TD></TR>\n", (enable_flap_detection == TRUE) ? "Yes" : "No");
-#ifdef PREDICT_FAILURES
- /* failure prediction enabled */
- printf("<TR><TD CLASS='dataVar'>Failure Prediction Enabled?</TD><TD CLASS='dataVal'>%s</TD></TR>\n", (enable_failure_prediction == TRUE) ? "Yes" : "No");
-#endif
-
/* process performance data */
printf("<TR><TD CLASS='dataVar'>Performance Data Being Processed?</TD><TD CLASS='dataVal'>%s</TD></TR>\n", (process_performance_data == TRUE) ? "Yes" : "No");
-#ifdef USE_OLDCRUD
- /* daemon mode */
- printf("<TR><TD CLASS='dataVar'>Running As A Daemon?</TD><TD CLASS='dataVal'>%s</TD></TR>\n", (daemon_mode == TRUE) ? "Yes" : "No");
-#endif
-
printf("</TABLE>\n");
printf("</TD></TR>\n");
printf("</TABLE>\n");
@@ -932,12 +921,6 @@
else
printf("<TR CLASS='command'><TD><img src='%s%s' border=0 ALT='Enable Flap Detection' TITLE='Enable Flap Detection'></td><td CLASS='command'><a href='%s?cmd_typ=%d'>Enable flap detection</a></td></tr>\n", url_images_path, ENABLED_ICON, COMMAND_CGI, CMD_ENABLE_FLAP_DETECTION);
-#ifdef PREDICT_FAILURES
- if(enable_failure_prediction == TRUE)
- printf("<TR CLASS='command'><TD><img src='%s%s' border=0 ALT='Disable Failure Prediction' TITLE='Disable Failure Prediction'></td><td CLASS='command'><a href='%s?cmd_typ=%d'>Disable failure prediction</a></td></tr>\n", url_images_path, DISABLED_ICON, COMMAND_CGI, CMD_DISABLE_FAILURE_PREDICTION);
- else
- printf("<TR CLASS='command'><TD><img src='%s%s' border=0 ALT='Enable Failure Prediction' TITLE='Enable Failure Prediction'></td><td CLASS='command'><a href='%s?cmd_typ=%d'>Enable failure prediction</a></td></tr>\n", url_images_path, ENABLED_ICON, COMMAND_CGI, CMD_ENABLE_FAILURE_PREDICTION);
-#endif
if(process_performance_data == TRUE)
printf("<TR CLASS='command'><TD><img src='%s%s' border=0 ALT='Disable Performance Data' TITLE='Disable Performance Data'></td><td CLASS='command'><a href='%s?cmd_typ=%d'>Disable performance data</a></td></tr>\n", url_images_path, DISABLED_ICON, COMMAND_CGI, CMD_DISABLE_PERFORMANCE_DATA);
else
Modified: nagioscore/trunk/common/objects.c
===================================================================
--- nagioscore/trunk/common/objects.c 2012-08-27 15:03:39 UTC (rev 2117)
+++ nagioscore/trunk/common/objects.c 2012-08-28 09:55:57 UTC (rev 2118)
@@ -387,7 +387,7 @@
/* add a new host definition */
-host *add_host(char *name, char *display_name, char *alias, char *address, char *check_period, int initial_state, double check_interval, double retry_interval, int max_attempts, int notify_up, int notify_down, int notify_unreachable, int notify_flapping, int notify_downtime, double notification_interval, double first_notification_delay, char *notification_period, int notifications_enabled, char *check_command, int checks_enabled, int accept_passive_checks, char *event_handler, int event_handler_enabled, int flap_detection_enabled, double low_flap_threshold, double high_flap_threshold, int flap_detection_on_up, int flap_detection_on_down, int flap_detection_on_unreachable, int stalk_on_up, int stalk_on_down, int stalk_on_unreachable, int process_perfdata, int failure_prediction_enabled, char *failure_prediction_options, int check_freshness, int freshness_threshold, char *notes, char *notes_url, char *action_url, char *icon_image, char *icon_image_alt, char *vrml_image, char *statusmap_image, int x_2d, int y_2d, int have_2d_coords, double x_3d, double y_3d, double z_3d, int have_3d_coords, int should_be_drawn, int retain_status_information, int retain_nonstatus_information, int obsess_over_host) {
+host *add_host(char *name, char *display_name, char *alias, char *address, char *check_period, int initial_state, double check_interval, double retry_interval, int max_attempts, int notify_up, int notify_down, int notify_unreachable, int notify_flapping, int notify_downtime, double notification_interval, double first_notification_delay, char *notification_period, int notifications_enabled, char *check_command, int checks_enabled, int accept_passive_checks, char *event_handler, int event_handler_enabled, int flap_detection_enabled, double low_flap_threshold, double high_flap_threshold, int flap_detection_on_up, int flap_detection_on_down, int flap_detection_on_unreachable, int stalk_on_up, int stalk_on_down, int stalk_on_unreachable, int process_perfdata, int check_freshness, int freshness_threshold, char *notes, char *notes_url, char *action_url, char *icon_image, char *icon_image_alt, char *vrml_image, char *statusmap_image, int x_2d, int y_2d, int have_2d_coords, double x_3d, double y_3d, double z_3d, int have_3d_coords, int should_be_drawn, int retain_status_information, int retain_nonstatus_information, int obsess_over_host) {
host *new_host = NULL;
timeperiod *tp;
int result = OK;
@@ -468,10 +468,6 @@
if((new_host->event_handler = (char *)strdup(event_handler)) == NULL)
result = ERROR;
}
- if(failure_prediction_options) {
- if((new_host->failure_prediction_options = (char *)strdup(failure_prediction_options)) == NULL)
- result = ERROR;
- }
if(notes) {
if((new_host->notes = (char *)strdup(notes)) == NULL)
result = ERROR;
@@ -528,7 +524,6 @@
new_host->checks_enabled = (checks_enabled > 0) ? TRUE : FALSE;
new_host->accept_passive_host_checks = (accept_passive_checks > 0) ? TRUE : FALSE;
new_host->event_handler_enabled = (event_handler_enabled > 0) ? TRUE : FALSE;
- new_host->failure_prediction_enabled = (failure_prediction_enabled > 0) ? TRUE : FALSE;
new_host->x_2d = x_2d;
new_host->y_2d = y_2d;
new_host->have_2d_coords = (have_2d_coords > 0) ? TRUE : FALSE;
@@ -622,7 +617,6 @@
my_free(new_host->action_url);
my_free(new_host->notes_url);
my_free(new_host->notes);
- my_free(new_host->failure_prediction_options);
my_free(new_host->event_handler);
my_free(new_host->host_check_command);
my_free(new_host->address);
@@ -1314,7 +1308,7 @@
/* add a new service to the list in memory */
-service *add_service(char *host_name, char *description, char *display_name, char *check_period, int initial_state, int max_attempts, int parallelize, int accept_passive_checks, double check_interval, double retry_interval, double notification_interval, double first_notification_delay, char *notification_period, int notify_recovery, int notify_unknown, int notify_warning, int notify_critical, int notify_flapping, int notify_downtime, int notifications_enabled, int is_volatile, char *event_handler, int event_handler_enabled, char *check_command, int checks_enabled, int flap_detection_enabled, double low_flap_threshold, double high_flap_threshold, int flap_detection_on_ok, int flap_detection_on_warning, int flap_detection_on_unknown, int flap_detection_on_critical, int stalk_on_ok, int stalk_on_warning, int stalk_on_unknown, int stalk_on_critical, int process_perfdata, int failure_prediction_enabled, char *failure_prediction_options, int check_freshness, int freshness_threshold, char *notes, char *notes_url, char *action_url, char *icon_image, char *icon_image_alt, int retain_status_information, int retain_nonstatus_information, int obsess_over_service) {
+service *add_service(char *host_name, char *description, char *display_name, char *check_period, int initial_state, int max_attempts, int parallelize, int accept_passive_checks, double check_interval, double retry_interval, double notification_interval, double first_notification_delay, char *notification_period, int notify_recovery, int notify_unknown, int notify_warning, int notify_critical, int notify_flapping, int notify_downtime, int notifications_enabled, int is_volatile, char *event_handler, int event_handler_enabled, char *check_command, int checks_enabled, int flap_detection_enabled, double low_flap_threshold, double high_flap_threshold, int flap_detection_on_ok, int flap_detection_on_warning, int flap_detection_on_unknown, int flap_detection_on_critical, int stalk_on_ok, int stalk_on_warning, int stalk_on_unknown, int stalk_on_critical, int process_perfdata, int check_freshness, int freshness_threshold, char *notes, char *notes_url, char *action_url, char *icon_image, char *icon_image_alt, int retain_status_information, int retain_nonstatus_information, int obsess_over_service) {
host *h;
timeperiod *cp = NULL, *np = NULL;
service *new_service = NULL;
@@ -1377,10 +1371,6 @@
if((new_service->event_handler = (char *)strdup(event_handler)) == NULL)
result = ERROR;
}
- if(failure_prediction_options) {
- if((new_service->failure_prediction_options = (char *)strdup(failure_prediction_options)) == NULL)
- result = ERROR;
- }
if(notes) {
if((new_service->notes = (char *)strdup(notes)) == NULL)
result = ERROR;
@@ -1436,7 +1426,6 @@
new_service->retain_nonstatus_information = (retain_nonstatus_information > 0) ? TRUE : FALSE;
new_service->notifications_enabled = (notifications_enabled > 0) ? TRUE : FALSE;
new_service->obsess_over_service = (obsess_over_service > 0) ? TRUE : FALSE;
- new_service->failure_prediction_enabled = (failure_prediction_enabled > 0) ? TRUE : FALSE;
#ifdef NSCORE
new_service->problem_has_been_acknowledged = FALSE;
new_service->acknowledgement_type = ACKNOWLEDGEMENT_NONE;
@@ -1511,7 +1500,6 @@
my_free(new_service->plugin_output);
my_free(new_service->long_plugin_output);
#endif
- my_free(new_service->failure_prediction_options);
my_free(new_service->event_handler);
my_free(new_service->service_check_command);
my_free(new_service->description);
@@ -2624,7 +2612,6 @@
free_objectlist(&this_host->escalation_list);
my_free(this_host->host_check_command);
my_free(this_host->event_handler);
- my_free(this_host->failure_prediction_options);
my_free(this_host->notes);
my_free(this_host->notes_url);
my_free(this_host->action_url);
@@ -2804,7 +2791,6 @@
free_objectlist(&this_service->exec_deps);
free_objectlist(&this_service->escalation_list);
my_free(this_service->event_handler);
- my_free(this_service->failure_prediction_options);
my_free(this_service->notes);
my_free(this_service->notes_url);
my_free(this_service->action_url);
Modified: nagioscore/trunk/contrib/convertcfg.c
===================================================================
--- nagioscore/trunk/contrib/convertcfg.c 2012-08-27 15:03:39 UTC (rev 2117)
+++ nagioscore/trunk/contrib/convertcfg.c 2012-08-28 09:55:57 UTC (rev 2118)
@@ -306,7 +306,6 @@
printf("\tnotifications_enabled\t\t1\t; Host notifications are enabled\n");
printf("\tevent_handler_enabled\t\t1\t; Host event handler is enabled\n");
printf("\tflap_detection_enabled\t\t1\t; Flap detection is enabled\n");
- /*printf("\tfailure_prediction_enabled\t1\t; Failure prediction is enabled\n");*/
printf("\tprocess_perf_data\t\t1\t; Process performance data\n");
printf("\tretain_status_information\t1\t; Retain status information across program restarts\n");
printf("\tretain_nonstatus_information\t1\t; Retain non-status information across program restarts\n");
@@ -427,7 +426,6 @@
printf("\tnotifications_enabled\t\t1\t; Service notifications are enabled\n");
printf("\tevent_handler_enabled\t\t1\t; Service event handler is enabled\n");
printf("\tflap_detection_enabled\t\t1\t; Flap detection is enabled\n");
- /*printf("\tfailure_prediction_enabled\t1\t; Failure prediction is enabled\n");*/
printf("\tprocess_perf_data\t\t1\t; Process performance data\n");
printf("\tretain_status_information\t1\t; Retain status information across program restarts\n");
printf("\tretain_nonstatus_information\t1\t; Retain non-status information across program restarts\n");
Modified: nagioscore/trunk/include/common.h
===================================================================
--- nagioscore/trunk/include/common.h 2012-08-27 15:03:39 UTC (rev 2117)
+++ nagioscore/trunk/include/common.h 2012-08-28 09:55:57 UTC (rev 2118)
@@ -155,9 +155,6 @@
#define CMD_DEL_HOST_DOWNTIME 78
#define CMD_DEL_SVC_DOWNTIME 79
-#define CMD_ENABLE_FAILURE_PREDICTION 80
-#define CMD_DISABLE_FAILURE_PREDICTION 81
-
#define CMD_ENABLE_PERFORMANCE_DATA 82
#define CMD_DISABLE_PERFORMANCE_DATA 83
Modified: nagioscore/trunk/include/nagios.h
===================================================================
--- nagioscore/trunk/include/nagios.h 2012-08-27 15:03:39 UTC (rev 2117)
+++ nagioscore/trunk/include/nagios.h 2012-08-28 09:55:57 UTC (rev 2118)
@@ -612,8 +612,6 @@
void disable_service_freshness_checks(void); /* disable service freshness checks */
void enable_host_freshness_checks(void); /* enable host freshness checks */
void disable_host_freshness_checks(void); /* disable host freshness checks */
-void enable_all_failure_prediction(void); /* enables failure prediction on a program-wide basis */
-void disable_all_failure_prediction(void); /* disables failure prediction on a program-wide basis */
void enable_performance_data(void); /* enables processing of performance data on a program-wide basis */
void disable_performance_data(void); /* disables processing of performance data on a program-wide basis */
void start_executing_host_checks(void); /* starts executing host checks */
Modified: nagioscore/trunk/include/nebstructs.h
===================================================================
--- nagioscore/trunk/include/nebstructs.h 2012-08-27 15:03:39 UTC (rev 2117)
+++ nagioscore/trunk/include/nebstructs.h 2012-08-28 09:55:57 UTC (rev 2118)
@@ -262,7 +262,6 @@
int passive_host_checks_enabled;
int event_handlers_enabled;
int flap_detection_enabled;
- int failure_prediction_enabled;
int process_performance_data;
int obsess_over_hosts;
int obsess_over_services;
Modified: nagioscore/trunk/include/objects.h
===================================================================
--- nagioscore/trunk/include/objects.h 2012-08-27 15:03:39 UTC (rev 2117)
+++ nagioscore/trunk/include/objects.h 2012-08-28 09:55:57 UTC (rev 2118)
@@ -302,8 +302,6 @@
int event_handler_enabled;
int retain_status_information;
int retain_nonstatus_information;
- int failure_prediction_enabled;
- char *failure_prediction_options;
int obsess_over_host;
char *notes;
char *notes_url;
@@ -446,8 +444,6 @@
int retain_nonstatus_information;
int notifications_enabled;
int obsess_over_service;
- int failure_prediction_enabled;
- char *failure_prediction_options;
char *notes;
char *notes_url;
char *action_url;
@@ -633,7 +629,7 @@
commandsmember *add_service_notification_command_to_contact(contact *, char *); /* adds a service notification command to a contact definition */
commandsmember *add_host_notification_command_to_contact(contact *, char *); /* adds a host notification command to a contact definition */
customvariablesmember *add_custom_variable_to_contact(contact *, char *, char *); /* adds a custom variable to a service definition */
-host *add_host(char *, char *, char *, char *, char *, int, double, double, int, int, int, int, int, int, double, double, char *, int, char *, int, int, char *, int, int, double, double, int, int, int, int, int, int, int, int, char *, int, int, char *, char *, char *, char *, char *, char *, char *, int, int, int, double, double, double, int, int, int, int, int); /* adds a host definition */
+host *add_host(char *name, char *display_name, char *alias, char *address, char *check_period, int initial_state, double check_interval, double retry_interval, int max_attempts, int notify_up, int notify_down, int notify_unreachable, int notify_flapping, int notify_downtime, double notification_interval, double first_notification_delay, char *notification_period, int notifications_enabled, char *check_command, int checks_enabled, int accept_passive_checks, char *event_handler, int event_handler_enabled, int flap_detection_enabled, double low_flap_threshold, double high_flap_threshold, int flap_detection_on_up, int flap_detection_on_down, int flap_detection_on_unreachable, int stalk_on_up, int stalk_on_down, int stalk_on_unreachable, int process_perfdata, int check_freshness, int freshness_threshold, char *notes, char *notes_url, char *action_url, char *icon_image, char *icon_image_alt, char *vrml_image, char *statusmap_image, int x_2d, int y_2d, int have_2d_coords, double x_3d, double y_3d, double z_3d, int have_3d_coords, int should_be_drawn, int retain_status_information, int retain_nonstatus_information, int obsess_over_host);
hostsmember *add_parent_host_to_host(host *, char *); /* adds a parent host to a host definition */
hostsmember *add_child_link_to_host(host *, host *); /* adds a child host to a host definition */
contactgroupsmember *add_contactgroup_to_host(host *, char *); /* adds a contactgroup to a host definition */
@@ -651,7 +647,7 @@
contactgroup *add_contactgroup(char *, char *); /* adds a contactgroup definition */
contactsmember *add_contact_to_contactgroup(contactgroup *, char *); /* adds a contact to a contact group definition */
command *add_command(char *, char *); /* adds a command definition */
-service *add_service(char *, char *, char *, char *, int, int, int, int, double, double, double, double, char *, int, int, int, int, int, int, int, int, char *, int, char *, int, int, double, double, int, int, int, int, int, int, int, int, int, int, char *, int, int, char *, char *, char *, char *, char *, int, int, int); /* adds a service definition */
+service *add_service(char *host_name, char *description, char *display_name, char *check_period, int initial_state, int max_attempts, int parallelize, int accept_passive_checks, double check_interval, double retry_interval, double notification_interval, double first_notification_delay, char *notification_period, int notify_recovery, int notify_unknown, int notify_warning, int notify_critical, int notify_flapping, int notify_downtime, int notifications_enabled, int is_volatile, char *event_handler, int event_handler_enabled, char *check_command, int checks_enabled, int flap_detection_enabled, double low_flap_threshold, double high_flap_threshold, int flap_detection_on_ok, int flap_detection_on_warning, int flap_detection_on_unknown, int flap_detection_on_critical, int stalk_on_ok, int stalk_on_warning, int stalk_on_unknown, int stalk_on_critical, int process_perfdata, int check_freshness, int freshness_threshold, char *notes, char *notes_url, char *action_url, char *icon_image, char *icon_image_alt, int retain_status_information, int retain_nonstatus_information, int obsess_over_service);
contactgroupsmember *add_contactgroup_to_service(service *, char *); /* adds a contact group to a service definition */
contactsmember *add_contact_to_service(service *, char *); /* adds a contact to a host definition */
serviceescalation *add_serviceescalation(char *, char *, int, int, double, char *, int, int, int, int); /* adds a service escalation definition */
Modified: nagioscore/trunk/include/statusdata.h
===================================================================
--- nagioscore/trunk/include/statusdata.h 2012-08-27 15:03:39 UTC (rev 2117)
+++ nagioscore/trunk/include/statusdata.h 2012-08-28 09:55:57 UTC (rev 2118)
@@ -89,7 +89,6 @@
double latency;
double execution_time;
int scheduled_downtime_depth;
- int failure_prediction_enabled;
int process_performance_data;
int obsess_over_host;
struct hoststatus_struct *next;
@@ -138,7 +137,6 @@
double latency;
double execution_time;
int scheduled_downtime_depth;
- int failure_prediction_enabled;
int process_performance_data;
int obsess_over_service;
struct servicestatus_struct *next;
Modified: nagioscore/trunk/t/var/objects.cache
===================================================================
(Binary files differ)
Modified: nagioscore/trunk/t/var/objects.cache.hosturgencies
===================================================================
--- nagioscore/trunk/t/var/objects.cache.hosturgencies 2012-08-27 15:03:39 UTC (rev 2117)
+++ nagioscore/trunk/t/var/objects.cache.hosturgencies 2012-08-28 09:55:57 UTC (rev 2118)
@@ -197,7 +197,6 @@
first_notification_delay 0.000000
stalking_options n
process_perf_data 1
- failure_prediction_enabled 1
retain_status_information 1
retain_nonstatus_information 1
}
@@ -229,7 +228,6 @@
first_notification_delay 0.000000
stalking_options n
process_perf_data 1
- failure_prediction_enabled 1
retain_status_information 1
retain_nonstatus_information 1
}
@@ -263,7 +261,6 @@
first_notification_delay 0.000000
stalking_options n
process_perf_data 1
- failure_prediction_enabled 1
retain_status_information 1
retain_nonstatus_information 1
}
@@ -297,7 +294,6 @@
first_notification_delay 0.000000
stalking_options n
process_perf_data 1
- failure_prediction_enabled 1
retain_status_information 1
retain_nonstatus_information 1
}
@@ -331,7 +327,6 @@
first_notification_delay 0.000000
stalking_options n
process_perf_data 1
- failure_prediction_enabled 1
retain_status_information 1
retain_nonstatus_information 1
}
Modified: nagioscore/trunk/t/var/objects.precache.expected
===================================================================
--- nagioscore/trunk/t/var/objects.precache.expected 2012-08-27 15:03:39 UTC (rev 2117)
+++ nagioscore/trunk/t/var/objects.precache.expected 2012-08-28 09:55:57 UTC (rev 2118)
@@ -116,7 +116,6 @@
first_notification_delay 0.000000
stalking_options n
process_perf_data 1
- failure_prediction_enabled 1
retain_status_information 1
retain_nonstatus_information 1
}
@@ -148,7 +147,6 @@
first_notification_delay 0.000000
stalking_options n
process_perf_data 1
- failure_prediction_enabled 1
retain_status_information 1
retain_nonstatus_information 1
}
@@ -180,7 +178,6 @@
first_notification_delay 0.000000
stalking_options n
process_perf_data 1
- failure_prediction_enabled 1
retain_status_information 1
retain_nonstatus_information 1
}
@@ -214,7 +211,6 @@
first_notification_delay 0.000000
stalking_options n
process_perf_data 1
- failure_prediction_enabled 1
retain_status_information 1
retain_nonstatus_information 1
}
@@ -248,7 +244,6 @@
first_notification_delay 0.000000
stalking_options n
process_perf_data 1
- failure_prediction_enabled 1
retain_status_information 1
retain_nonstatus_information 1
}
@@ -282,7 +277,6 @@
first_notification_delay 0.000000
stalking_options n
process_perf_data 1
- failure_prediction_enabled 1
retain_status_information 1
retain_nonstatus_information 1
}
@@ -316,7 +310,6 @@
first_notification_delay 0.000000
stalking_options n
process_perf_data 1
- failure_prediction_enabled 1
retain_status_information 1
retain_nonstatus_information 1
}
@@ -350,7 +343,6 @@
first_notification_delay 0.000000
stalking_options n
process_perf_data 1
- failure_prediction_enabled 1
retain_status_information 1
retain_nonstatus_information 1
}
Modified: nagioscore/trunk/t/var/status-hosturgencies.dat
===================================================================
--- nagioscore/trunk/t/var/status-hosturgencies.dat 2012-08-27 15:03:39 UTC (rev 2117)
+++ nagioscore/trunk/t/var/status-hosturgencies.dat 2012-08-28 09:55:57 UTC (rev 2118)
@@ -32,7 +32,6 @@
check_service_freshness=1
check_host_freshness=0
enable_flap_detection=1
- enable_failure_prediction=1
process_performance_data=0
global_host_event_handler=
global_service_event_handler=
@@ -102,7 +101,6 @@
passive_checks_enabled=1
event_handler_enabled=1
flap_detection_enabled=1
- failure_prediction_enabled=1
process_performance_data=1
obsess_over_host=1
last_update=1242341791
@@ -159,7 +157,6 @@
passive_checks_enabled=1
event_handler_enabled=1
flap_detection_enabled=1
- failure_prediction_enabled=1
process_performance_data=1
obsess_over_host=1
last_update=1242341791
@@ -216,7 +213,6 @@
passive_checks_enabled=1
event_handler_enabled=1
flap_detection_enabled=1
- failure_prediction_enabled=1
process_performance_data=1
obsess_over_host=1
last_update=1242341791
@@ -273,7 +269,6 @@
passive_checks_enabled=1
event_handler_enabled=1
flap_detection_enabled=1
- failure_prediction_enabled=1
process_performance_data=1
obsess_over_host=1
last_update=1242341791
@@ -332,7 +327,6 @@
problem_has_been_acknowledged=0
acknowledgement_type=0
flap_detection_enabled=1
- failure_prediction_enabled=1
process_performance_data=1
obsess_over_service=1
last_update=1242341791
@@ -391,7 +385,6 @@
problem_has_been_acknowledged=0
acknowledgement_type=0
flap_detection_enabled=1
- failure_prediction_enabled=1
process_performance_data=1
obsess_over_service=1
last_update=1242341791
@@ -450,7 +443,6 @@
problem_has_been_acknowledged=0
acknowledgement_type=0
flap_detection_enabled=1
- failure_prediction_enabled=1
process_performance_data=1
obsess_over_service=1
last_update=1242341791
@@ -509,7 +501,6 @@
problem_has_been_acknowledged=0
acknowledgement_type=0
flap_detection_enabled=1
- failure_prediction_enabled=1
process_performance_data=1
obsess_over_service=1
last_update=1242341791
Modified: nagioscore/trunk/t/var/status.dat
===================================================================
(Binary files differ)
Modified: nagioscore/trunk/xdata/xodtemplate.c
===================================================================
--- nagioscore/trunk/xdata/xodtemplate.c 2012-08-27 15:03:39 UTC (rev 2117)
+++ nagioscore/trunk/xdata/xodtemplate.c 2012-08-28 09:55:57 UTC (rev 2118)
@@ -1049,7 +1049,6 @@
new_host->notifications_enabled = TRUE;
new_host->notification_interval = 30.0;
new_host->process_perf_data = TRUE;
- new_host->failure_prediction_enabled = TRUE;
new_host->x_2d = -1;
new_host->y_2d = -1;
new_host->retain_status_information = TRUE;
@@ -1076,7 +1075,6 @@
new_service->notifications_enabled = TRUE;
new_service->notification_interval = 30.0;
new_service->process_perf_data = TRUE;
- new_service->failure_prediction_enabled = TRUE;
new_service->retain_status_information = TRUE;
new_service->retain_nonstatus_information = TRUE;
@@ -1114,7 +1112,24 @@
}
#undef xod_begin_def /* we don't need this anymore */
+static const char *xodtemplate_type_name(unsigned int id) {
+ static char *otype_name[] = {
+ "NONE", "timeperiod", "commmand", "contact", "contactgroup",
+ "host", "hostgroup", "service", "servicedependency",
+ "serviceescalation", "hostescalation", "hostdependency",
+ "hostextinfo", "serviceextinfo", "servicegroup"
+ };
+ if (id > ARRAY_SIZE(otype_name))
+ return otype_name[0];
+ return otype_name[id];
+ }
+
+static void xodtemplate_obsoleted(const char *var) {
+ logit(NSLOG_CONFIG_WARNING, TRUE, "Warning: %s is obsoleted and no longer has any effect in %s type objects\n",
+ var, xodtemplate_type_name(xodtemplate_current_object_type));
+ }
+
/* adds a property to an object definition */
int xodtemplate_add_object_property(char *input, int options) {
int result = OK;
@@ -2428,11 +2443,7 @@
temp_host->have_event_handler = TRUE;
}
else if(!strcmp(variable, "failure_prediction_options")) {
- if(strcmp(value, XODTEMPLATE_NULL)) {
- if((temp_host->failure_prediction_options = (char *)strdup(value)) == NULL)
- result = ERROR;
- }
- temp_host->have_failure_prediction_options = TRUE;
+ xodtemplate_obsoleted(variable);
}
else if(!strcmp(variable, "notes")) {
if(strcmp(value, XODTEMPLATE_NULL)) {
@@ -2646,8 +2657,7 @@
temp_host->have_process_perf_data = TRUE;
}
else if(!strcmp(variable, "failure_prediction_enabled")) {
- temp_host->failure_prediction_enabled = (atoi(value) > 0) ? TRUE : FALSE;
- temp_host->have_failure_prediction_enabled = TRUE;
+ xodtemplate_obsoleted(variable);
}
else if(!strcmp(variable, "2d_coords")) {
if((temp_ptr = strtok(value, ", ")) == NULL) {
@@ -2879,11 +2889,7 @@
temp_service->have_contacts = TRUE;
}
else if(!strcmp(variable, "failure_prediction_options")) {
- if(strcmp(value, XODTEMPLATE_NULL)) {
- if((temp_service->failure_prediction_options = (char *)strdup(value)) == NULL)
- result = ERROR;
- }
- temp_service->have_failure_prediction_options = TRUE;
+ xodtemplate_obsoleted(variable);
}
else if(!strcmp(variable, "notes")) {
if(strcmp(value, XODTEMPLATE_NULL)) {
@@ -3110,8 +3116,7 @@
temp_service->have_process_perf_data = TRUE;
}
else if(!strcmp(variable, "failure_prediction_enabled")) {
- temp_service->failure_prediction_enabled = (atoi(value) > 0) ? TRUE : FALSE;
- temp_service->have_failure_prediction_enabled = TRUE;
+ xodtemplate_obsoleted(variable);
}
else if(!strcmp(variable, "retain_status_information")) {
temp_service->retain_status_information = (atoi(value) > 0) ? TRUE : FALSE;
@@ -5129,7 +5134,6 @@
new_service->have_notification_period = temp_service->have_notification_period;
new_service->have_contact_groups = temp_service->have_contact_groups;
new_service->have_contacts = temp_service->have_contacts;
- new_service->have_failure_prediction_options = temp_service->have_failure_prediction_options;
new_service->have_notes = temp_service->have_notes;
new_service->have_notes_url = temp_service->have_notes_url;
new_service->have_action_url = temp_service->have_action_url;
@@ -5161,8 +5165,6 @@
error = TRUE;
if(temp_service->contacts != NULL && (new_service->contacts = (char *)strdup(temp_service->contacts)) == NULL)
error = TRUE;
- if(temp_service->failure_prediction_options != NULL && (new_service->failure_prediction_options = (char *)strdup(temp_service->failure_prediction_options)) == NULL)
- error = TRUE;
if(temp_service->notes != NULL && (new_service->notes = (char *)strdup(temp_service->notes)) == NULL)
error = TRUE;
if(temp_service->notes_url != NULL && (new_service->notes_url = (char *)strdup(temp_service->notes_url)) == NULL)
@@ -5187,7 +5189,6 @@
my_free(new_service->notification_period);
my_free(new_service->contact_groups);
my_free(new_service->contacts);
- my_free(new_service->failure_prediction_options);
my_free(new_service->notes);
my_free(new_service->notes_url);
my_free(new_service->action_url);
@@ -5256,8 +5257,6 @@
new_service->have_stalking_options = temp_service->have_stalking_options;
new_service->process_perf_data = temp_service->process_perf_data;
new_service->have_process_perf_data = temp_service->have_process_perf_data;
- new_service->failure_prediction_enabled = temp_service->failure_prediction_enabled;
- new_service->have_failure_prediction_enabled = temp_service->have_failure_prediction_enabled;
new_service->retain_status_information = temp_service->retain_status_information;
new_service->have_retain_status_information = temp_service->have_retain_status_information;
new_service->retain_nonstatus_information = temp_service->retain_nonstatus_information;
@@ -6734,11 +6733,6 @@
this_host->notification_period = (char *)strdup(template_host->notification_period);
this_host->have_notification_period = TRUE;
}
- if(this_host->have_failure_prediction_options == FALSE && template_host->have_failure_prediction_options == TRUE) {
- if(this_host->failure_prediction_options == NULL && template_host->failure_prediction_options != NULL)
- this_host->failure_prediction_options = (char *)strdup(template_host->failure_prediction_options);
- this_host->have_failure_prediction_options = TRUE;
- }
if(this_host->have_notes == FALSE && template_host->have_notes == TRUE) {
if(this_host->notes == NULL && template_host->notes != NULL)
this_host->notes = (char *)strdup(template_host->notes);
@@ -6862,10 +6856,6 @@
this_host->process_perf_data = template_host->process_perf_data;
this_host->have_process_perf_data = TRUE;
}
- if(this_host->have_failure_prediction_enabled == FALSE && template_host->have_failure_prediction_enabled == TRUE) {
- this_host->failure_prediction_enabled = template_host->failure_prediction_enabled;
- this_host->have_failure_prediction_enabled = TRUE;
- }
if(this_host->have_2d_coords == FALSE && template_host->have_2d_coords == TRUE) {
this_host->x_2d = template_host->x_2d;
this_host->y_2d = template_host->y_2d;
@@ -6989,11 +6979,6 @@
this_service->notification_period = (char *)strdup(template_service->notification_period);
this_service->have_notification_period = TRUE;
}
- if(this_service->have_failure_prediction_options == FALSE && template_service->have_failure_prediction_options == TRUE) {
- if(this_service->failure_prediction_options == NULL && template_service->failure_prediction_options != NULL)
- this_service->failure_prediction_options = (char *)strdup(template_service->failure_prediction_options);
- this_service->have_failure_prediction_options = TRUE;
- }
if(this_service->have_notes == FALSE && template_service->have_notes == TRUE) {
if(this_service->notes == NULL && template_service->notes != NULL)
this_service->notes = (char *)strdup(template_service->notes);
@@ -7118,10 +7103,6 @@
this_service->process_perf_data = template_service->process_perf_data;
this_service->have_process_perf_data = TRUE;
}
- if(this_service->have_failure_prediction_enabled == FALSE && template_service->have_failure_prediction_enabled == TRUE) {
- this_service->failure_prediction_enabled = template_service->failure_prediction_enabled;
- this_service->have_failure_prediction_enabled = TRUE;
- }
if(this_service->have_retain_status_information == FALSE && template_service->have_retain_status_information == TRUE) {
this_service->retain_status_information = template_service->retain_status_information;
this_service->have_retain_status_information = TRUE;
@@ -9009,7 +8990,7 @@
this_host->address = (char *)strdup(this_host->host_name);
/* add the host definition */
- new_host = add_host(this_host->host_name, this_host->display_name, this_host->alias, (this_host->address == NULL) ? this_host->host_name : this_host->address, this_host->check_period, this_host->initial_state, this_host->check_interval, this_host->retry_interval, this_host->max_check_attempts, this_host->notify_on_recovery, this_host->notify_on_down, this_host->notify_on_unreachable, this_host->notify_on_flapping, this_host->notify_on_downtime, this_host->notification_interval, this_host->first_notification_delay, this_host->notification_period, this_host->notifications_enabled, this_host->check_command, this_host->active_checks_enabled, this_host->passive_checks_enabled, this_host->event_handler, this_host->event_handler_enabled, this_host->flap_detection_enabled, this_host->low_flap_threshold, this_host->high_flap_threshold, this_host->flap_detection_on_up, this_host->flap_detection_on_down, this_host->flap_detection_on_unreachable, this_host->stalk_on_up, this_host->stalk_on_down, this_host->stalk_on_unreachable, this_host->process_perf_data, this_host->failure_prediction_enabled, this_host->failure_prediction_options, this_host->check_freshness, this_host->freshness_threshold, this_host->notes, this_host->notes_url, this_host->action_url, this_host->icon_image, this_host->icon_image_alt, this_host->vrml_image, this_host->statusmap_image, this_host->x_2d, this_host->y_2d, this_host->have_2d_coords, this_host->x_3d, this_host->y_3d, this_host->z_3d, this_host->have_3d_coords, TRUE, this_host->retain_status_information, this_host->retain_nonstatus_information, this_host->obsess_over_host);
+ new_host = add_host(this_host->host_name, this_host->display_name, this_host->alias, (this_host->address == NULL) ? this_host->host_name : this_host->address, this_host->check_period, this_host->initial_state, this_host->check_interval, this_host->retry_interval, this_host->max_check_attempts, this_host->notify_on_recovery, this_host->notify_on_down, this_host->notify_on_unreachable, this_host->notify_on_flapping, this_host->notify_on_downtime, this_host->notification_interval, this_host->first_notification_delay, this_host->notification_period, this_host->notifications_enabled, this_host->check_command, this_host->active_checks_enabled, this_host->passive_checks_enabled, this_host->event_handler, this_host->event_handler_enabled, this_host->flap_detection_enabled, this_host->low_flap_threshold, this_host->high_flap_threshold, this_host->flap_detection_on_up, this_host->flap_detection_on_down, this_host->flap_detection_on_unreachable, this_host->stalk_on_up, this_host->stalk_on_down, this_host->stalk_on_unreachable, this_host->process_perf_data, this_host->check_freshness, this_host->freshness_threshold, this_host->notes, this_host->notes_url, this_host->action_url, this_host->icon_image, this_host->icon_image_alt, this_host->vrml_image, this_host->statusmap_image, this_host->x_2d, this_host->y_2d, this_host->have_2d_coords, this_host->x_3d, this_host->y_3d, this_host->z_3d, this_host->have_3d_coords, TRUE, this_host->retain_status_information, this_host->retain_nonstatus_information, this_host->obsess_over_host);
/* return with an error if we couldn't add the host */
@@ -9086,7 +9067,7 @@
return OK;
/* add the service */
- new_service = add_service(this_service->host_name, this_service->service_description, this_service->display_name, this_service->check_period, this_service->initial_state, this_service->max_check_attempts, this_service->parallelize_check, this_service->passive_checks_enabled, this_service->check_interval, this_service->retry_interval, this_service->notification_interval, this_service->first_notification_delay, this_service->notification_period, this_service->notify_on_recovery, this_service->notify_on_unknown, this_service->notify_on_warning, this_service->notify_on_critical, this_service->notify_on_flapping, this_service->notify_on_downtime, this_service->notifications_enabled, this_service->is_volatile, this_service->event_handler, this_service->event_handler_enabled, this_service->check_command, this_service->active_checks_enabled, this_service->flap_detection_enabled, this_service->low_flap_threshold, this_service->high_flap_threshold, this_service->flap_detection_on_ok, this_service->flap_detection_on_warning, this_service->flap_detection_on_unknown, this_service->flap_detection_on_critical, this_service->stalk_on_ok, this_service->stalk_on_warning, this_service->stalk_on_unknown, this_service->stalk_on_critical, this_service->process_perf_data, this_service->failure_prediction_enabled, this_service->failure_prediction_options, this_service->check_freshness, this_service->freshness_threshold, this_service->notes, this_service->notes_url, this_service->action_url, this_service->icon_image, this_service->icon_image_alt, this_service->retain_status_information, this_service->retain_nonstatus_information, this_service->obsess_over_service);
+ new_service = add_service(this_service->host_name, this_service->service_description, this_service->display_name, this_service->check_period, this_service->initial_state, this_service->max_check_attempts, this_service->parallelize_check, this_service->passive_checks_enabled, this_service->check_interval, this_service->retry_interval, this_service->notification_interval, this_service->first_notification_delay, this_service->notification_period, this_service->notify_on_recovery, this_service->notify_on_unknown, this_service->notify_on_warning, this_service->notify_on_critical, this_service->notify_on_flapping, this_service->notify_on_downtime, this_service->notifications_enabled, this_service->is_volatile, this_service->event_handler, this_service->event_handler_enabled, this_service->check_command, this_service->active_checks_enabled, this_service->flap_detection_enabled, this_service->low_flap_threshold, this_service->high_flap_threshold, this_service->flap_detection_on_ok, this_service->flap_detection_on_warning, this_service->flap_detection_on_unknown, this_service->flap_detection_on_critical, this_service->stalk_on_ok, this_service->stalk_on_warning, this_service->stalk_on_unknown, this_service->stalk_on_critical, this_service->process_perf_data, this_service->check_freshness, this_service->freshness_threshold, this_service->notes, this_service->notes_url, this_service->action_url, this_service->icon_image, this_service->icon_image_alt, this_service->retain_status_information, this_service->retain_nonstatus_information, this_service->obsess_over_service);
/* return with an error if we couldn't add the service */
if(new_service == NULL) {
@@ -10415,8 +10396,6 @@
fprintf(fp, "\tcontact_groups\t%s\n", temp_host->contact_groups);
if(temp_host->notification_period)
fprintf(fp, "\tnotification_period\t%s\n", temp_host->notification_period);
- if(temp_host->failure_prediction_options)
- fprintf(fp, "\tfailure_prediction_options\t%s\n", temp_host->failure_prediction_options);
fprintf(fp, "\tinitial_state\t");
if(temp_host->initial_state == HOST_DOWN)
fprintf(fp, "d\n");
@@ -10477,7 +10456,6 @@
fprintf(fp, "n");
fprintf(fp, "\n");
fprintf(fp, "\tprocess_perf_data\t%d\n", temp_host->process_perf_data);
- fprintf(fp, "\tfailure_prediction_enabled\t%d\n", temp_host->failure_prediction_enabled);
if(temp_host->icon_image)
fprintf(fp, "\ticon_image\t%s\n", temp_host->icon_image);
if(temp_host->icon_image_alt)
@@ -10534,8 +10512,6 @@
fprintf(fp, "\tcontact_groups\t%s\n", temp_service->contact_groups);
if(temp_service->notification_period)
fprintf(fp, "\tnotification_period\t%s\n", temp_service->notification_period);
- if(temp_service->failure_prediction_options)
- fprintf(fp, "\tfailure_prediction_options\t%s\n", temp_service->failure_prediction_options);
fprintf(fp, "\tinitial_state\t");
if(temp_service->initial_state == STATE_WARNING)
fprintf(fp, "w\n");
@@ -10606,7 +10582,6 @@
fprintf(fp, "n");
fprintf(fp, "\n");
fprintf(fp, "\tprocess_perf_data\t%d\n", temp_service->process_perf_data);
- fprintf(fp, "\tfailure_prediction_enabled\t%d\n", temp_service->failure_prediction_enabled);
if(temp_service->icon_image)
fprintf(fp, "\ticon_image\t%s\n", temp_service->icon_image);
if(temp_service->icon_image_alt)
@@ -11583,7 +11558,6 @@
my_free(this_host->contact_groups);
my_free(this_host->contacts);
my_free(this_host->notification_period);
- my_free(this_host->failure_prediction_options);
my_free(this_host->notes);
my_free(this_host->notes_url);
my_free(this_host->action_url);
@@ -11623,7 +11597,6 @@
my_free(this_service->notification_period);
my_free(this_service->contact_groups);
my_free(this_service->contacts);
- my_free(this_service->failure_prediction_options);
my_free(this_service->notes);
my_free(this_service->notes_url);
my_free(this_service->action_url);
Modified: nagioscore/trunk/xdata/xodtemplate.h
===================================================================
--- nagioscore/trunk/xdata/xodtemplate.h 2012-08-27 15:03:39 UTC (rev 2117)
+++ nagioscore/trunk/xdata/xodtemplate.h 2012-08-28 09:55:57 UTC (rev 2118)
@@ -250,8 +250,6 @@
int stalk_on_down;
int stalk_on_unreachable;
int process_perf_data;
- int failure_prediction_enabled;
- char *failure_prediction_options;
char *notes;
char *notes_url;
char *action_url;
@@ -277,7 +275,6 @@
int have_contact_groups;
int have_contacts;
int have_notification_period;
- int have_failure_prediction_options;
int have_notes;
int have_notes_url;
int have_action_url;
@@ -306,7 +303,6 @@
int have_first_notification_delay;
int have_stalking_options;
int have_process_perf_data;
- int have_failure_prediction_enabled;
int have_2d_coords;
int have_3d_coords;
int have_retain_status_information;
@@ -396,8 +392,6 @@
int stalk_on_warning;
int stalk_on_critical;
int process_perf_data;
- int failure_prediction_enabled;
- char *failure_prediction_options;
char *notes;
char *notes_url;
char *action_url;
@@ -419,7 +413,6 @@
int have_notification_period;
int have_contact_groups;
int have_contacts;
- int have_failure_prediction_options;
int have_notes;
int have_notes_url;
int have_action_url;
@@ -449,7 +442,6 @@
int have_first_notification_delay;
int have_stalking_options;
int have_process_perf_data;
- int have_failure_prediction_enabled;
int have_retain_status_information;
int have_retain_nonstatus_information;
Modified: nagioscore/trunk/xdata/xrddefault.c
===================================================================
--- nagioscore/trunk/xdata/xrddefault.c 2012-08-27 15:03:39 UTC (rev 2117)
+++ nagioscore/trunk/xdata/xrddefault.c 2012-08-28 09:55:57 UTC (rev 2118)
@@ -53,7 +53,6 @@
extern int obsess_over_services;
extern int obsess_over_hosts;
extern int enable_flap_detection;
-extern int enable_failure_prediction;
extern int process_performance_data;
extern int check_service_freshness;
extern int check_host_freshness;
@@ -335,7 +334,6 @@
fprintf(fp, "check_service_freshness=%d\n", check_service_freshness);
fprintf(fp, "check_host_freshness=%d\n", check_host_freshn...
[truncated message content] |