|
[-]
[+]
|
Changed |
icinga.changes
|
|
|
|
[-]
[+]
|
Changed |
icinga.spec
^
|
|
|
|
[-]
[+]
|
Changed |
icinga-1.10.1.tar.bz2/Changelog
^
|
| @@ -13,6 +13,24 @@
- idoutils: ${source}/module/idoutils/config/updates
* package locations may differ!
+1.10.1 - 04/11/2013
+
+ENHANCEMENTS
+
+* core: add line number information to config verification error messages #4967 - GB
+
+FIXES
+
+* core/idoutils: revert check_source attribute due to mod_gearman manipulating in-memory checkresult list #4958 - MF
+ ** classic ui/idoutils schema: functionality is kept only for Icinga 2 support
+
+* classic ui: fix context help on mouseover in cmd.cgi (Marc-Christian Petersen) #4971 - MF
+* classic ui: correction of colspan value in status.cgi (Bernd Arnold) #4961 - MF
+
+* idoutils: fix pgsql update script #4953 - AW/MF
+* idoutils: fix logentry_type being integer, not unsigned long (thx David Mikulksi) #4953 - MF
+
+
1.10.0 - 24/10/2013
* idoutils: slahistory table must be removed manually after enable_sla removal #4363
|
|
[-]
[+]
|
Changed |
icinga-1.10.1.tar.bz2/Makefile.in
^
|
| @@ -91,7 +91,7 @@
###############################
# Global
###############################
-ICINGA_VERSION=1.10.0
+ICINGA_VERSION=1.10.1
CP=@CP@
|
|
[-]
[+]
|
Changed |
icinga-1.10.1.tar.bz2/THANKS
^
|
| @@ -232,6 +232,7 @@
* Remi Paulmier
* Alex Peeters
* Bruce Pennypacker
+* Marc-Christian Petersen
* James "Showkilr" Peterson
* Cary Petterborg
* Bill Pier
|
|
[-]
[+]
|
Changed |
icinga-1.10.1.tar.bz2/base/broker.c
^
|
| @@ -258,7 +258,7 @@
/* send host check data to broker */
-int broker_host_check(int type, int flags, int attr, host *hst, int check_type, int state, int state_type, struct timeval start_time, struct timeval end_time, char *cmd, double latency, double exectime, int timeout, int early_timeout, int retcode, char *cmdline, char *output, char *long_output, char *perfdata, struct timeval *timestamp, char *check_source) {
+int broker_host_check(int type, int flags, int attr, host *hst, int check_type, int state, int state_type, struct timeval start_time, struct timeval end_time, char *cmd, double latency, double exectime, int timeout, int early_timeout, int retcode, char *cmdline, char *output, char *long_output, char *perfdata, struct timeval *timestamp) {
char *command_buf = NULL;
char *command_name = NULL;
char *command_args = NULL;
@@ -317,7 +317,7 @@
/* send service check data to broker */
-int broker_service_check(int type, int flags, int attr, service *svc, int check_type, struct timeval start_time, struct timeval end_time, char *cmd, double latency, double exectime, int timeout, int early_timeout, int retcode, char *cmdline, struct timeval *timestamp, char *check_source) {
+int broker_service_check(int type, int flags, int attr, service *svc, int check_type, struct timeval start_time, struct timeval end_time, char *cmd, double latency, double exectime, int timeout, int early_timeout, int retcode, char *cmdline, struct timeval *timestamp) {
char *command_buf = NULL;
char *command_name = NULL;
char *command_args = NULL;
|
|
[-]
[+]
|
Changed |
icinga-1.10.1.tar.bz2/base/checks.c
^
|
| @@ -541,7 +541,7 @@
end_time.tv_usec = 0L;
/* send data to event broker */
- neb_result = broker_service_check(NEBTYPE_SERVICECHECK_ASYNC_PRECHECK, NEBFLAG_NONE, NEBATTR_NONE, svc, SERVICE_CHECK_ACTIVE, start_time, end_time, svc->service_check_command, svc->latency, 0.0, 0, FALSE, 0, NULL, NULL, NULL);
+ neb_result = broker_service_check(NEBTYPE_SERVICECHECK_ASYNC_PRECHECK, NEBFLAG_NONE, NEBATTR_NONE, svc, SERVICE_CHECK_ACTIVE, start_time, end_time, svc->service_check_command, svc->latency, 0.0, 0, FALSE, 0, NULL, NULL);
if (neb_result == NEBERROR_CALLBACKCANCEL || neb_result == NEBERROR_CALLBACKOVERRIDE) {
log_debug_info(DEBUGL_CHECKS, 0, "Check of service '%s' on host '%s' was %s by a module\n",
@@ -610,7 +610,7 @@
#ifdef USE_EVENT_BROKER
/* send data to event broker */
- neb_result = broker_service_check(NEBTYPE_SERVICECHECK_INITIATE, NEBFLAG_NONE, NEBATTR_NONE, svc, SERVICE_CHECK_ACTIVE, start_time, end_time, svc->service_check_command, svc->latency, 0.0, service_check_timeout, FALSE, 0, processed_command, NULL, NULL);
+ neb_result = broker_service_check(NEBTYPE_SERVICECHECK_INITIATE, NEBFLAG_NONE, NEBATTR_NONE, svc, SERVICE_CHECK_ACTIVE, start_time, end_time, svc->service_check_command, svc->latency, 0.0, service_check_timeout, FALSE, 0, processed_command, NULL);
my_free(svc->processed_command);
svc->processed_command = strdup(processed_command);
@@ -1194,7 +1194,6 @@
log_debug_info(DEBUGL_CHECKS, 2, "Short Output: %s\n", (temp_service->plugin_output == NULL) ? "NULL" : temp_service->plugin_output);
log_debug_info(DEBUGL_CHECKS, 2, "Long Output: %s\n", (temp_service->long_plugin_output == NULL) ? "NULL" : temp_service->long_plugin_output);
log_debug_info(DEBUGL_CHECKS, 2, "Perf Data: %s\n", (temp_service->perf_data == NULL) ? "NULL" : temp_service->perf_data);
- log_debug_info(DEBUGL_CHECKS, 2, "Check Source: %s\n", (queued_check_result->source == NULL) ? "NULL" : queued_check_result->source);
/* grab the return code */
temp_service->current_state = queued_check_result->return_code;
@@ -1818,15 +1817,9 @@
}
}
- /* set check source */
- if (queued_check_result->source != NULL)
- temp_service->check_source = (char *)strdup(queued_check_result->source);
- else
- temp_service->check_source = (char *)strdup("(local)");
-
#ifdef USE_EVENT_BROKER
/* send data to event broker */
- broker_service_check(NEBTYPE_SERVICECHECK_PROCESSED, NEBFLAG_NONE, NEBATTR_NONE, temp_service, temp_service->check_type, queued_check_result->start_time, queued_check_result->finish_time, temp_service->service_check_command, temp_service->latency, temp_service->execution_time, service_check_timeout, queued_check_result->early_timeout, queued_check_result->return_code, temp_service->processed_command, NULL, temp_service->check_source);
+ broker_service_check(NEBTYPE_SERVICECHECK_PROCESSED, NEBFLAG_NONE, NEBATTR_NONE, temp_service, temp_service->check_type, queued_check_result->start_time, queued_check_result->finish_time, temp_service->service_check_command, temp_service->latency, temp_service->execution_time, service_check_timeout, queued_check_result->early_timeout, queued_check_result->return_code, temp_service->processed_command, NULL);
#endif
/* set the checked flag */
@@ -2855,7 +2848,7 @@
/* send data to event broker */
end_time.tv_sec = 0L;
end_time.tv_usec = 0L;
- broker_host_check(NEBTYPE_HOSTCHECK_INITIATE, NEBFLAG_NONE, NEBATTR_NONE, hst, HOST_CHECK_ACTIVE, hst->current_state, hst->state_type, start_time, end_time, hst->host_check_command, hst->latency, 0.0, host_check_timeout, FALSE, 0, NULL, NULL, NULL, NULL, NULL, NULL);
+ broker_host_check(NEBTYPE_HOSTCHECK_INITIATE, NEBFLAG_NONE, NEBATTR_NONE, hst, HOST_CHECK_ACTIVE, hst->current_state, hst->state_type, start_time, end_time, hst->host_check_command, hst->latency, 0.0, host_check_timeout, FALSE, 0, NULL, NULL, NULL, NULL, NULL);
#endif
/* execute the host check */
@@ -2874,7 +2867,7 @@
#ifdef USE_EVENT_BROKER
/* send data to event broker */
- broker_host_check(NEBTYPE_HOSTCHECK_PROCESSED, NEBFLAG_NONE, NEBATTR_NONE, hst, HOST_CHECK_ACTIVE, hst->current_state, hst->state_type, start_time, end_time, hst->host_check_command, hst->latency, hst->execution_time, host_check_timeout, FALSE, hst->current_state, hst->processed_command, hst->plugin_output, hst->long_plugin_output, hst->perf_data, NULL, hst->check_source);
+ broker_host_check(NEBTYPE_HOSTCHECK_PROCESSED, NEBFLAG_NONE, NEBATTR_NONE, hst, HOST_CHECK_ACTIVE, hst->current_state, hst->state_type, start_time, end_time, hst->host_check_command, hst->latency, hst->execution_time, host_check_timeout, FALSE, hst->current_state, hst->processed_command, hst->plugin_output, hst->long_plugin_output, hst->perf_data, NULL);
#endif
return result;
@@ -2916,7 +2909,7 @@
end_time.tv_usec = 0L;
/* send data to event broker */
- neb_result = broker_host_check(NEBTYPE_HOSTCHECK_SYNC_PRECHECK, NEBFLAG_NONE, NEBATTR_NONE, hst, HOST_CHECK_ACTIVE, hst->current_state, hst->state_type, start_time, end_time, hst->host_check_command, hst->latency, 0.0, host_check_timeout, FALSE, 0, NULL, NULL, NULL, NULL, NULL, NULL);
+ neb_result = broker_host_check(NEBTYPE_HOSTCHECK_SYNC_PRECHECK, NEBFLAG_NONE, NEBATTR_NONE, hst, HOST_CHECK_ACTIVE, hst->current_state, hst->state_type, start_time, end_time, hst->host_check_command, hst->latency, 0.0, host_check_timeout, FALSE, 0, NULL, NULL, NULL, NULL, NULL);
/*
* neb module wants to cancel/override the host check
@@ -2966,11 +2959,11 @@
/* send data to event broker */
end_time.tv_sec = 0L;
end_time.tv_usec = 0L;
- broker_host_check(NEBTYPE_HOSTCHECK_RAW_START, NEBFLAG_NONE, NEBATTR_NONE, hst, HOST_CHECK_ACTIVE, return_result, hst->state_type, start_time, end_time, hst->host_check_command, 0.0, 0.0, host_check_timeout, early_timeout, result, processed_command, hst->plugin_output, hst->long_plugin_output, hst->perf_data, NULL, NULL);
+ broker_host_check(NEBTYPE_HOSTCHECK_RAW_START, NEBFLAG_NONE, NEBATTR_NONE, hst, HOST_CHECK_ACTIVE, return_result, hst->state_type, start_time, end_time, hst->host_check_command, 0.0, 0.0, host_check_timeout, early_timeout, result, processed_command, hst->plugin_output, hst->long_plugin_output, hst->perf_data, NULL);
#endif
log_debug_info(DEBUGL_COMMANDS, 1, "Raw host check command: %s\n", raw_command);
- log_debug_info(DEBUGL_COMMANDS, 0, "Processed host check command: %s\n", processed_command);
+ log_debug_info(DEBUGL_COMMANDS, 0, "Processed host check ommand: %s\n", processed_command);
my_free(raw_command);
/* clear plugin output and performance data buffers */
@@ -3037,12 +3030,9 @@
/* high resolution end time for event broker */
gettimeofday(&end_time, NULL);
- /* set check source */
- hst->check_source = (char *)strdup("(local)");
-
#ifdef USE_EVENT_BROKER
/* send data to event broker */
- broker_host_check(NEBTYPE_HOSTCHECK_RAW_END, NEBFLAG_NONE, NEBATTR_NONE, hst, HOST_CHECK_ACTIVE, return_result, hst->state_type, start_time, end_time, hst->host_check_command, 0.0, exectime, host_check_timeout, early_timeout, result, processed_command, hst->plugin_output, hst->long_plugin_output, hst->perf_data, NULL, hst->check_source);
+ broker_host_check(NEBTYPE_HOSTCHECK_RAW_END, NEBFLAG_NONE, NEBATTR_NONE, hst, HOST_CHECK_ACTIVE, return_result, hst->state_type, start_time, end_time, hst->host_check_command, 0.0, exectime, host_check_timeout, early_timeout, result, processed_command, hst->plugin_output, hst->long_plugin_output, hst->perf_data, NULL);
#endif
log_debug_info(DEBUGL_CHECKS, 0, "** Sync host check done: state=%d\n", return_result);
@@ -3187,7 +3177,7 @@
end_time.tv_usec = 0L;
/* send data to event broker */
- neb_result = broker_host_check(NEBTYPE_HOSTCHECK_ASYNC_PRECHECK, NEBFLAG_NONE, NEBATTR_NONE, hst, HOST_CHECK_ACTIVE, hst->current_state, hst->state_type, start_time, end_time, hst->host_check_command, hst->latency, 0.0, host_check_timeout, FALSE, 0, NULL, NULL, NULL, NULL, NULL, NULL);
+ neb_result = broker_host_check(NEBTYPE_HOSTCHECK_ASYNC_PRECHECK, NEBFLAG_NONE, NEBATTR_NONE, hst, HOST_CHECK_ACTIVE, hst->current_state, hst->state_type, start_time, end_time, hst->host_check_command, hst->latency, 0.0, host_check_timeout, FALSE, 0, NULL, NULL, NULL, NULL, NULL);
/* neb module wants to cancel the host check - the check will be rescheduled for a later time by the scheduling logic */
if (neb_result == NEBERROR_CALLBACKCANCEL)
@@ -3309,7 +3299,7 @@
#ifdef USE_EVENT_BROKER
/* send data to event broker */
- broker_host_check(NEBTYPE_HOSTCHECK_INITIATE, NEBFLAG_NONE, NEBATTR_NONE, hst, HOST_CHECK_ACTIVE, hst->current_state, hst->state_type, start_time, end_time, hst->host_check_command, hst->latency, 0.0, host_check_timeout, FALSE, 0, processed_command, NULL, NULL, NULL, NULL, NULL);
+ broker_host_check(NEBTYPE_HOSTCHECK_INITIATE, NEBFLAG_NONE, NEBATTR_NONE, hst, HOST_CHECK_ACTIVE, hst->current_state, hst->state_type, start_time, end_time, hst->host_check_command, hst->latency, 0.0, host_check_timeout, FALSE, 0, processed_command, NULL, NULL, NULL, NULL);
#endif
/* reset latency (permanent value for this check will get set later) */
@@ -3507,7 +3497,6 @@
log_debug_info(DEBUGL_CHECKS, 2, "\tLatency: %.3f\n", temp_host->latency);
log_debug_info(DEBUGL_CHECKS, 2, "\tReturn Status: %d\n", queued_check_result->return_code);
log_debug_info(DEBUGL_CHECKS, 2, "\tOutput: %s\n", (queued_check_result == NULL) ? "NULL" : queued_check_result->output);
- log_debug_info(DEBUGL_CHECKS, 2, "\tSource: %s\n", (queued_check_result == NULL) ? "NULL" : queued_check_result->source);
/* decrement the number of host checks still out there... */
if (queued_check_result->check_type == HOST_CHECK_ACTIVE && currently_running_host_checks > 0)
@@ -3663,11 +3652,6 @@
result = HOST_DOWN;
}
- /* set check source */
- if (queued_check_result->source != NULL)
- temp_host->check_source = (char *)strdup(queued_check_result->source);
- else
- temp_host->check_source = (char *)strdup("(local)");
/******************* PROCESS THE CHECK RESULTS ******************/
@@ -3687,7 +3671,7 @@
#ifdef USE_EVENT_BROKER
/* send data to event broker */
- broker_host_check(NEBTYPE_HOSTCHECK_PROCESSED, NEBFLAG_NONE, NEBATTR_NONE, temp_host, temp_host->check_type, temp_host->current_state, temp_host->state_type, start_time_hires, end_time_hires, temp_host->host_check_command, temp_host->latency, temp_host->execution_time, host_check_timeout, queued_check_result->early_timeout, queued_check_result->return_code, temp_host->processed_command, temp_host->plugin_output, temp_host->long_plugin_output, temp_host->perf_data, NULL, temp_host->check_source);
+ broker_host_check(NEBTYPE_HOSTCHECK_PROCESSED, NEBFLAG_NONE, NEBATTR_NONE, temp_host, temp_host->check_type, temp_host->current_state, temp_host->state_type, start_time_hires, end_time_hires, temp_host->host_check_command, temp_host->latency, temp_host->execution_time, host_check_timeout, queued_check_result->early_timeout, queued_check_result->return_code, temp_host->processed_command, temp_host->plugin_output, temp_host->long_plugin_output, temp_host->perf_data, NULL);
#endif
return OK;
|
|
[-]
[+]
|
Changed |
icinga-1.10.1.tar.bz2/base/config.c
^
|
| @@ -31,6 +31,7 @@
#include "../include/broker.h"
#include "../include/nebmods.h"
#include "../include/nebmodules.h"
+#include "../xdata/xodtemplate.h"
extern char *log_file;
@@ -1713,6 +1714,7 @@
if (test_scheduling == TRUE)
gettimeofday(&tv[2], NULL);
+ purge_debuginfo();
/********************************************/
/* check global event handler commands... */
@@ -1951,7 +1953,7 @@
/* we couldn't find an associated host! */
if (!temp_host) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Host '%s' specified in service '%s' not defined anywhere!", temp_service->host_name, temp_service->description);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Host '%s' specified in service '%s' (%s) not defined anywhere!", temp_service->host_name, temp_service->description, format_debuginfo(temp_service));
errors++;
}
@@ -1972,7 +1974,7 @@
temp_command = find_command(temp_command_name);
if (temp_command == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Event handler command '%s' specified in service '%s' for host '%s' not defined anywhere", temp_command_name, temp_service->description, temp_service->host_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Event handler command '%s' specified in service '%s' for host '%s' (%s) not defined anywhere", temp_command_name, temp_service->description, temp_service->host_name, format_debuginfo(temp_service));
errors++;
}
@@ -1990,7 +1992,7 @@
temp_command = find_command(temp_command_name);
if (temp_command == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Service check command '%s' specified in service '%s' for host '%s' not defined anywhere!", temp_command_name, temp_service->description, temp_service->host_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Service check command '%s' specified in service '%s' for host '%s' (%s) not defined anywhere!", temp_command_name, temp_service->description, temp_service->host_name, format_debuginfo(temp_service));
errors++;
}
@@ -2001,7 +2003,7 @@
/* check for sane recovery options */
if (temp_service->notify_on_recovery == TRUE && temp_service->notify_on_warning == FALSE && temp_service->notify_on_critical == FALSE) {
- logit(NSLOG_VERIFICATION_WARNING, TRUE, "Warning: Recovery notification option in service '%s' for host '%s' doesn't make any sense - specify warning and/or critical options as well", temp_service->description, temp_service->host_name);
+ logit(NSLOG_VERIFICATION_WARNING, TRUE, "Warning: Recovery notification option in service '%s' for host '%s' (%s) doesn't make any sense - specify warning and/or critical options as well", temp_service->description, temp_service->host_name, format_debuginfo(temp_service));
warnings++;
}
@@ -2011,7 +2013,7 @@
temp_contact = find_contact(temp_contactsmember->contact_name);
if (temp_contact == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Contact '%s' specified in service '%s' for host '%s' is not defined anywhere!", temp_contactsmember->contact_name, temp_service->description, temp_service->host_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Contact '%s' specified in service '%s' for host '%s' (%s) is not defined anywhere!", temp_contactsmember->contact_name, temp_service->description, temp_service->host_name, format_debuginfo(temp_service));
errors++;
}
@@ -2025,7 +2027,7 @@
temp_contactgroup = find_contactgroup(temp_contactgroupsmember->group_name);
if (temp_contactgroup == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Contact group '%s' specified in service '%s' for host '%s' is not defined anywhere!", temp_contactgroupsmember->group_name, temp_service->description, temp_service->host_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Contact group '%s' specified in service '%s' for host '%s' (%s) is not defined anywhere!", temp_contactgroupsmember->group_name, temp_service->description, temp_service->host_name, format_debuginfo(temp_service));
errors++;
}
@@ -2035,18 +2037,18 @@
/* check to see if there is at least one contact/group */
if (temp_service->contacts == NULL && temp_service->contact_groups == NULL) {
- logit(NSLOG_VERIFICATION_WARNING, TRUE, "Warning: Service '%s' on host '%s' has no default contacts or contactgroups defined!", temp_service->description, temp_service->host_name);
+ logit(NSLOG_VERIFICATION_WARNING, TRUE, "Warning: Service '%s' on host '%s' (%s) has no default contacts or contactgroups defined!", temp_service->description, temp_service->host_name, format_debuginfo(temp_service));
warnings++;
}
/* verify service check timeperiod */
if (temp_service->check_period == NULL) {
- logit(NSLOG_VERIFICATION_WARNING, TRUE, "Warning: Service '%s' on host '%s' has no check time period defined!", temp_service->description, temp_service->host_name);
+ logit(NSLOG_VERIFICATION_WARNING, TRUE, "Warning: Service '%s' on host '%s' (%s) has no check time period defined!", temp_service->description, temp_service->host_name, format_debuginfo(temp_service));
warnings++;
} else {
temp_timeperiod = find_timeperiod(temp_service->check_period);
if (temp_timeperiod == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Check period '%s' specified for service '%s' on host '%s' is not defined anywhere!", temp_service->check_period, temp_service->description, temp_service->host_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Check period '%s' specified for service '%s' on host '%s' (%s) is not defined anywhere!", temp_service->check_period, temp_service->description, temp_service->host_name, format_debuginfo(temp_service));
errors++;
}
@@ -2056,14 +2058,14 @@
/* check service notification timeperiod */
if (temp_service->notification_period == NULL) {
- logit(NSLOG_VERIFICATION_WARNING, TRUE, "Warning: Service '%s' on host '%s' has no notification time period defined!", temp_service->description, temp_service->host_name);
+ logit(NSLOG_VERIFICATION_WARNING, TRUE, "Warning: Service '%s' on host '%s' (%s) has no notification time period defined!", temp_service->description, temp_service->host_name, format_debuginfo(temp_service));
warnings++;
}
else {
temp_timeperiod = find_timeperiod(temp_service->notification_period);
if (temp_timeperiod == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Notification period '%s' specified for service '%s' on host '%s' is not defined anywhere!", temp_service->notification_period, temp_service->description, temp_service->host_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Notification period '%s' specified for service '%s' on host '%s' (%s) is not defined anywhere!", temp_service->notification_period, temp_service->description, temp_service->host_name, format_debuginfo(temp_service));
errors++;
}
@@ -2073,14 +2075,14 @@
/* see if the notification interval is less than the check interval */
if (temp_service->notification_interval < temp_service->check_interval && temp_service->notification_interval != 0) {
- logit(NSLOG_VERIFICATION_WARNING, TRUE, "Warning: Service '%s' on host '%s' has a notification interval less than its check interval! Notifications are only re-sent after checks are made, so the effective notification interval will be that of the check interval.", temp_service->description, temp_service->host_name);
+ logit(NSLOG_VERIFICATION_WARNING, TRUE, "Warning: Service '%s' on host '%s' (%s) has a notification interval less than its check interval! Notifications are only re-sent after checks are made, so the effective notification interval will be that of the check interval.", temp_service->description, temp_service->host_name, format_debuginfo(temp_service));
warnings++;
}
/* check for illegal characters in service description */
if (use_precached_objects == FALSE) {
if (contains_illegal_object_chars(temp_service->description) == TRUE) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: The description string for service '%s' on host '%s' contains one or more illegal characters.", temp_service->description, temp_service->host_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: The description string for service '%s' on host '%s' (%s) contains one or more illegal characters.", temp_service->description, temp_service->host_name, format_debuginfo(temp_service));
errors++;
}
}
@@ -2109,7 +2111,7 @@
/* make sure each host has at least one service associated with it */
if(temp_host->total_services == 0 && verify_config >= 2) {
- logit(NSLOG_VERIFICATION_WARNING, TRUE, "Warning: Host '%s' has no services associated with it!", temp_host->name);
+ logit(NSLOG_VERIFICATION_WARNING, TRUE, "Warning: Host '%s' (%s) has no services associated with it!", temp_host->name, format_debuginfo(temp_host));
warnings++;
}
@@ -2124,7 +2126,7 @@
temp_command = find_command(temp_command_name);
if (temp_command == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Event handler command '%s' specified for host '%s' not defined anywhere", temp_command_name, temp_host->name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Event handler command '%s' specified for host '%s' (%s) not defined anywhere", temp_command_name, temp_host->name, format_debuginfo(temp_host));
errors++;
}
@@ -2145,7 +2147,7 @@
temp_command = find_command(temp_command_name);
if (temp_command == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Host check command '%s' specified for host '%s' is not defined anywhere!", temp_command_name, temp_host->name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Host check command '%s' specified for host '%s' (%s) is not defined anywhere!", temp_command_name, temp_host->name, format_debuginfo(temp_host));
errors++;
}
@@ -2159,7 +2161,7 @@
if (temp_host->check_period != NULL) {
temp_timeperiod = find_timeperiod(temp_host->check_period);
if (temp_timeperiod == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Check period '%s' specified for host '%s' is not defined anywhere!", temp_host->check_period, temp_host->name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Check period '%s' specified for host '%s' (%s) is not defined anywhere!", temp_host->check_period, temp_host->name, format_debuginfo(temp_host));
errors++;
}
@@ -2173,7 +2175,7 @@
temp_contact = find_contact(temp_contactsmember->contact_name);
if (temp_contact == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Contact '%s' specified in host '%s' is not defined anywhere!", temp_contactsmember->contact_name, temp_host->name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Contact '%s' specified in host '%s' (%s) is not defined anywhere!", temp_contactsmember->contact_name, temp_host->name, format_debuginfo(temp_host));
errors++;
}
@@ -2187,7 +2189,7 @@
temp_contactgroup = find_contactgroup(temp_contactgroupsmember->group_name);
if (temp_contactgroup == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Contact group '%s' specified in host '%s' is not defined anywhere!", temp_contactgroupsmember->group_name, temp_host->name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Contact group '%s' specified in host '%s' (%s) is not defined anywhere!", temp_contactgroupsmember->group_name, temp_host->name, format_debuginfo(temp_host));
errors++;
}
@@ -2197,7 +2199,7 @@
/* check to see if there is at least one contact/group */
if (temp_host->contacts == NULL && temp_host->contact_groups == NULL) {
- logit(NSLOG_VERIFICATION_WARNING, TRUE, "Warning: Host '%s' has no default contacts or contactgroups defined!", temp_host->name);
+ logit(NSLOG_VERIFICATION_WARNING, TRUE, "Warning: Host '%s' (%s) has no default contacts or contactgroups defined!", temp_host->name, format_debuginfo(temp_host));
warnings++;
}
@@ -2205,7 +2207,7 @@
if (temp_host->notification_period != NULL) {
temp_timeperiod = find_timeperiod(temp_host->notification_period);
if (temp_timeperiod == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Notification period '%s' specified for host '%s' is not defined anywhere!", temp_host->notification_period, temp_host->name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Notification period '%s' specified for host '%s' (%s) is not defined anywhere!", temp_host->notification_period, temp_host->name, format_debuginfo(temp_host));
errors++;
}
@@ -2217,7 +2219,7 @@
for (temp_hostsmember = temp_host->parent_hosts; temp_hostsmember != NULL; temp_hostsmember = temp_hostsmember->next) {
if ((temp_host2 = find_host(temp_hostsmember->host_name)) == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: '%s' is not a valid parent for host '%s'!", temp_hostsmember->host_name, temp_host->name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: '%s' is not a valid parent for host '%s' (%s)!", temp_hostsmember->host_name, temp_host->name, format_debuginfo(temp_host));
errors++;
}
@@ -2230,14 +2232,14 @@
/* check for sane recovery options */
if (temp_host->notify_on_recovery == TRUE && temp_host->notify_on_down == FALSE && temp_host->notify_on_unreachable == FALSE) {
- logit(NSLOG_VERIFICATION_WARNING, TRUE, "Warning: Recovery notification option in host '%s' definition doesn't make any sense - specify down and/or unreachable options as well", temp_host->name);
+ logit(NSLOG_VERIFICATION_WARNING, TRUE, "Warning: Recovery notification option in host '%s' (%s) definition doesn't make any sense - specify down and/or unreachable options as well", temp_host->name, format_debuginfo(temp_host));
warnings++;
}
/* check for illegal characters in host name */
if (use_precached_objects == FALSE) {
if (contains_illegal_object_chars(temp_host->name) == TRUE) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: The name of host '%s' contains one or more illegal characters.", temp_host->name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: The name of host '%s' (%s) contains one or more illegal characters.", temp_host->name, format_debuginfo(temp_host));
errors++;
}
}
@@ -2260,7 +2262,7 @@
temp_host = find_host(temp_hostsmember->host_name);
if (temp_host == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Host '%s' specified in host group '%s' is not defined anywhere!", temp_hostsmember->host_name, temp_hostgroup->group_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Host '%s' specified in host group '%s' (%s) is not defined anywhere!", temp_hostsmember->host_name, temp_hostgroup->group_name, format_debuginfo(temp_hostgroup));
errors++;
}
@@ -2275,7 +2277,7 @@
/* check for illegal characters in hostgroup name */
if (use_precached_objects == FALSE) {
if (contains_illegal_object_chars(temp_hostgroup->group_name) == TRUE) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: The name of hostgroup '%s' contains one or more illegal characters.", temp_hostgroup->group_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: The name of hostgroup '%s' (%s) contains one or more illegal characters.", temp_hostgroup->group_name, format_debuginfo(temp_hostgroup));
errors++;
}
}
@@ -2297,7 +2299,7 @@
temp_service = find_service(temp_servicesmember->host_name, temp_servicesmember->service_description);
if (temp_service == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Service '%s' on host '%s' specified in service group '%s' is not defined anywhere!", temp_servicesmember->service_description, temp_servicesmember->host_name, temp_servicegroup->group_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Service '%s' on host '%s' specified in service group '%s' (%s) is not defined anywhere!", temp_servicesmember->service_description, temp_servicesmember->host_name, temp_servicegroup->group_name, format_debuginfo(temp_servicegroup));
errors++;
}
@@ -2312,7 +2314,7 @@
/* check for illegal characters in servicegroup name */
if (use_precached_objects == FALSE) {
if (contains_illegal_object_chars(temp_servicegroup->group_name) == TRUE) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: The name of servicegroup '%s' contains one or more illegal characters.", temp_servicegroup->group_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: The name of servicegroup '%s' (%s) contains one or more illegal characters.", temp_servicegroup->group_name, format_debuginfo(temp_servicegroup));
errors++;
}
}
@@ -2336,7 +2338,7 @@
/* check service notification commands */
if (temp_contact->service_notification_commands == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Contact '%s' has no service notification commands defined!", temp_contact->name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Contact '%s' (%s) has no service notification commands defined!", temp_contact->name, format_debuginfo(temp_contact));
errors++;
} else for (temp_commandsmember = temp_contact->service_notification_commands; temp_commandsmember != NULL; temp_commandsmember = temp_commandsmember->next) {
@@ -2348,7 +2350,7 @@
temp_command = find_command(temp_command_name);
if (temp_command == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Service notification command '%s' specified for contact '%s' is not defined anywhere!", temp_command_name, temp_contact->name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Service notification command '%s' specified for contact '%s' (%s) is not defined anywhere!", temp_command_name, temp_contact->name, format_debuginfo(temp_contact));
errors++;
}
@@ -2360,7 +2362,7 @@
/* check host notification commands */
if (temp_contact->host_notification_commands == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Contact '%s' has no host notification commands defined!", temp_contact->name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Contact '%s' (%s) has no host notification commands defined!", temp_contact->name, format_debuginfo(temp_contact));
errors++;
} else for (temp_commandsmember = temp_contact->host_notification_commands; temp_commandsmember != NULL; temp_commandsmember = temp_commandsmember->next) {
@@ -2372,7 +2374,7 @@
temp_command = find_command(temp_command_name);
if (temp_command == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Host notification command '%s' specified for contact '%s' is not defined anywhere!", temp_command_name, temp_contact->name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Host notification command '%s' specified for contact '%s' (%s) is not defined anywhere!", temp_command_name, temp_contact->name, format_debuginfo(temp_contact));
errors++;
}
@@ -2384,14 +2386,14 @@
/* check service notification timeperiod */
if (temp_contact->service_notification_period == NULL) {
- logit(NSLOG_VERIFICATION_WARNING, TRUE, "Warning: Contact '%s' has no service notification time period defined!", temp_contact->name);
+ logit(NSLOG_VERIFICATION_WARNING, TRUE, "Warning: Contact '%s' (%s) has no service notification time period defined!", temp_contact->name, format_debuginfo(temp_contact));
warnings++;
}
else {
temp_timeperiod = find_timeperiod(temp_contact->service_notification_period);
if (temp_timeperiod == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Service notification period '%s' specified for contact '%s' is not defined anywhere!", temp_contact->service_notification_period, temp_contact->name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Service notification period '%s' specified for contact '%s' (%s) is not defined anywhere!", temp_contact->service_notification_period, temp_contact->name, format_debuginfo(temp_contact));
errors++;
}
@@ -2401,14 +2403,14 @@
/* check host notification timeperiod */
if (temp_contact->host_notification_period == NULL) {
- logit(NSLOG_VERIFICATION_WARNING, TRUE, "Warning: Contact '%s' has no host notification time period defined!", temp_contact->name);
+ logit(NSLOG_VERIFICATION_WARNING, TRUE, "Warning: Contact '%s' (%s) has no host notification time period defined!", temp_contact->name, format_debuginfo(temp_contact));
warnings++;
}
else {
temp_timeperiod = find_timeperiod(temp_contact->host_notification_period);
if (temp_timeperiod == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Host notification period '%s' specified for contact '%s' is not defined anywhere!", temp_contact->host_notification_period, temp_contact->name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Host notification period '%s' specified for contact '%s' (%s) is not defined anywhere!", temp_contact->host_notification_period, temp_contact->name, format_debuginfo(temp_contact));
errors++;
}
@@ -2418,20 +2420,20 @@
/* check for sane host recovery options */
if (temp_contact->notify_on_host_recovery == TRUE && temp_contact->notify_on_host_down == FALSE && temp_contact->notify_on_host_unreachable == FALSE) {
- logit(NSLOG_VERIFICATION_WARNING, TRUE, "Warning: Host recovery notification option for contact '%s' doesn't make any sense - specify down and/or unreachable options as well", temp_contact->name);
+ logit(NSLOG_VERIFICATION_WARNING, TRUE, "Warning: Host recovery notification option for contact '%s' (%s) doesn't make any sense - specify down and/or unreachable options as well", temp_contact->name, format_debuginfo(temp_contact));
warnings++;
}
/* check for sane service recovery options */
if (temp_contact->notify_on_service_recovery == TRUE && temp_contact->notify_on_service_critical == FALSE && temp_contact->notify_on_service_warning == FALSE) {
- logit(NSLOG_VERIFICATION_WARNING, TRUE, "Warning: Service recovery notification option for contact '%s' doesn't make any sense - specify critical and/or warning options as well", temp_contact->name);
+ logit(NSLOG_VERIFICATION_WARNING, TRUE, "Warning: Service recovery notification option for contact '%s' (%s) doesn't make any sense - specify critical and/or warning options as well", temp_contact->name, format_debuginfo(temp_contact));
warnings++;
}
/* check for illegal characters in contact name */
if (use_precached_objects == FALSE) {
if (contains_illegal_object_chars(temp_contact->name) == TRUE) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: The name of contact '%s' contains one or more illegal characters.", temp_contact->name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: The name of contact '%s' (%s) contains one or more illegal characters.", temp_contact->name, format_debuginfo(temp_contact));
errors++;
}
}
@@ -2454,7 +2456,7 @@
temp_contact = find_contact(temp_contactsmember->contact_name);
if (temp_contact == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Contact '%s' specified in contact group '%s' is not defined anywhere!", temp_contactsmember->contact_name, temp_contactgroup->group_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Contact '%s' specified in contact group '%s' (%s) is not defined anywhere!", temp_contactsmember->contact_name, temp_contactgroup->group_name, format_debuginfo(temp_contactgroup));
errors++;
}
@@ -2469,7 +2471,7 @@
/* check for illegal characters in contactgroup name */
if (use_precached_objects == FALSE) {
if (contains_illegal_object_chars(temp_contactgroup->group_name) == TRUE) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: The name of contact group '%s' contains one or more illegal characters.", temp_contactgroup->group_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: The name of contact group '%s' (%s) contains one or more illegal characters.", temp_contactgroup->group_name, format_debuginfo(temp_contactgroup));
errors++;
}
}
@@ -2491,7 +2493,7 @@
/* find the service */
temp_service = find_service(temp_se->host_name, temp_se->description);
if (temp_service == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Service '%s' on host '%s' specified in service escalation is not defined anywhere!", temp_se->description, temp_se->host_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Service '%s' on host '%s' specified in service escalation (%s) is not defined anywhere!", temp_se->description, temp_se->host_name, format_debuginfo(temp_se));
errors++;
}
@@ -2502,7 +2504,7 @@
if (temp_se->escalation_period != NULL) {
temp_timeperiod = find_timeperiod(temp_se->escalation_period);
if (temp_timeperiod == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Escalation period '%s' specified in service escalation for service '%s' on host '%s' is not defined anywhere!", temp_se->escalation_period, temp_se->description, temp_se->host_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Escalation period '%s' specified in service escalation for service '%s' on host '%s' (%s) is not defined anywhere!", temp_se->escalation_period, temp_se->description, temp_se->host_name, format_debuginfo(temp_se));
errors++;
}
@@ -2516,7 +2518,7 @@
/* find the contact */
temp_contact = find_contact(temp_contactsmember->contact_name);
if (temp_contact == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Contact '%s' specified in service escalation for service '%s' on host '%s' is not defined anywhere!", temp_contactsmember->contact_name, temp_se->description, temp_se->host_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Contact '%s' specified in service escalation for service '%s' on host '%s' (%s) is not defined anywhere!", temp_contactsmember->contact_name, temp_se->description, temp_se->host_name, format_debuginfo(temp_se));
errors++;
}
@@ -2530,7 +2532,7 @@
temp_contactgroup = find_contactgroup(temp_contactgroupsmember->group_name);
if (temp_contactgroup == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Contact group '%s' specified in service escalation for service '%s' on host '%s' is not defined anywhere!", temp_contactgroupsmember->group_name, temp_se->description, temp_se->host_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Contact group '%s' specified in service escalation for service '%s' on host '%s' (%s) is not defined anywhere!", temp_contactgroupsmember->group_name, temp_se->description, temp_se->host_name, format_debuginfo(temp_se));
errors++;
}
@@ -2544,7 +2546,7 @@
/* find the host */
temp_host = find_host(temp_escalation_condition->host_name);
if (temp_host == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Host '%s' specified in service escalation condition is not defined anywhere!", temp_escalation_condition->host_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Host '%s' specified in service escalation condition (%s) is not defined anywhere!", temp_escalation_condition->host_name, format_debuginfo(temp_se));
errors++;
}
@@ -2552,7 +2554,7 @@
/* find the service */
temp_service = find_service(temp_escalation_condition->host_name, temp_escalation_condition->service_description);
if (temp_service == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Service '%s' on host '%s' specified in service escalation is not defined anywhere!", temp_escalation_condition->service_description, temp_escalation_condition->host_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Service '%s' on host '%s' specified in service escalation (%s) is not defined anywhere!", temp_escalation_condition->service_description, temp_escalation_condition->host_name, format_debuginfo(temp_se));
errors++;
}
}
@@ -2576,7 +2578,7 @@
/* find the dependent service */
temp_service = find_service(temp_sd->dependent_host_name, temp_sd->dependent_service_description);
if (temp_service == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Dependent service '%s' on host '%s' specified in service dependency for service '%s' on host '%s' is not defined anywhere!", temp_sd->dependent_service_description, temp_sd->dependent_host_name, temp_sd->service_description, temp_sd->host_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Dependent service '%s' on host '%s' specified in service dependency for service '%s' on host '%s' (%s) is not defined anywhere!", temp_sd->dependent_service_description, temp_sd->dependent_host_name, temp_sd->service_description, temp_sd->host_name, format_debuginfo(temp_sd));
errors++;
}
@@ -2586,7 +2588,7 @@
/* find the service we're depending on */
temp_service2 = find_service(temp_sd->host_name, temp_sd->service_description);
if (temp_service2 == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Service '%s' on host '%s' specified in service dependency for service '%s' on host '%s' is not defined anywhere!", temp_sd->service_description, temp_sd->host_name, temp_sd->dependent_service_description, temp_sd->dependent_host_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Service '%s' on host '%s' specified in service dependency for service '%s' on host '%s' (%s) is not defined anywhere!", temp_sd->service_description, temp_sd->host_name, temp_sd->dependent_service_description, temp_sd->dependent_host_name, format_debuginfo(temp_sd));
errors++;
}
@@ -2595,7 +2597,7 @@
/* make sure they're not the same service */
if (temp_service == temp_service2) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Service dependency definition for service '%s' on host '%s' is circular (it depends on itself)!", temp_sd->dependent_service_description, temp_sd->dependent_host_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Service dependency definition for service '%s' on host '%s' (%s) is circular (it depends on itself)!", temp_sd->dependent_service_description, temp_sd->dependent_host_name, format_debuginfo(temp_sd));
errors++;
}
@@ -2603,7 +2605,7 @@
if (temp_sd->dependency_period != NULL) {
temp_timeperiod = find_timeperiod(temp_sd->dependency_period);
if (temp_timeperiod == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Dependency period '%s' specified in service dependency for service '%s' on host '%s' is not defined anywhere!", temp_sd->dependency_period, temp_sd->dependent_service_description, temp_sd->dependent_host_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Dependency period '%s' specified in service dependency for service '%s' on host '%s' (%s) is not defined anywhere!", temp_sd->dependency_period, temp_sd->dependent_service_description, temp_sd->dependent_host_name, format_debuginfo(temp_sd));
errors++;
}
@@ -2639,7 +2641,7 @@
if (temp_he->escalation_period != NULL) {
temp_timeperiod = find_timeperiod(temp_he->escalation_period);
if (temp_timeperiod == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Escalation period '%s' specified in host escalation for host '%s' is not defined anywhere!", temp_he->escalation_period, temp_he->host_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Escalation period '%s' specified in host escalation for host '%s' (%s) is not defined anywhere!", temp_he->escalation_period, temp_he->host_name, format_debuginfo(temp_he));
errors++;
}
@@ -2653,7 +2655,7 @@
/* find the contact*/
temp_contact = find_contact(temp_contactsmember->contact_name);
if (temp_contact == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Contact '%s' specified in host escalation for host '%s' is not defined anywhere!", temp_contactsmember->contact_name, temp_he->host_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Contact '%s' specified in host escalation for host '%s' (%s) is not defined anywhere!", temp_contactsmember->contact_name, temp_he->host_name, format_debuginfo(temp_he));
errors++;
}
@@ -2667,7 +2669,7 @@
temp_contactgroup = find_contactgroup(temp_contactgroupsmember->group_name);
if (temp_contactgroup == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Contact group '%s' specified in host escalation for host '%s' is not defined anywhere!", temp_contactgroupsmember->group_name, temp_he->host_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Contact group '%s' specified in host escalation for host '%s' (%s) is not defined anywhere!", temp_contactgroupsmember->group_name, temp_he->host_name, format_debuginfo(temp_he));
errors++;
}
@@ -2681,7 +2683,7 @@
/* find the host */
temp_host = find_host(temp_escalation_condition->host_name);
if (temp_host == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Host '%s' specified in service escalation condition is not defined anywhere!", temp_escalation_condition->host_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Host '%s' specified in service escalation condition (%s) is not defined anywhere!", temp_escalation_condition->host_name, format_debuginfo(temp_he));
errors++;
}
@@ -2689,7 +2691,7 @@
/* find the service */
temp_service = find_service(temp_escalation_condition->host_name, temp_escalation_condition->service_description);
if (temp_service == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Service '%s' on host '%s' specified in service escalation is not defined anywhere!", temp_escalation_condition->service_description, temp_escalation_condition->host_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Service '%s' on host '%s' specified in service escalation (%s) is not defined anywhere!", temp_escalation_condition->service_description, temp_escalation_condition->host_name, format_debuginfo(temp_he));
errors++;
}
}
@@ -2713,7 +2715,7 @@
/* find the dependent host */
temp_host = find_host(temp_hd->dependent_host_name);
if (temp_host == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Dependent host specified in host dependency for host '%s' is not defined anywhere!", temp_hd->dependent_host_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Dependent host specified in host dependency for host '%s' (%s) is not defined anywhere!", temp_hd->dependent_host_name, format_debuginfo(temp_hd));
errors++;
}
@@ -2723,7 +2725,7 @@
/* find the host we're depending on */
temp_host2 = find_host(temp_hd->host_name);
if (temp_host2 == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Host specified in host dependency for host '%s' is not defined anywhere!", temp_hd->dependent_host_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Host specified in host dependency for host '%s' (%s) is not defined anywhere!", temp_hd->dependent_host_name, format_debuginfo(temp_hd));
errors++;
}
@@ -2732,7 +2734,7 @@
/* make sure they're not the same host */
if (temp_host == temp_host2) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Host dependency definition for host '%s' is circular (it depends on itself)!", temp_hd->dependent_host_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Host dependency definition for host '%s' (%s) is circular (it depends on itself)!", temp_hd->dependent_host_name, format_debuginfo(temp_hd));
errors++;
}
@@ -2740,7 +2742,7 @@
if (temp_hd->dependency_period != NULL) {
temp_timeperiod = find_timeperiod(temp_hd->dependency_period);
if (temp_timeperiod == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Dependency period '%s' specified in host dependency for host '%s' is not defined anywhere!", temp_hd->dependency_period, temp_hd->dependent_host_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Dependency period '%s' specified in host dependency for host '%s' (%s) is not defined anywhere!", temp_hd->dependency_period, temp_hd->dependent_host_name, format_debuginfo(temp_hd));
errors++;
}
@@ -2765,7 +2767,7 @@
/* check for illegal characters in command name */
if (use_precached_objects == FALSE) {
if (contains_illegal_object_chars(temp_command->name) == TRUE) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: The name of command '%s' contains one or more illegal characters.", temp_command->name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: The name of command '%s' (%s) contains one or more illegal characters.", temp_command->name, format_debuginfo(temp_command));
errors++;
}
}
@@ -2787,7 +2789,7 @@
/* check for illegal characters in timeperiod name */
if (use_precached_objects == FALSE) {
if (contains_illegal_object_chars(temp_timeperiod->name) == TRUE) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: The name of time period '%s' contains one or more illegal characters.", temp_timeperiod->name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: The name of time period '%s' (%s) contains one or more illegal characters.", temp_timeperiod->name, format_debuginfo(temp_timeperiod));
errors++;
}
}
@@ -2797,7 +2799,7 @@
temp_timeperiod2 = find_timeperiod(temp_timeperiodexclusion->timeperiod_name);
if (temp_timeperiod2 == NULL) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Excluded time period '%s' specified in timeperiod '%s' is not defined anywhere!", temp_timeperiodexclusion->timeperiod_name, temp_timeperiod->name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: Excluded time period '%s' specified in timeperiod '%s' (%s) is not defined anywhere!", temp_timeperiodexclusion->timeperiod_name, temp_timeperiod->name, format_debuginfo(temp_timeperiod));
errors++;
}
@@ -2821,7 +2823,7 @@
/* check for illegal characters in module name */
if (use_precached_objects == FALSE) {
if (contains_illegal_object_chars(temp_module->name) == TRUE) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: The name of module '%s' contains one or more illegal characters.", temp_module->name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: The name of module '%s' (%s) contains one or more illegal characters.", temp_module->name, format_debuginfo(temp_module));
errors++;
}
}
@@ -2964,7 +2966,7 @@
found = check_for_circular_servicedependency_path(temp_sd, temp_sd, EXECUTION_DEPENDENCY);
if (found == TRUE) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: A circular execution dependency (which could result in a deadlock) exists for service '%s' on host '%s'!", temp_sd->service_description, temp_sd->host_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: A circular execution dependency (which could result in a deadlock) exists for service '%s' on host '%s' (%s)!", temp_sd->service_description, temp_sd->host_name, format_debuginfo(temp_sd));
errors++;
}
}
@@ -2978,7 +2980,7 @@
found = check_for_circular_servicedependency_path(temp_sd, temp_sd, NOTIFICATION_DEPENDENCY);
if (found == TRUE) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: A circular notification dependency (which could result in a deadlock) exists for service '%s' on host '%s'!", temp_sd->service_description, temp_sd->host_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: A circular notification dependency (which could result in a deadlock) exists for service '%s' on host '%s' (%s)!", temp_sd->service_description, temp_sd->host_name, format_debuginfo(temp_sd));
errors++;
}
}
@@ -2992,7 +2994,7 @@
found = check_for_circular_hostdependency_path(temp_hd, temp_hd, EXECUTION_DEPENDENCY);
if (found == TRUE) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: A circular execution dependency (which could result in a deadlock) exists for host '%s'!", temp_hd->host_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: A circular execution dependency (which could result in a deadlock) exists for host '%s' (%s)!", temp_hd->host_name, format_debuginfo(temp_hd));
errors++;
}
}
@@ -3006,7 +3008,7 @@
found = check_for_circular_hostdependency_path(temp_hd, temp_hd, NOTIFICATION_DEPENDENCY);
if (found == TRUE) {
- logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: A circular notification dependency (which could result in a deadlock) exists for host '%s'!", temp_hd->host_name);
+ logit(NSLOG_VERIFICATION_ERROR, TRUE, "Error: A circular notification dependency (which could result in a deadlock) exists for host '%s' (%s)!", temp_hd->host_name, format_debuginfo(temp_hd));
errors++;
}
}
@@ -3018,4 +3020,3 @@
return (errors > 0) ? ERROR : OK;
}
-
|
|
[-]
[+]
|
Changed |
icinga-1.10.1.tar.bz2/base/utils.c
^
|
| @@ -2933,8 +2933,6 @@
new_cr->return_code = atoi(val);
else if (!strcmp(var, "output"))
new_cr->output = (char *)strdup(val);
- else if (!strcmp(var, "source"))
- new_cr->source = (char *)strdup(val);
}
}
@@ -3031,7 +3029,6 @@
info->exited_ok = TRUE;
info->return_code = 0;
info->output = NULL;
- info->source = NULL;
info->next = NULL;
return OK;
|
|
[-]
[+]
|
Changed |
icinga-1.10.1.tar.bz2/cgi/cmd.c
^
|
| @@ -944,7 +944,7 @@
void print_help_box(char *content) {
- printf("<img src='%s%s' onMouseOver=\"return tooltip('<table border='0' width='100%%' height='100%%'>", url_images_path, CONTEXT_HELP_ICON);
+ printf("<img src='%s%s' onMouseOver=\"return tooltip('<table border=0 width=100%% height=100%%>", url_images_path, CONTEXT_HELP_ICON);
printf("<tr><td>%s</td></tr>", content);
printf("</table>', ' Help', 'border:1, width:500, xoffset:-250, yoffset:25, bordercolor:#333399, title_padding:2px, titletextcolor:#FFFFFF, backcolor:#CCCCFF');\" onMouseOut=\"return hideTip()\"");
printf(" border='0'>");
|
|
[-]
[+]
|
Changed |
icinga-1.10.1.tar.bz2/cgi/status.c
^
|
| @@ -827,7 +827,7 @@
}
}
- /* if no hostgroup matched, try to find a serviegroup */
+ /* if no hostgroup matched, try to find a servicegroup */
if (return_live_search_data == TRUE || found == FALSE) {
for (temp_servicegroup = servicegroup_list; temp_servicegroup != NULL; temp_servicegroup = temp_servicegroup->next) {
if (regexec(&preg, temp_servicegroup->group_name, 0, NULL, 0) == 0 || regexec(&preg, temp_servicegroup->alias, 0, NULL, 0) == 0) {
@@ -2509,7 +2509,7 @@
if (new_host == TRUE && content_type != CSV_CONTENT && content_type != JSON_CONTENT) {
if (strcmp(last_host, ""))
- printf("<tr><td colspan='6'></td></tr>\n");
+ printf("<tr><td colspan='8'></td></tr>\n");
}
if (odd)
|
|
[-]
[+]
|
Changed |
icinga-1.10.1.tar.bz2/common/objects.c
^
|
| @@ -848,7 +848,6 @@
my_free(new_host->plugin_output);
my_free(new_host->long_plugin_output);
my_free(new_host->perf_data);
- my_free(new_host->check_source);
#endif
my_free(new_host->statusmap_image);
my_free(new_host->vrml_image);
@@ -1766,7 +1765,6 @@
my_free(new_service->perf_data);
my_free(new_service->plugin_output);
my_free(new_service->long_plugin_output);
- my_free(new_service->check_source);
#endif
my_free(new_service->failure_prediction_options);
my_free(new_service->notification_period);
@@ -3489,7 +3487,6 @@
my_free(this_host->long_plugin_output);
my_free(this_host->perf_data);
my_free(this_host->processed_command);
- my_free(this_host->check_source);
free_objectlist(&this_host->hostgroups_ptr);
#endif
@@ -3691,7 +3688,6 @@
my_free(this_service->long_plugin_output);
my_free(this_service->perf_data);
my_free(this_service->processed_command);
- my_free(this_service->check_source);
my_free(this_service->event_handler_args);
my_free(this_service->check_command_args);
|
|
[-]
[+]
|
Changed |
icinga-1.10.1.tar.bz2/configure
^
|
| @@ -2507,9 +2507,9 @@
PKG_NAME=icinga-core
-PKG_VERSION="1.10.0"
+PKG_VERSION="1.10.1"
PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="10-24-2013"
+PKG_REL_DATE="11-04-2013"
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
|
|
[-]
[+]
|
Changed |
icinga-1.10.1.tar.bz2/configure.in
^
|
| @@ -9,9 +9,9 @@
AC_PREFIX_DEFAULT(/usr/local/icinga)
PKG_NAME=icinga-core
-PKG_VERSION="1.10.0"
+PKG_VERSION="1.10.1"
PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="10-24-2013"
+PKG_REL_DATE="11-04-2013"
dnl Figure out how to invoke "install" and what install options to use.
AC_PROG_INSTALL
|
|
[-]
[+]
|
Changed |
icinga-1.10.1.tar.bz2/html/main.html
^
|
| @@ -18,9 +18,9 @@
</div>
<div id="currentversioninfo">
-<div class="version">Version 1.10.0</div>
-<div class="releasedate">Oktober 24, 2013</div>
-<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.10.0</a></div>
+<div class="version">Version 1.10.1</div>
+<div class="releasedate">November 04, 2013</div>
+<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.10.1</a></div>
</div>
<div id="developer">
|
|
[-]
[+]
|
Changed |
icinga-1.10.1.tar.bz2/icinga.spec
^
|
| @@ -30,7 +30,7 @@
%define apacheuser apache
%define apachegroup apache
%define extcmdfile %{_localstatedir}/spool/icinga/cmd/icinga.cmd
-%define extcmdfiledir %{_localstatedir}/icinga/cmd
+%define extcmdfiledir %{_localstatedir}/spool/icinga/cmd
%define readme README.RHEL
%define readmeido README.RHEL.idoutils
%endif
@@ -54,7 +54,7 @@
Summary: Open Source host, service and network monitoring program
Name: icinga
-Version: 1.10.0
+Version: 1.10.1
Release: %{revision}%{?dist}
License: GPLv2
Group: Applications/System
@@ -610,6 +610,9 @@
%changelog
+* Mon Nov 04 2013 Michael Friedrich <michael.friedrich@netways.de> - 1.10.1-1
+- bump 1.10.1
+
* Wed Oct 16 2013 Michael Friedrich <michael.friedrich@netways.de> - 1.10.0-1
- bump 1.10.0
|
|
[-]
[+]
|
Changed |
icinga-1.10.1.tar.bz2/include/broker.h
^
|
| @@ -194,8 +194,8 @@
int broker_event_handler(int,int,int,int,void *,int,int,struct timeval,struct timeval,double,int,int,int,char *,char *,char *,struct timeval *);
void broker_ocp_data(int,int,int,void *,int,int,double,int,int,struct timeval *);
void broker_system_command(int,int,int,struct timeval,struct timeval,double,int,int,int,char *,char *,struct timeval *);
-int broker_host_check(int,int,int,host *,int,int,int,struct timeval,struct timeval,char *,double,double,int,int,int,char *,char *,char *,char *,struct timeval *, char *);
-int broker_service_check(int,int,int,service *,int,struct timeval,struct timeval,char *,double,double,int,int,int,char *,struct timeval *, char*);
+int broker_host_check(int,int,int,host *,int,int,int,struct timeval,struct timeval,char *,double,double,int,int,int,char *,char *,char *,char *,struct timeval *);
+int broker_service_check(int,int,int,service *,int,struct timeval,struct timeval,char *,double,double,int,int,int,char *,struct timeval *);
void broker_comment_data(int,int,int,int,int,char *,char *,time_t,char *,char *,int,int,int,time_t,unsigned long,struct timeval *);
void broker_downtime_data(int,int,int,int,char *,char *,time_t,char *,char *,time_t,time_t,int,unsigned long,unsigned long,unsigned long,struct timeval *,int,time_t);
void broker_flapping_data(int,int,int,int,void *,double,double,double,struct timeval *);
|
|
[-]
[+]
|
Changed |
icinga-1.10.1.tar.bz2/include/common.h
^
|
| @@ -27,8 +27,8 @@
#define PROGRAM_NAME "Icinga"
#define PROGRAM_NAME_UC "ICINGA"
#define PROGRAM_NAME_LC "icinga"
-#define PROGRAM_VERSION "1.10.0"
-#define PROGRAM_MODIFICATION_DATE "10-24-2013"
+#define PROGRAM_VERSION "1.10.1"
+#define PROGRAM_MODIFICATION_DATE "11-04-2013"
/*#define DEBUG_CHECK_IPC 1 */
/*#define DEBUG_CHECK_IPC2 1*/
|
|
[-]
[+]
|
Changed |
icinga-1.10.1.tar.bz2/include/icinga.h
^
|
| @@ -331,7 +331,6 @@
int return_code; /* plugin return code */
char *output; /* plugin output */
struct check_result_struct *next;
- char *source;
}check_result;
@@ -372,7 +371,6 @@
time_t check_time;
double latency;
struct passive_check_result_struct *next;
- char *source;
}passive_check_result;
@@ -408,7 +406,6 @@
time_t last_update;
}check_stats;
-
/******************* THREAD STUFF ********************/
/* slots in circular buffers */
@@ -741,7 +738,6 @@
extern pthread_mutex_t icinga_eventloop_lock;
-
#ifdef __cplusplus
}
#endif
|
|
[-]
[+]
|
Changed |
icinga-1.10.1.tar.bz2/include/objects.h
^
|
| @@ -421,7 +421,6 @@
$HOSTADDRESS6$ macro */
char *address6;
time_t acknowledgement_end_time;
- char *check_source;
#ifdef NSCORE
int current_down_notification_number;
int current_unreachable_notification_number;
@@ -566,7 +565,6 @@
PROCESSED state on host|service checks */
char *processed_command;
time_t acknowledgement_end_time;
- char *check_source;
#ifdef NSCORE
int current_warning_notification_number;
int current_critical_notification_number;
|
|
[-]
[+]
|
Changed |
icinga-1.10.1.tar.bz2/module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.10.0.sql
^
|
| @@ -29,29 +29,29 @@
-- -----------------------------------------
-- drop index too, if seperate tbs
-ALTER TABLE icinga_timedevents DROP INDEX timedevents_i_id_idx;
-ALTER TABLE icinga_timedevents DROP INDEX timedevents_time_id_idx;
-ALTER TABLE icinga_timedevents DROP INDEX timed_e_event_type_idx;
-ALTER TABLE icinga_timedevents DROP INDEX timed_e_object_id_idx;
-ALTER TABLE icinga_timedevents DROP INDEX timed_e_rec_ev_idx;
-
-ALTER TABLE icinga_timedeventqueue DROP INDEX timedeventq_i_id_idx;
-ALTER TABLE icinga_timedeventqueue DROP INDEX timedeventq_time_id_idx;
-ALTER TABLE icinga_timedeventqueue DROP INDEX timedeventqueue_i_id_idx;
-ALTER TABLE icinga_timedeventqueue DROP INDEX timed_e_q_event_type_idx;
-ALTER TABLE icinga_timedeventqueue DROP INDEX timed_e_q_sched_time_idx;
-ALTER TABLE icinga_timedeventqueue DROP INDEX timed_e_q_object_id_idx;
-ALTER TABLE icinga_timedeventqueue DROP INDEX timed_e_q_rec_ev_id_idx;
+DROP INDEX IF EXISTS timedevents_i_id_idx;
+DROP INDEX IF EXISTS timedevents_time_id_idx;
+DROP INDEX IF EXISTS timed_e_event_type_idx;
+DROP INDEX IF EXISTS timed_e_object_id_idx;
+DROP INDEX IF EXISTS timed_e_rec_ev_idx;
+
+DROP INDEX IF EXISTS timedeventq_i_id_idx;
+DROP INDEX IF EXISTS timedeventq_time_id_idx;
+DROP INDEX IF EXISTS timedeventqueue_i_id_idx;
+DROP INDEX IF EXISTS timed_e_q_event_type_idx;
+DROP INDEX IF EXISTS timed_e_q_sched_time_idx;
+DROP INDEX IF EXISTS timed_e_q_object_id_idx;
+DROP INDEX IF EXISTS timed_e_q_rec_ev_id_idx;
-DROP TABLE icinga_timedevents;
-DROP TABLE icinga_timedeventqueue;
+DROP TABLE IF EXISTS icinga_timedevents;
+DROP TABLE IF EXISTS icinga_timedeventqueue;
-- -----------------------------------------
-- #4544 icinga_comments table UK
-- -----------------------------------------
-ALTER TABLE icinga_comments DROP CONSTRAINT uq_comments;
-ALTER TABLE icinga_commenthistory DROP CONSTRAINT uq_commenthistory;
+ALTER TABLE icinga_comments DROP CONSTRAINT IF EXISTS uq_comments;
+ALTER TABLE icinga_commenthistory DROP CONSTRAINT IF EXISTS uq_commenthistory;
ALTER TABLE icinga_comments ADD CONSTRAINT uq_comments UNIQUE (instance_id,object_id,comment_time,internal_comment_id);
ALTER TABLE icinga_commenthistory ADD CONSTRAINT uq_commenthistory UNIQUE (instance_id,object_id,comment_time,internal_comment_id);
@@ -67,7 +67,7 @@
-- #4754 add logentries object_id
-- -----------------------------------------
-ALTER TABLE icinga_logentries ADD object_id bigint unsigned default NULL;
+ALTER TABLE icinga_logentries ADD object_id bigint default NULL;
-- -----------------------------------------
-- update dbversion
|
|
[-]
[+]
|
Changed |
icinga-1.10.1.tar.bz2/module/idoutils/include/common.h
^
|
| @@ -22,8 +22,8 @@
#define LOG2IDO_NAME "LOG2IDO"
/* only one space for update-version matching */
-#define IDO_DATE "10-24-2013"
-#define IDO_VERSION "1.10.0"
+#define IDO_DATE "11-04-2013"
+#define IDO_VERSION "1.10.1"
#define IDO_SCHEMA_VERSION "1.10.0"
|
|
[-]
[+]
|
Changed |
icinga-1.10.1.tar.bz2/module/idoutils/include/protoapi.h
^
|
| @@ -109,7 +109,7 @@
/************** COMMON DATA ATTRIBUTES **************/
-#define IDO_MAX_DATA_TYPES 273
+#define IDO_MAX_DATA_TYPES 272
#define IDO_DATA_NONE 0
@@ -394,5 +394,4 @@
#define IDO_DATA_DOWNTIMETRIGGERTIME 269
#define IDO_DATA_DISABLED_NOTIFICATIONS_EXPIRE_TIME 270
#define IDO_DATA_CUSTOMVARIABLESTATUS 271 /* seperate type from CUSTOMVARIABLE config */
-#define IDO_DATA_CHECKSOURCE 272
#endif
|
|
[-]
[+]
|
Changed |
icinga-1.10.1.tar.bz2/module/idoutils/src/db.c
^
|
| @@ -3949,7 +3949,7 @@
"process_performance_data=:X39, obsess_over_host=:X40, "
"modified_host_attributes=:X41, event_handler=:X42, "
"check_command=:X43, normal_check_interval=:X44, "
- "retry_check_interval=:X45, check_timeperiod_object_id=:X46, check_source=:X47 "
+ "retry_check_interval=:X45, check_timeperiod_object_id=:X46 "
"WHEN NOT MATCHED THEN "
"INSERT (id, instance_id, host_object_id, status_update_time, output, long_output, perfdata, "
"current_state, has_been_checked, should_be_scheduled, current_check_attempt, "
@@ -3963,7 +3963,7 @@
"percent_state_change, latency, execution_time, scheduled_downtime_depth, "
"failure_prediction_enabled, process_performance_data, obsess_over_host, "
"modified_host_attributes, event_handler, check_command, normal_check_interval, "
- "retry_check_interval, check_timeperiod_object_id, check_source) "
+ "retry_check_interval, check_timeperiod_object_id) "
"VALUES (seq_hoststatus.nextval, :X1, :X2, unixts2localts(:X3), :X4i, :X5i, :X6i, "
":X7, :X8, :X9, :X10, "
":X11, unixts2localts(:X12), unixts2localts(:X13), :X14, "
@@ -3976,7 +3976,7 @@
":X34, :X35, :X36, :X37, "
":X38, :X39, :X40, "
":X41, :X42, :X43, :X44, "
- ":X45, :X46, :X47)",
+ ":X45, :X46)",
ido2db_db_tablenames[IDO2DB_DBTABLE_HOSTSTATUS]) == -1) {
buf = NULL;
}
@@ -4086,7 +4086,7 @@
"failure_prediction_enabled=:X39, process_performance_data=:X40, "
"obsess_over_service=:X41, modified_service_attributes=:X42, "
"event_handler=:X43, check_command=:X44, normal_check_interval=:X45, "
- "retry_check_interval=:X46, check_timeperiod_object_id=:X47, check_source=:X48 "
+ "retry_check_interval=:X46, check_timeperiod_object_id=:X47 "
"WHEN NOT MATCHED THEN "
"INSERT "
"(id, instance_id, service_object_id, status_update_time, "
@@ -4102,7 +4102,7 @@
"percent_state_change, latency, execution_time, scheduled_downtime_depth, "
"failure_prediction_enabled, process_performance_data, obsess_over_service, "
"modified_service_attributes, event_handler, check_command, "
- "normal_check_interval, retry_check_interval, check_timeperiod_object_id, check_source) "
+ "normal_check_interval, retry_check_interval, check_timeperiod_object_id) "
"VALUES "
"(seq_servicestatus.nextval, :X1, :X2, unixts2localts(:X3), "
":X4i, :X5i, :X6i, :X7, :X8, :X9, :X10, :X11, "
@@ -4112,7 +4112,7 @@
":X22, unixts2localts(:X23), unixts2localts(:X24), :X25, "
":X26, :X27, :X28, :X29, :X30, :X31, :X32, :X33, "
":X34, :X35, :X36, :X37, :X38, :X39, :X40, :X41, :X42, "
- ":X43, :X44, :X45, :X46, :X47, :X48)",
+ ":X43, :X44, :X45, :X46, :X47)",
ido2db_db_tablenames[IDO2DB_DBTABLE_SERVICESTATUS]) == -1) {
buf = NULL;
}
|
|
[-]
[+]
|
Changed |
icinga-1.10.1.tar.bz2/module/idoutils/src/dbhandlers.c
^
|
| @@ -1167,7 +1167,7 @@
char *es[1];
time_t etime = 0L;
char *ts[1];
- unsigned long type = 0L;
+ int type = 0;
unsigned long object_id = 0L;
int result = IDO_OK;
int duplicate_record = IDO_FALSE;
@@ -1305,7 +1305,7 @@
if (object_id != 0) {
if (asprintf(
&buf,
- "INSERT INTO %s (instance_id, logentry_time, entry_time, entry_time_usec, logentry_type, logentry_data, realtime_data, inferred_data_extracted, object_id) VALUES (%lu, %s, %s, '0', %lu, E'%s', '0', '0', %lu)",
+ "INSERT INTO %s (instance_id, logentry_time, entry_time, entry_time_usec, logentry_type, logentry_data, realtime_data, inferred_data_extracted, object_id) VALUES (%lu, %s, %s, '0', %d, E'%s', '0', '0', %lu)",
ido2db_db_tablenames[IDO2DB_DBTABLE_LOGENTRIES],
idi->dbinfo.instance_id, ts[0], ts[0], type, (es[0] == NULL) ? ""
: es[0], object_id) == -1)
@@ -1313,7 +1313,7 @@
} else {
if (asprintf(
&buf,
- "INSERT INTO %s (instance_id, logentry_time, entry_time, entry_time_usec, logentry_type, logentry_data, realtime_data, inferred_data_extracted) VALUES (%lu, %s, %s, '0', %lu, E'%s', '0', '0')",
+ "INSERT INTO %s (instance_id, logentry_time, entry_time, entry_time_usec, logentry_type, logentry_data, realtime_data, inferred_data_extracted) VALUES (%lu, %s, %s, '0', %d, E'%s', '0', '0')",
ido2db_db_tablenames[IDO2DB_DBTABLE_LOGENTRIES],
idi->dbinfo.instance_id, ts[0], ts[0], type, (es[0] == NULL) ? ""
: es[0]) == -1)
@@ -1324,7 +1324,7 @@
if (object_id != 0) {
if (asprintf(
&buf,
- "INSERT INTO %s (instance_id, logentry_time, entry_time, entry_time_usec, logentry_type, logentry_data, realtime_data, inferred_data_extracted, object_id) VALUES (%lu, %s, %s, '0', %lu, '%s', '0', '0', %lu)",
+ "INSERT INTO %s (instance_id, logentry_time, entry_time, entry_time_usec, logentry_type, logentry_data, realtime_data, inferred_data_extracted, object_id) VALUES (%lu, %s, %s, '0', %d, '%s', '0', '0', %lu)",
ido2db_db_tablenames[IDO2DB_DBTABLE_LOGENTRIES],
idi->dbinfo.instance_id, ts[0], ts[0], type, (es[0] == NULL) ? ""
: es[0], object_id) == -1)
@@ -1332,7 +1332,7 @@
} else {
if (asprintf(
&buf,
- "INSERT INTO %s (instance_id, logentry_time, entry_time, entry_time_usec, logentry_type, logentry_data, realtime_data, inferred_data_extracted) VALUES (%lu, %s, %s, '0', %lu, '%s', '0', '0')",
+ "INSERT INTO %s (instance_id, logentry_time, entry_time, entry_time_usec, logentry_type, logentry_data, realtime_data, inferred_data_extracted) VALUES (%lu, %s, %s, '0', %d, '%s', '0', '0')",
ido2db_db_tablenames[IDO2DB_DBTABLE_LOGENTRIES],
idi->dbinfo.instance_id, ts[0], ts[0], type, (es[0] == NULL) ? ""
: es[0]) == -1)
@@ -1733,7 +1733,7 @@
int type, flags, attr;
struct timeval tstamp;
time_t etime = 0L;
- unsigned long letype = 0L;
+ int letype = 0;
unsigned long object_id = 0L;
char *ts[2];
char *es[1];
@@ -1756,7 +1756,7 @@
&tstamp);
/* convert data */
- result = ido2db_convert_string_to_unsignedlong(
+ result = ido2db_convert_string_to_int(
idi->buffered_input[IDO_DATA_LOGENTRYTYPE], &letype);
result = ido2db_convert_string_to_unsignedlong(
idi->buffered_input[IDO_DATA_LOGENTRYTIME],
@@ -1790,7 +1790,7 @@
if (object_id != 0) {
if (asprintf(
&buf,
- "INSERT INTO %s (instance_id, logentry_time, entry_time, entry_time_usec, logentry_type, logentry_data, realtime_data, inferred_data_extracted, object_id) VALUES (%lu, %s, %s, '0', %lu, E'%s', '1', '1', %lu)",
+ "INSERT INTO %s (instance_id, logentry_time, entry_time, entry_time_usec, logentry_type, logentry_data, realtime_data, inferred_data_extracted, object_id) VALUES (%lu, %s, %s, '0', %d, E'%s', '1', '1', %lu)",
ido2db_db_tablenames[IDO2DB_DBTABLE_LOGENTRIES],
idi->dbinfo.instance_id, ts[0], ts[0], type, (es[0] == NULL) ? ""
: es[0], object_id) == -1)
@@ -1798,7 +1798,7 @@
} else {
if (asprintf(
&buf,
- "INSERT INTO %s (instance_id, logentry_time, entry_time, entry_time_usec, logentry_type, logentry_data, realtime_data, inferred_data_extracted) VALUES (%lu, %s, %s, '0', %lu, E'%s', '1', '1')",
+ "INSERT INTO %s (instance_id, logentry_time, entry_time, entry_time_usec, logentry_type, logentry_data, realtime_data, inferred_data_extracted) VALUES (%lu, %s, %s, '0', %d, E'%s', '1', '1')",
ido2db_db_tablenames[IDO2DB_DBTABLE_LOGENTRIES],
idi->dbinfo.instance_id, ts[0], ts[0], type, (es[0] == NULL) ? ""
: es[0]) == -1)
@@ -1809,7 +1809,7 @@
if (object_id != 0) {
if (asprintf(
&buf,
- "INSERT INTO %s (instance_id, logentry_time, entry_time, entry_time_usec, logentry_type, logentry_data, realtime_data, inferred_data_extracted, object_id) VALUES (%lu, %s, %s, '0', %lu, '%s', '1', '1', %lu)",
+ "INSERT INTO %s (instance_id, logentry_time, entry_time, entry_time_usec, logentry_type, logentry_data, realtime_data, inferred_data_extracted, object_id) VALUES (%lu, %s, %s, '0', %d, '%s', '1', '1', %lu)",
ido2db_db_tablenames[IDO2DB_DBTABLE_LOGENTRIES],
idi->dbinfo.instance_id, ts[0], ts[0], type, (es[0] == NULL) ? ""
: es[0], object_id) == -1)
@@ -1817,7 +1817,7 @@
} else {
if (asprintf(
&buf,
- "INSERT INTO %s (instance_id, logentry_time, entry_time, entry_time_usec, logentry_type, logentry_data, realtime_data, inferred_data_extracted) VALUES (%lu, %s, %s, '0', %lu, '%s', '1', '1')",
+ "INSERT INTO %s (instance_id, logentry_time, entry_time, entry_time_usec, logentry_type, logentry_data, realtime_data, inferred_data_extracted) VALUES (%lu, %s, %s, '0', %d, '%s', '1', '1')",
ido2db_db_tablenames[IDO2DB_DBTABLE_LOGENTRIES],
idi->dbinfo.instance_id, ts[0], ts[0], type, (es[0] == NULL) ? ""
: es[0]) == -1)
@@ -3597,11 +3597,11 @@
double normal_check_interval = 0.0;
double retry_check_interval = 0.0;
char *ts[10];
- char *es[6];
+ char *es[5];
unsigned long object_id = 0L;
unsigned long check_timeperiod_object_id = 0L;
int x = 0;
- void *data[57];
+ void *data[56];
ido2db_log_debug_info(IDO2DB_DEBUGL_PROCESSINFO, 2, "ido2db_handle_hoststatusdata() start\n");
@@ -3659,7 +3659,6 @@
es[2] = ido2db_db_escape_string(idi, idi->buffered_input[IDO_DATA_PERFDATA]);
es[3] = ido2db_db_escape_string(idi, idi->buffered_input[IDO_DATA_EVENTHANDLER]);
es[4] = ido2db_db_escape_string(idi, idi->buffered_input[IDO_DATA_CHECKCOMMAND]);
- es[5] = ido2db_db_escape_string(idi, idi->buffered_input[IDO_DATA_CHECKSOURCE]);
ts[0] = ido2db_db_timet_to_sql(idi, tstamp.tv_sec);
ts[1] = ido2db_db_timet_to_sql(idi, last_check);
@@ -3734,8 +3733,6 @@
data[53] = (void *) &last_time_unreachable;
data[54] = (void *) &last_notification;
data[55] = (void *) &next_notification;
- /* check_source */
- data[56] = (void *) &es[5];
ido2db_log_debug_info(IDO2DB_DEBUGL_PROCESSINFO, 2, "ido2db_handle_hoststatusdata() LongLen:%d\n", strlen(es[1]));
@@ -3797,11 +3794,11 @@
double normal_check_interval = 0.0;
double retry_check_interval = 0.0;
char *ts[11];
- char *es[6];
+ char *es[5];
unsigned long object_id = 0L;
unsigned long check_timeperiod_object_id = 0L;
int x = 0;
- void *data[59];
+ void *data[58];
ido2db_log_debug_info(IDO2DB_DEBUGL_PROCESSINFO, 2, "ido2db_handle_servicestatusdata() start\n");
@@ -3860,7 +3857,6 @@
es[2] = ido2db_db_escape_string(idi, idi->buffered_input[IDO_DATA_PERFDATA]);
es[3] = ido2db_db_escape_string(idi, idi->buffered_input[IDO_DATA_EVENTHANDLER]);
es[4] = ido2db_db_escape_string(idi, idi->buffered_input[IDO_DATA_CHECKCOMMAND]);
- es[5] = ido2db_db_escape_string(idi, idi->buffered_input[IDO_DATA_CHECKSOURCE]);
ts[0] = ido2db_db_timet_to_sql(idi, tstamp.tv_sec);
ts[1] = ido2db_db_timet_to_sql(idi, last_check);
@@ -3943,8 +3939,6 @@
data[55] = (void *) &last_time_critical;
data[56] = (void *) &last_notification;
data[57] = (void *) &next_notification;
- /* check_source */
- data[58] = (void *) &es[5];
ido2db_query_insert_or_update_servicestatusdata_add(idi, data);
|
|
[-]
[+]
|
Changed |
icinga-1.10.1.tar.bz2/module/idoutils/src/dbqueries.c
^
|
| @@ -3423,7 +3423,7 @@
}
}
}
- asprintf(&query1, "UPDATE %s SET instance_id=%lu, host_object_id=%lu, status_update_time=%s, output='%s', long_output='%s', perfdata='%s', current_state=%d, has_been_checked=%d, should_be_scheduled=%d, current_check_attempt=%d, max_check_attempts=%d, last_check=%s, next_check=%s, check_type=%d, last_state_change=%s, last_hard_state_change=%s, last_hard_state=%d, last_time_up=%s, last_time_down=%s, last_time_unreachable=%s, state_type=%d, last_notification=%s, next_notification=%s, no_more_notifications=%d, notifications_enabled=%d, problem_has_been_acknowledged=%d, acknowledgement_type=%d, current_notification_number=%d, passive_checks_enabled=%d, active_checks_enabled=%d, event_handler_enabled=%d, flap_detection_enabled=%d, is_flapping=%d, percent_state_change='%lf', latency='%lf', execution_time='%lf', scheduled_downtime_depth=%d, failure_prediction_enabled=%d, process_performance_data=%d, obsess_over_host=%d, modified_host_attributes=%lu, event_handler='%s', check_command='%s', normal_check_interval='%lf', retry_check_interval='%lf', check_timeperiod_object_id=%lu, check_source='%s' WHERE host_object_id=%lu",
+ asprintf(&query1, "UPDATE %s SET instance_id=%lu, host_object_id=%lu, status_update_time=%s, output='%s', long_output='%s', perfdata='%s', current_state=%d, has_been_checked=%d, should_be_scheduled=%d, current_check_attempt=%d, max_check_attempts=%d, last_check=%s, next_check=%s, check_type=%d, last_state_change=%s, last_hard_state_change=%s, last_hard_state=%d, last_time_up=%s, last_time_down=%s, last_time_unreachable=%s, state_type=%d, last_notification=%s, next_notification=%s, no_more_notifications=%d, notifications_enabled=%d, problem_has_been_acknowledged=%d, acknowledgement_type=%d, current_notification_number=%d, passive_checks_enabled=%d, active_checks_enabled=%d, event_handler_enabled=%d, flap_detection_enabled=%d, is_flapping=%d, percent_state_change='%lf', latency='%lf', execution_time='%lf', scheduled_downtime_depth=%d, failure_prediction_enabled=%d, process_performance_data=%d, obsess_over_host=%d, modified_host_attributes=%lu, event_handler='%s', check_command='%s', normal_check_interval='%lf', retry_check_interval='%lf', check_timeperiod_object_id=%lu WHERE host_object_id=%lu",
ido2db_db_tablenames[IDO2DB_DBTABLE_HOSTSTATUS],
*(unsigned long *) data[0], /* update start */
*(unsigned long *) data[1],
@@ -3470,8 +3470,7 @@
*(char **) data[42],
*(double *) data[43],
*(double *) data[44],
- *(unsigned long *) data[45],
- *(char **) data[56], /* update end */
+ *(unsigned long *) data[45], /* update end */
*(unsigned long *) data[1] /* unique constraint start/end */
);
/* send query to db */
@@ -3511,7 +3510,7 @@
if (mysql_update == FALSE) {
/* try insert instead */
- asprintf(&query2, "INSERT INTO %s (instance_id, host_object_id, status_update_time, output, long_output, perfdata, current_state, has_been_checked, should_be_scheduled, current_check_attempt, max_check_attempts, last_check, next_check, check_type, last_state_change, last_hard_state_change, last_hard_state, last_time_up, last_time_down, last_time_unreachable, state_type, last_notification, next_notification, no_more_notifications, notifications_enabled, problem_has_been_acknowledged, acknowledgement_type, current_notification_number, passive_checks_enabled, active_checks_enabled, event_handler_enabled, flap_detection_enabled, is_flapping, percent_state_change, latency, execution_time, scheduled_downtime_depth, failure_prediction_enabled, process_performance_data, obsess_over_host, modified_host_attributes, event_handler, check_command, normal_check_interval, retry_check_interval, check_timeperiod_object_id, check_source) VALUES (%lu, %lu, %s, '%s', '%s', '%s', %d, %d, %d, %d, %d, %s, %s, %d, %s, %s, %d, %s, %s, %s, %d, %s, %s, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %lf, %lf, %lf, %d, %d, %d, %d, %lu, '%s', '%s', %lf, %lf, %lu, '%s')",
+ asprintf(&query2, "INSERT INTO %s (instance_id, host_object_id, status_update_time, output, long_output, perfdata, current_state, has_been_checked, should_be_scheduled, current_check_attempt, max_check_attempts, last_check, next_check, check_type, last_state_change, last_hard_state_change, last_hard_state, last_time_up, last_time_down, last_time_unreachable, state_type, last_notification, next_notification, no_more_notifications, notifications_enabled, problem_has_been_acknowledged, acknowledgement_type, current_notification_number, passive_checks_enabled, active_checks_enabled, event_handler_enabled, flap_detection_enabled, is_flapping, percent_state_change, latency, execution_time, scheduled_downtime_depth, failure_prediction_enabled, process_performance_data, obsess_over_host, modified_host_attributes, event_handler, check_command, normal_check_interval, retry_check_interval, check_timeperiod_object_id) VALUES (%lu, %lu, %s, '%s', '%s', '%s', %d, %d, %d, %d, %d, %s, %s, %d, %s, %s, %d, %s, %s, %s, %d, %s, %s, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %lf, %lf, %lf, %d, %d, %d, %d, %lu, '%s', '%s', %lf, %lf, %lu)",
ido2db_db_tablenames[IDO2DB_DBTABLE_HOSTSTATUS],
*(unsigned long *) data[0], /* insert start */
*(unsigned long *) data[1],
@@ -3558,8 +3557,7 @@
*(char **) data[42],
*(double *) data[43],
*(double *) data[44],
- *(unsigned long *) data[45],
- *(char **) data[56] /* insert end */
+ *(unsigned long *) data[45] /* insert end */
);
/* send query to db */
result = ido2db_db_query(idi, query2);
@@ -3573,7 +3571,7 @@
case IDO2DB_DBSERVER_PGSQL:
- asprintf(&query1, "UPDATE %s SET instance_id=%lu, host_object_id=%lu, status_update_time=%s, output=E'%s', long_output=E'%s', perfdata=E'%s', current_state=%d, has_been_checked=%d, should_be_scheduled=%d, current_check_attempt=%d, max_check_attempts=%d, last_check=%s, next_check=%s, check_type=%d, last_state_change=%s, last_hard_state_change=%s, last_hard_state=%d, last_time_up=%s, last_time_down=%s, last_time_unreachable=%s, state_type=%d, last_notification=%s, next_notification=%s, no_more_notifications=%d, notifications_enabled=%d, problem_has_been_acknowledged=%d, acknowledgement_type=%d, current_notification_number=%d, passive_checks_enabled=%d, active_checks_enabled=%d, event_handler_enabled=%d, flap_detection_enabled=%d, is_flapping=%d, percent_state_change='%lf', latency='%lf', execution_time='%lf', scheduled_downtime_depth=%d, failure_prediction_enabled=%d, process_performance_data=%d, obsess_over_host=%d, modified_host_attributes=%lu, event_handler=E'%s', check_command=E'%s', normal_check_interval='%lf', retry_check_interval='%lf', check_timeperiod_object_id=%lu, check_source=E'%s' WHERE host_object_id=%lu",
+ asprintf(&query1, "UPDATE %s SET instance_id=%lu, host_object_id=%lu, status_update_time=%s, output=E'%s', long_output=E'%s', perfdata=E'%s', current_state=%d, has_been_checked=%d, should_be_scheduled=%d, current_check_attempt=%d, max_check_attempts=%d, last_check=%s, next_check=%s, check_type=%d, last_state_change=%s, last_hard_state_change=%s, last_hard_state=%d, last_time_up=%s, last_time_down=%s, last_time_unreachable=%s, state_type=%d, last_notification=%s, next_notification=%s, no_more_notifications=%d, notifications_enabled=%d, problem_has_been_acknowledged=%d, acknowledgement_type=%d, current_notification_number=%d, passive_checks_enabled=%d, active_checks_enabled=%d, event_handler_enabled=%d, flap_detection_enabled=%d, is_flapping=%d, percent_state_change='%lf', latency='%lf', execution_time='%lf', scheduled_downtime_depth=%d, failure_prediction_enabled=%d, process_performance_data=%d, obsess_over_host=%d, modified_host_attributes=%lu, event_handler=E'%s', check_command=E'%s', normal_check_interval='%lf', retry_check_interval='%lf', check_timeperiod_object_id=%lu WHERE host_object_id=%lu",
ido2db_db_tablenames[IDO2DB_DBTABLE_HOSTSTATUS],
*(unsigned long *) data[0], /* update start */
*(unsigned long *) data[1],
@@ -3620,8 +3618,7 @@
*(char **) data[42],
*(double *) data[43],
*(double *) data[44],
- *(unsigned long *) data[45],
- *(char **) data[56], /* update end */
+ *(unsigned long *) data[45], /* update end */
*(unsigned long *) data[1] /* unique constraint start/end */
);
/* send query to db */
@@ -3634,7 +3631,7 @@
idi->dbinfo.dbi_result = NULL;
/* try insert instead */
- asprintf(&query2, "INSERT INTO %s (instance_id, host_object_id, status_update_time, output, long_output, perfdata, current_state, has_been_checked, should_be_scheduled, current_check_attempt, max_check_attempts, last_check, next_check, check_type, last_state_change, last_hard_state_change, last_hard_state, last_time_up, last_time_down, last_time_unreachable, state_type, last_notification, next_notification, no_more_notifications, notifications_enabled, problem_has_been_acknowledged, acknowledgement_type, current_notification_number, passive_checks_enabled, active_checks_enabled, event_handler_enabled, flap_detection_enabled, is_flapping, percent_state_change, latency, execution_time, scheduled_downtime_depth, failure_prediction_enabled, process_performance_data, obsess_over_host, modified_host_attributes, event_handler, check_command, normal_check_interval, retry_check_interval, check_timeperiod_object_id, check_source) VALUES (%lu, %lu, %s, E'%s', E'%s', E'%s', %d, %d, %d, %d, %d, %s, %s, %d, %s, %s, %d, %s, %s, %s, %d, %s, %s, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %lf, %lf, %lf, %d, %d, %d, %d, %lu, E'%s', E'%s', %lf, %lf, %lu, E'%s')",
+ asprintf(&query2, "INSERT INTO %s (instance_id, host_object_id, status_update_time, output, long_output, perfdata, current_state, has_been_checked, should_be_scheduled, current_check_attempt, max_check_attempts, last_check, next_check, check_type, last_state_change, last_hard_state_change, last_hard_state, last_time_up, last_time_down, last_time_unreachable, state_type, last_notification, next_notification, no_more_notifications, notifications_enabled, problem_has_been_acknowledged, acknowledgement_type, current_notification_number, passive_checks_enabled, active_checks_enabled, event_handler_enabled, flap_detection_enabled, is_flapping, percent_state_change, latency, execution_time, scheduled_downtime_depth, failure_prediction_enabled, process_performance_data, obsess_over_host, modified_host_attributes, event_handler, check_command, normal_check_interval, retry_check_interval, check_timeperiod_object_id) VALUES (%lu, %lu, %s, E'%s', E'%s', E'%s', %d, %d, %d, %d, %d, %s, %s, %d, %s, %s, %d, %s, %s, %s, %d, %s, %s, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %lf, %lf, %lf, %d, %d, %d, %d, %lu, E'%s', E'%s', %lf, %lf, %lu)",
ido2db_db_tablenames[IDO2DB_DBTABLE_HOSTSTATUS],
*(unsigned long *) data[0], /* insert start */
*(unsigned long *) data[1],
@@ -3681,8 +3678,7 @@
*(char **) data[42],
*(double *) data[43],
*(double *) data[44],
- *(unsigned long *) data[45],
- *(char **) data[56] /* insert end */
+ *(unsigned long *) data[45] /* insert end */
);
/* send query to db */
result = ido2db_db_query(idi, query2);
@@ -3850,15 +3846,6 @@
if (!OCI_BindUnsignedInt(idi->dbinfo.oci_statement_hoststatus, MT(":X46"), (uint *) data[45])) {
return IDO_ERROR;
}
- if (*(char **) data[56] == NULL) {
- if (ido2db_oci_prepared_statement_bind_null_param(idi->dbinfo.oci_statement_hoststatus, ":X47") == IDO_ERROR) {
- return IDO_ERROR;
- }
- } else {
- if (!OCI_BindString(idi->dbinfo.oci_statement_hoststatus, MT(":X47"), *(char **) data[56], 0)) {
- return IDO_ERROR;
- }
- }
//bind clob 2 times,once for update, once for insert to make oracle happy and avoid ora-600 because of double binding
ido2db_log_debug_info(IDO2DB_DEBUGL_PROCESSINFO, 2, "ido2db_query_insert_or_update_hoststatus() bind clob\n");
lob_oi = OCI_LobCreate(idi->dbinfo.oci_connection, OCI_CLOB);
@@ -3957,7 +3944,7 @@
}
}
}
- asprintf(&query1, "UPDATE %s SET instance_id=%lu, service_object_id=%lu, status_update_time=%s, output='%s', long_output='%s', perfdata='%s', current_state=%d, has_been_checked=%d, should_be_scheduled=%d, current_check_attempt=%d, max_check_attempts=%d, last_check=%s, next_check=%s, check_type=%d, last_state_change=%s, last_hard_state_change=%s, last_hard_state=%d, last_time_ok=%s, last_time_warning=%s, last_time_unknown=%s, last_time_critical=%s, state_type=%d, last_notification=%s, next_notification=%s, no_more_notifications=%d, notifications_enabled=%d, problem_has_been_acknowledged=%d, acknowledgement_type=%d, current_notification_number=%d, passive_checks_enabled=%d, active_checks_enabled=%d, event_handler_enabled=%d, flap_detection_enabled=%d, is_flapping=%d, percent_state_change='%lf', latency='%lf', execution_time='%lf', scheduled_downtime_depth=%d, failure_prediction_enabled=%d, process_performance_data=%d, obsess_over_service=%d, modified_service_attributes=%lu, event_handler='%s', check_command='%s', normal_check_interval='%lf', retry_check_interval='%lf', check_timeperiod_object_id=%lu, check_source='%s' WHERE service_object_id=%lu",
+ asprintf(&query1, "UPDATE %s SET instance_id=%lu, service_object_id=%lu, status_update_time=%s, output='%s', long_output='%s', perfdata='%s', current_state=%d, has_been_checked=%d, should_be_scheduled=%d, current_check_attempt=%d, max_check_attempts=%d, last_check=%s, next_check=%s, check_type=%d, last_state_change=%s, last_hard_state_change=%s, last_hard_state=%d, last_time_ok=%s, last_time_warning=%s, last_time_unknown=%s, last_time_critical=%s, state_type=%d, last_notification=%s, next_notification=%s, no_more_notifications=%d, notifications_enabled=%d, problem_has_been_acknowledged=%d, acknowledgement_type=%d, current_notification_number=%d, passive_checks_enabled=%d, active_checks_enabled=%d, event_handler_enabled=%d, flap_detection_enabled=%d, is_flapping=%d, percent_state_change='%lf', latency='%lf', execution_time='%lf', scheduled_downtime_depth=%d, failure_prediction_enabled=%d, process_performance_data=%d, obsess_over_service=%d, modified_service_attributes=%lu, event_handler='%s', check_command='%s', normal_check_interval='%lf', retry_check_interval='%lf', check_timeperiod_object_id=%lu WHERE service_object_id=%lu",
ido2db_db_tablenames[IDO2DB_DBTABLE_SERVICESTATUS],
*(unsigned long *) data[0], /* update start */
*(unsigned long *) data[1],
@@ -4005,8 +3992,7 @@
*(char **) data[43],
*(double *) data[44],
*(double *) data[45],
- *(unsigned long *) data[46],
- *(char **) data[58], /* update end */
+ *(unsigned long *) data[46], /* update end */
*(unsigned long *) data[1] /* unique constraint start/end */
);
@@ -4049,7 +4035,7 @@
if (mysql_update == FALSE) {
/* try insert instead */
- asprintf(&query2, "INSERT INTO %s (instance_id, service_object_id, status_update_time, output, long_output, perfdata, current_state, has_been_checked, should_be_scheduled, current_check_attempt, max_check_attempts, last_check, next_check, check_type, last_state_change, last_hard_state_change, last_hard_state, last_time_ok, last_time_warning, last_time_unknown, last_time_critical, state_type, last_notification, next_notification, no_more_notifications, notifications_enabled, problem_has_been_acknowledged, acknowledgement_type, current_notification_number, passive_checks_enabled, active_checks_enabled, event_handler_enabled, flap_detection_enabled, is_flapping, percent_state_change, latency, execution_time, scheduled_downtime_depth, failure_prediction_enabled, process_performance_data, obsess_over_service, modified_service_attributes, event_handler, check_command, normal_check_interval, retry_check_interval, check_timeperiod_object_id, check_source) VALUES (%lu, %lu, %s, '%s', '%s', '%s', %d, %d, %d, %d, %d, %s, %s, %d, %s, %s, %d, %s, %s, %s, %s, %d, %s, %s, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, '%lf', '%lf', '%lf', %d, %d, %d, %d, %lu, '%s', '%s', '%lf', '%lf', %lu, '%s')",
+ asprintf(&query2, "INSERT INTO %s (instance_id, service_object_id, status_update_time, output, long_output, perfdata, current_state, has_been_checked, should_be_scheduled, current_check_attempt, max_check_attempts, last_check, next_check, check_type, last_state_change, last_hard_state_change, last_hard_state, last_time_ok, last_time_warning, last_time_unknown, last_time_critical, state_type, last_notification, next_notification, no_more_notifications, notifications_enabled, problem_has_been_acknowledged, acknowledgement_type, current_notification_number, passive_checks_enabled, active_checks_enabled, event_handler_enabled, flap_detection_enabled, is_flapping, percent_state_change, latency, execution_time, scheduled_downtime_depth, failure_prediction_enabled, process_performance_data, obsess_over_service, modified_service_attributes, event_handler, check_command, normal_check_interval, retry_check_interval, check_timeperiod_object_id) VALUES (%lu, %lu, %s, '%s', '%s', '%s', %d, %d, %d, %d, %d, %s, %s, %d, %s, %s, %d, %s, %s, %s, %s, %d, %s, %s, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, '%lf', '%lf', '%lf', %d, %d, %d, %d, %lu, '%s', '%s', '%lf', '%lf', %lu)",
ido2db_db_tablenames[IDO2DB_DBTABLE_SERVICESTATUS],
*(unsigned long *) data[0], /* insert start */
*(unsigned long *) data[1],
@@ -4097,8 +4083,7 @@
*(char **) data[43],
*(double *) data[44],
*(double *) data[45],
- *(unsigned long *) data[46],
- *(char **) data[58] /* insert end */
+ *(unsigned long *) data[46] /* insert end */
);
/* send query to db */
result = ido2db_db_query(idi, query2);
@@ -4111,7 +4096,7 @@
break;
case IDO2DB_DBSERVER_PGSQL:
- asprintf(&query1, "UPDATE %s SET instance_id=%lu, service_object_id=%lu, status_update_time=%s, output=E'%s', long_output=E'%s', perfdata=E'%s', current_state=%d, has_been_checked=%d, should_be_scheduled=%d, current_check_attempt=%d, max_check_attempts=%d, last_check=%s, next_check=%s, check_type=%d, last_state_change=%s, last_hard_state_change=%s, last_hard_state=%d, last_time_ok=%s, last_time_warning=%s, last_time_unknown=%s, last_time_critical=%s, state_type=%d, last_notification=%s, next_notification=%s, no_more_notifications=%d, notifications_enabled=%d, problem_has_been_acknowledged=%d, acknowledgement_type=%d, current_notification_number=%d, passive_checks_enabled=%d, active_checks_enabled=%d, event_handler_enabled=%d, flap_detection_enabled=%d, is_flapping=%d, percent_state_change='%lf', latency='%lf', execution_time='%lf', scheduled_downtime_depth=%d, failure_prediction_enabled=%d, process_performance_data=%d, obsess_over_service=%d, modified_service_attributes=%lu, event_handler=E'%s', check_command=E'%s', normal_check_interval='%lf', retry_check_interval='%lf', check_timeperiod_object_id=%lu, check_source=E'%s' WHERE service_object_id=%lu",
+ asprintf(&query1, "UPDATE %s SET instance_id=%lu, service_object_id=%lu, status_update_time=%s, output=E'%s', long_output=E'%s', perfdata=E'%s', current_state=%d, has_been_checked=%d, should_be_scheduled=%d, current_check_attempt=%d, max_check_attempts=%d, last_check=%s, next_check=%s, check_type=%d, last_state_change=%s, last_hard_state_change=%s, last_hard_state=%d, last_time_ok=%s, last_time_warning=%s, last_time_unknown=%s, last_time_critical=%s, state_type=%d, last_notification=%s, next_notification=%s, no_more_notifications=%d, notifications_enabled=%d, problem_has_been_acknowledged=%d, acknowledgement_type=%d, current_notification_number=%d, passive_checks_enabled=%d, active_checks_enabled=%d, event_handler_enabled=%d, flap_detection_enabled=%d, is_flapping=%d, percent_state_change='%lf', latency='%lf', execution_time='%lf', scheduled_downtime_depth=%d, failure_prediction_enabled=%d, process_performance_data=%d, obsess_over_service=%d, modified_service_attributes=%lu, event_handler=E'%s', check_command=E'%s', normal_check_interval='%lf', retry_check_interval='%lf', check_timeperiod_object_id=%lu WHERE service_object_id=%lu",
ido2db_db_tablenames[IDO2DB_DBTABLE_SERVICESTATUS],
*(unsigned long *) data[0], /* update start */
*(unsigned long *) data[1],
@@ -4159,8 +4144,7 @@
*(char **) data[43],
*(double *) data[44],
*(double *) data[45],
- *(unsigned long *) data[46],
- *(char **) data[58], /* update end */
+ *(unsigned long *) data[46], /* update end */
*(unsigned long *) data[1] /* unique constraint start/end */
);
@@ -4174,7 +4158,7 @@
idi->dbinfo.dbi_result = NULL;
/* try insert instead */
- asprintf(&query2, "INSERT INTO %s (instance_id, service_object_id, status_update_time, output, long_output, perfdata, current_state, has_been_checked, should_be_scheduled, current_check_attempt, max_check_attempts, last_check, next_check, check_type, last_state_change, last_hard_state_change, last_hard_state, last_time_ok, last_time_warning, last_time_unknown, last_time_critical, state_type, last_notification, next_notification, no_more_notifications, notifications_enabled, problem_has_been_acknowledged, acknowledgement_type, current_notification_number, passive_checks_enabled, active_checks_enabled, event_handler_enabled, flap_detection_enabled, is_flapping, percent_state_change, latency, execution_time, scheduled_downtime_depth, failure_prediction_enabled, process_performance_data, obsess_over_service, modified_service_attributes, event_handler, check_command, normal_check_interval, retry_check_interval, check_timeperiod_object_id, check_source) VALUES (%lu, %lu, %s, E'%s', E'%s', E'%s', %d, %d, %d, %d, %d, %s, %s, %d, %s, %s, %d, %s, %s, %s, %s, %d, %s, %s, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, '%lf', '%lf', '%lf', %d, %d, %d, %d, %lu, E'%s', E'%s', '%lf', '%lf', %lu, E'%s')",
+ asprintf(&query2, "INSERT INTO %s (instance_id, service_object_id, status_update_time, output, long_output, perfdata, current_state, has_been_checked, should_be_scheduled, current_check_attempt, max_check_attempts, last_check, next_check, check_type, last_state_change, last_hard_state_change, last_hard_state, last_time_ok, last_time_warning, last_time_unknown, last_time_critical, state_type, last_notification, next_notification, no_more_notifications, notifications_enabled, problem_has_been_acknowledged, acknowledgement_type, current_notification_number, passive_checks_enabled, active_checks_enabled, event_handler_enabled, flap_detection_enabled, is_flapping, percent_state_change, latency, execution_time, scheduled_downtime_depth, failure_prediction_enabled, process_performance_data, obsess_over_service, modified_service_attributes, event_handler, check_command, normal_check_interval, retry_check_interval, check_timeperiod_object_id) VALUES (%lu, %lu, %s, E'%s', E'%s', E'%s', %d, %d, %d, %d, %d, %s, %s, %d, %s, %s, %d, %s, %s, %s, %s, %d, %s, %s, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, '%lf', '%lf', '%lf', %d, %d, %d, %d, %lu, E'%s', E'%s', '%lf', '%lf', %lu)",
ido2db_db_tablenames[IDO2DB_DBTABLE_SERVICESTATUS],
*(unsigned long *) data[0], /* insert start */
*(unsigned long *) data[1],
@@ -4222,8 +4206,7 @@
*(char **) data[43],
*(double *) data[44],
*(double *) data[45],
- *(unsigned long *) data[46],
- *(char **) data[58] /* insert end */
+ *(unsigned long *) data[46] /* insert end */
);
/* send query to db */
result = ido2db_db_query(idi, query2);
@@ -4394,15 +4377,6 @@
if (!OCI_BindUnsignedInt(idi->dbinfo.oci_statement_servicestatus, MT(":X47"), (uint *) data[46])) {
return IDO_ERROR;
}
- if (*(char **) data[58] == NULL) {
- if (ido2db_oci_prepared_statement_bind_null_param(idi->dbinfo.oci_statement_servicestatus, ":X48") == IDO_ERROR) {
- return IDO_ERROR;
- }
- } else {
- if (!OCI_BindString(idi->dbinfo.oci_statement_servicestatus, MT(":X48"), *(char **) data[58], 0)) {
- return IDO_ERROR;
- }
- }
//bind clob 2 times,once for update, once for insert to make oracle happy and avoid ora-600 because of double binding
lob_oi = OCI_LobCreate(idi->dbinfo.oci_connection, OCI_CLOB);
lob_ou = OCI_LobCreate(idi->dbinfo.oci_connection, OCI_CLOB);
|
|
[-]
[+]
|
Changed |
icinga-1.10.1.tar.bz2/module/idoutils/src/ido2db.c
^
|
| @@ -2250,8 +2250,6 @@
case IDO_DATA_CUSTOMVARIABLE:
case IDO_DATA_CONTACT:
- case IDO_DATA_CHECKSOURCE:
-
/* strings are escaped when they arrive */
if (buf == NULL)
newbuf = strdup("");
|
|
[-]
[+]
|
Changed |
icinga-1.10.1.tar.bz2/module/idoutils/src/idomod.c
^
|
| @@ -2098,7 +2098,6 @@
es[4] = ido_escape_buffer(temp_host->event_handler);
es[5] = ido_escape_buffer(temp_host->host_check_command);
es[6] = ido_escape_buffer(temp_host->check_period);
- es[7] = ido_escape_buffer(temp_host->check_source);
if(es[2] != NULL) {
if(strlen(es[2]) > IDOMOD_MAX_TEXT_LEN) {
@@ -2115,7 +2114,7 @@
retry_interval = temp_host->retry_interval;
snprintf(temp_buffer, IDOMOD_MAX_BUFLEN - 1
- , "\n%d:\n%d=%d\n%d=%d\n%d=%d\n%d=%ld.%ld\n%d=%s\n%d=%s\n%d=%s\n%d=%s\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%lu\n%d=%lu\n%d=%d\n%d=%lu\n%d=%lu\n%d=%d\n%d=%lu\n%d=%lu\n%d=%lu\n%d=%d\n%d=%lu\n%d=%lu\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%.5lf\n%d=%.5lf\n%d=%.5lf\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%lu\n%d=%s\n%d=%s\n%d=%lf\n%d=%lf\n%d=%s\n%d=%s\n"
+ , "\n%d:\n%d=%d\n%d=%d\n%d=%d\n%d=%ld.%ld\n%d=%s\n%d=%s\n%d=%s\n%d=%s\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%lu\n%d=%lu\n%d=%d\n%d=%lu\n%d=%lu\n%d=%d\n%d=%lu\n%d=%lu\n%d=%lu\n%d=%d\n%d=%lu\n%d=%lu\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%.5lf\n%d=%.5lf\n%d=%.5lf\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%lu\n%d=%s\n%d=%s\n%d=%lf\n%d=%lf\n%d=%s\n"
, IDO_API_HOSTSTATUSDATA
, IDO_DATA_TYPE
, hsdata->type
@@ -2215,8 +2214,6 @@
, (double)retry_interval
, IDO_DATA_HOSTCHECKPERIOD
, (es[6] == NULL) ? "" : es[6]
- , IDO_DATA_CHECKSOURCE
- , (es[7] == NULL) ? "" : es[7]
);
temp_buffer[IDOMOD_MAX_BUFLEN-1] = '\x0';
@@ -2274,7 +2271,6 @@
es[5] = ido_escape_buffer(temp_service->event_handler);
es[6] = ido_escape_buffer(temp_service->service_check_command);
es[7] = ido_escape_buffer(temp_service->check_period);
- es[8] = ido_escape_buffer(temp_service->check_source);
if(es[3] != NULL) {
if(strlen(es[3]) > IDOMOD_MAX_TEXT_LEN) {
@@ -2289,7 +2285,7 @@
}
snprintf(temp_buffer, IDOMOD_MAX_BUFLEN - 1
- , "\n%d:\n%d=%d\n%d=%d\n%d=%d\n%d=%ld.%ld\n%d=%s\n%d=%s\n%d=%s\n%d=%s\n%d=%s\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%lu\n%d=%lu\n%d=%d\n%d=%lu\n%d=%lu\n%d=%d\n%d=%lu\n%d=%lu\n%d=%lu\n%d=%lu\n%d=%d\n%d=%lu\n%d=%lu\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%.5lf\n%d=%.5lf\n%d=%.5lf\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%lu\n%d=%s\n%d=%s\n%d=%lf\n%d=%lf\n%d=%s\n%d=%s\n"
+ , "\n%d:\n%d=%d\n%d=%d\n%d=%d\n%d=%ld.%ld\n%d=%s\n%d=%s\n%d=%s\n%d=%s\n%d=%s\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%lu\n%d=%lu\n%d=%d\n%d=%lu\n%d=%lu\n%d=%d\n%d=%lu\n%d=%lu\n%d=%lu\n%d=%lu\n%d=%d\n%d=%lu\n%d=%lu\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%.5lf\n%d=%.5lf\n%d=%.5lf\n%d=%d\n%d=%d\n%d=%d\n%d=%d\n%d=%lu\n%d=%s\n%d=%s\n%d=%lf\n%d=%lf\n%d=%s\n"
, IDO_API_SERVICESTATUSDATA
, IDO_DATA_TYPE
, ssdata->type
@@ -2393,8 +2389,6 @@
, (double)temp_service->retry_interval
, IDO_DATA_SERVICECHECKPERIOD
, (es[7] == NULL) ? "" : es[7]
- , IDO_DATA_CHECKSOURCE
- , (es[8] == NULL) ? "" : es[8]
);
temp_buffer[IDOMOD_MAX_BUFLEN-1] = '\x0';
|
|
[-]
[+]
|
Added |
icinga-1.10.1.tar.bz2/tests/etc/4967.cfg.disabled
^
|
| @@ -0,0 +1,101 @@
+#############################################################################################
+# ICINGA TEST CONFIG BY ISSUES
+# (c) 2009-2013 Icinga Development Team and Community Contributors
+#
+# #4967
+# Add line number information to config verification error messages.
+#############################################################################################
+
+define command {
+ command_name 4967check_env
+ command_line /usr/bin/env >> /tmp/4967_icinga.$TIMET$.env
+}
+
+
+define host{
+ name 4967linux-server
+ check_period testconfig-24x7
+ check_interval 5
+ retry_interval 1
+ max_check_attempts 10
+ check_command testconfig-check-host-alive
+ notification_period testconfig-workhours
+ notification_interval 120
+ notification_options d,u,r
+ register 0
+ ; trigger no contacts defined warning
+}
+
+
+define host{
+ use 4967linux-server
+ host_name 4967localhost
+ alias 4967localhost
+ address 127.0.0.1
+ address6 ::1
+}
+
+define host{
+ use 4967linux-server
+ host_name 4967localhostnoservices ; trigger no services warning (use -vv)
+ alias 4967localhost
+ address 127.0.0.1
+ address6 ::1
+}
+
+define service {
+ name 4967generic-error-message-check
+ event_handler eventhandlerdoesnotexisttriggererror ; trigger event handler error
+ is_volatile 0
+ check_command checkcommanddoesnotexist ; trigger check command error
+ max_check_attempts 2
+ normal_check_interval 2
+ retry_check_interval 1
+ active_checks_enabled 1
+ passive_checks_enabled 1
+ parallelize_check 1
+ obsess_over_service 1
+ check_freshness 0
+ event_handler_enabled 1
+ flap_detection_enabled 1
+ process_perf_data 1
+ retain_status_information 1
+ retain_nonstatus_information 1
+ notification_interval 120
+ notification_period testconfig-24x7
+ notification_options r ; trigger recovery verification error
+ notifications_enabled 1
+ register 0
+}
+
+define service {
+ use 4967generic-error-message-check
+ host_name 4967localhost
+ contacts testconfig-test_contact*|'"<>? ; trigger illegal object chars error
+ service_description 4967ERRORMSG
+ check_period testconfig-24x7
+}
+
+define service {
+ use 4967generic-error-message-check
+ host_name 4967localhost
+ service_description 4967ERRORMSG2
+ contacts null ; trigger missing contact* warning
+ contact_groups null ; trigger missing contact* warning
+ check_period null ; trigger missing check_period warning
+ notification_period null ; trigger missing notification_period warning
+ check_interval 60 ; trigger notification_interval < check_interval warning
+ notification_interval 10 ; trigger notification_interval < check_interval warning
+}
+
+# contact with illegal object name chars
+define contact{
+ contact_name testconfig-test_contact*|'"<>?
+ alias testconfig-test_contact_alias
+ service_notification_options w,u,c,r
+ host_notification_options d,r
+ service_notification_commands notificationcommanddoesnotexist ; trigger service_notification_command error
+ ; trigger host_notification_commands error
+ email icinga@localhost
+}
+
|
|
[-]
[+]
|
Changed |
icinga-1.10.1.tar.bz2/update-version
^
|
| @@ -10,10 +10,10 @@
fi
# Current version number
-CURRENTVERSION=1.10.0
+CURRENTVERSION=1.10.1
# Last date
-LASTDATE=10-24-2013
+LASTDATE=11-04-2013
if [ "x$1" = "x" ]
then
|
|
[-]
[+]
|
Changed |
icinga-1.10.1.tar.bz2/xdata/xodtemplate.c
^
|
| @@ -128,6 +128,8 @@
extern int allow_empty_hostgroup_assignment;
+static debuginfo *debuginfo_buckets[4096];
+
int xodtemplate_create_escalation_condition(char*, xodtemplate_escalation_condition*);
/*
@@ -8865,6 +8867,8 @@
return ERROR;
}
+ xodtemplate_set_debuginfo(new_timeperiod, this_timeperiod);
+
/* add all exceptions to timeperiod */
for (x = 0; x < DATERANGE_TYPES; x++) {
for (temp_daterange = this_timeperiod->exceptions[x]; temp_daterange != NULL; temp_daterange = temp_daterange->next) {
@@ -9020,6 +9024,8 @@
return ERROR;
}
+ xodtemplate_set_debuginfo(new_command, this_command);
+
return OK;
}
@@ -9044,6 +9050,8 @@
return ERROR;
}
+ xodtemplate_set_debuginfo(new_contactgroup, this_contactgroup);
+
/* Need to check for NULL because strtok could use a NULL value to check the previous string's token value */
if (this_contactgroup->members != NULL) {
for (contact_name = strtok(this_contactgroup->members, ","); contact_name != NULL; contact_name = strtok(NULL, ",")) {
@@ -9080,6 +9088,8 @@
return ERROR;
}
+ xodtemplate_set_debuginfo(new_hostgroup, this_hostgroup);
+
if (this_hostgroup->members != NULL) {
for (host_name = strtok(this_hostgroup->members, ","); host_name != NULL; host_name = strtok(NULL, ",")) {
strip(host_name);
@@ -9116,6 +9126,8 @@
return ERROR;
}
+ xodtemplate_set_debuginfo(new_servicegroup, this_servicegroup);
+
if (this_servicegroup->members != NULL) {
for (host_name = strtok(this_servicegroup->members, ","); host_name != NULL; host_name = strtok(NULL, ",")) {
strip(host_name);
@@ -9163,6 +9175,8 @@
logit(NSLOG_CONFIG_ERROR, TRUE, "Error: Could not register service execution dependency (config file '%s', starting on line %d)\n", xodtemplate_config_file_name(this_servicedependency->_config_file), this_servicedependency->_start_line);
return ERROR;
}
+
+ xodtemplate_set_debuginfo(new_servicedependency, this_servicedependency);
}
if (this_servicedependency->have_notification_dependency_options == TRUE) {
@@ -9173,6 +9187,8 @@
logit(NSLOG_CONFIG_ERROR, TRUE, "Error: Could not register service notification dependency (config file '%s', starting on line %d)\n", xodtemplate_config_file_name(this_servicedependency->_config_file), this_servicedependency->_start_line);
return ERROR;
}
+
+ xodtemplate_set_debuginfo(new_servicedependency, this_servicedependency);
}
return OK;
@@ -9209,6 +9225,8 @@
return ERROR;
}
+ xodtemplate_set_debuginfo(new_serviceescalation, this_serviceescalation);
+
/* add the contact groups */
if (this_serviceescalation->contact_groups != NULL) {
@@ -9288,6 +9306,8 @@
return ERROR;
}
+ xodtemplate_set_debuginfo(new_contact, this_contact);
+
/* add all the host notification commands */
if (this_contact->host_notification_commands != NULL) {
@@ -9358,6 +9378,8 @@
return ERROR;
}
+ xodtemplate_set_debuginfo(new_host, this_host);
+
/* add the parent hosts */
if (this_host->parents != NULL) {
@@ -9434,6 +9456,8 @@
return ERROR;
}
+ xodtemplate_set_debuginfo(new_service, this_service);
+
/* add all contact groups to the service */
if (this_service->contact_groups != NULL) {
@@ -9496,6 +9520,8 @@
logit(NSLOG_CONFIG_ERROR, TRUE, "Error: Could not register host execution dependency (config file '%s', starting on line %d)\n", xodtemplate_config_file_name(this_hostdependency->_config_file), this_hostdependency->_start_line);
return ERROR;
}
+
+ xodtemplate_set_debuginfo(new_hostdependency, this_hostdependency);
}
/* add the host notification dependency */
@@ -9508,6 +9534,8 @@
logit(NSLOG_CONFIG_ERROR, TRUE, "Error: Could not register host notification dependency (config file '%s', starting on line %d)\n", xodtemplate_config_file_name(this_hostdependency->_config_file), this_hostdependency->_start_line);
return ERROR;
}
+
+ xodtemplate_set_debuginfo(new_hostdependency, this_hostdependency);
}
return OK;
@@ -9543,6 +9571,8 @@
return ERROR;
}
+ xodtemplate_set_debuginfo(new_hostescalation, this_hostescalation);
+
/* add all contact groups */
if (this_hostescalation->contact_groups != NULL) {
@@ -9618,6 +9648,8 @@
return ERROR;
}
+ xodtemplate_set_debuginfo(new_module, this_module);
+
return OK;
}
@@ -14307,3 +14339,71 @@
return result;
}
+debuginfo *get_debuginfo(void *cookie) {
+ debuginfo *di;
+ int bucket = (intptr_t)cookie % (sizeof(debuginfo_buckets) / sizeof(debuginfo_buckets[0]));
+
+ for (di = debuginfo_buckets[bucket]; di; di = di->next)
+ if (di->cookie == cookie)
+ return di;
+
+ return NULL;
+}
+
+const char *format_debuginfo(void *cookie) {
+ static char *text;
+ debuginfo *di = get_debuginfo(cookie);
+
+ if (!di)
+ return "unknown file/line";
+
+ free(text);
+ (void) asprintf(&text, "file '%s', line %d", di->file, di->line);
+
+ return text;
+}
+
+void set_debuginfo(void *cookie, const char *file, int line) {
+ debuginfo *di;
+ int bucket = (intptr_t)cookie % (sizeof(debuginfo_buckets) / sizeof(debuginfo_buckets[0]));
+
+ for (di = debuginfo_buckets[bucket]; di; di = di->next) {
+ if (di->cookie == cookie) {
+ free(di->file);
+ break;
+ }
+ }
+
+ if (!di) {
+ di = malloc(sizeof(debuginfo));
+ di->cookie = cookie;
+ di->next = debuginfo_buckets[bucket];
+ debuginfo_buckets[bucket] = di;
+ }
+
+ di->file = strdup(file);
+ di->line = line;
+}
+
+void purge_debuginfo(void) {
+ int i;
+ debuginfo *next;
+
+ for (i = 0; i < sizeof(debuginfo_buckets) / sizeof(debuginfo_buckets[0]); i++) {
+ while (debuginfo_buckets[i]) {
+ next = debuginfo_buckets[i]->next;
+ free(debuginfo_buckets[i]->file);
+ free(debuginfo_buckets[i]);
+ debuginfo_buckets[i] = next;
+ }
+ }
+}
+
+void xodtemplate_set_debuginfo(void *object, void *xodtemplate) {
+ /* Thanks to the xodtemplate_* struct layout this is guaranteed to
+ * work. Nevertheless, it's quite evil. */
+ xodtemplate_timeperiod *real_template = (xodtemplate_timeperiod *)xodtemplate;
+
+ set_debuginfo(object, xodtemplate_config_file_name(real_template->_config_file), real_template->_start_line);
+}
+
|
|
[-]
[+]
|
Changed |
icinga-1.10.1.tar.bz2/xdata/xodtemplate.h
^
|
| @@ -854,6 +854,14 @@
struct xodtemplate_memberlist_struct *next;
}xodtemplate_memberlist;
+/* CONFIG DEBUG INFO */
+typedef struct debuginfo_struct{
+ void *cookie;
+ char *file;
+ int line;
+ struct debuginfo_struct *next;
+ }debuginfo;
+
/***** CHAINED HASH DATA STRUCTURES ******/
@@ -863,7 +871,6 @@
}xodtemplate_service_cursor;
-
/********* FUNCTION DEFINITIONS **********/
int xodtemplate_read_config_data(char *,int,int,int); /* top-level routine processes all config files */
@@ -871,6 +878,12 @@
int xodtemplate_process_config_file(char *,int); /* process data in a specific config file */
int xodtemplate_process_config_dir(char *,int); /* process all files in a specific config directory */
+debuginfo *get_debuginfo(void *cookie);
+const char *format_debuginfo(void *cookie);
+void set_debuginfo(void *cookie, const char *file, int line);
+void purge_debuginfo(void);
+void xodtemplate_set_debuginfo(void *object, void *xodtemplate);
+
#ifdef NSCORE
xodtemplate_memberlist *xodtemplate_expand_contactgroups_and_contacts(char *,char *,int,int);
int xodtemplate_expand_contactgroups(xodtemplate_memberlist **,xodtemplate_memberlist **,char *,int,int);
|
|
[-]
[+]
|
Changed |
icinga-1.10.1.tar.bz2/xdata/xsddefault.c
^
|
| @@ -444,7 +444,6 @@
fprintf(fp, "\tplugin_output=%s\n", (temp_host->plugin_output == NULL) ? "" : temp_host->plugin_output);
fprintf(fp, "\tlong_plugin_output=%s\n", (temp_host->long_plugin_output == NULL) ? "" : temp_host->long_plugin_output);
fprintf(fp, "\tperformance_data=%s\n", (temp_host->perf_data == NULL) ? "" : temp_host->perf_data);
- fprintf(fp, "\tcheck_source=%s\n", (temp_host->check_source == NULL) ? "" : temp_host->check_source);
fprintf(fp, "\tlast_check=%lu\n", temp_host->last_check);
fprintf(fp, "\tnext_check=%lu\n", temp_host->next_check);
fprintf(fp, "\tcheck_options=%d\n", temp_host->check_options);
@@ -532,7 +531,6 @@
fprintf(fp, "\tplugin_output=%s\n", (temp_service->plugin_output == NULL) ? "" : temp_service->plugin_output);
fprintf(fp, "\tlong_plugin_output=%s\n", (temp_service->long_plugin_output == NULL) ? "" : temp_service->long_plugin_output);
fprintf(fp, "\tperformance_data=%s\n", (temp_service->perf_data == NULL) ? "" : temp_service->perf_data);
- fprintf(fp, "\tcheck_source=%s\n", (temp_service->check_source == NULL) ? "" : temp_service->check_source);
fprintf(fp, "\tlast_check=%lu\n", temp_service->last_check);
fprintf(fp, "\tnext_check=%lu\n", temp_service->next_check);
fprintf(fp, "\tcheck_options=%d\n", temp_service->check_options);
|
|
[-]
[+]
|
Deleted |
icinga-core.git-eca694ab5905f2a827f9e46fbb7a0ef3bb0b4b9b.txt
^
|
| @@ -1,747 +0,0 @@
-From: Michael Friedrich <Michael.Friedrich@netways.de>
-Date: Mon, 28 Oct 2013 19:06:41 +0000 (+0100)
-Subject: core/idoutils: revert check_source attribute due to mod_gearman manipulating in-memor...
-X-Git-Url: https://git.icinga.org/?p=icinga-core.git;a=commitdiff_plain;h=eca694ab5905f2a827f9e46fbb7a0ef3bb0b4b9b;hp=6fbac667be3335c8cdb1bf1d24ac27ecf21df841
-
-core/idoutils: revert check_source attribute due to mod_gearman manipulating in-memory checkresult list
-
-mod_gearman uses the old nagios headers where check_source is not
-available. while using object compiler tricks with attribute at the end
-will work on direct object casts, this does not work with a neb broker
-addon which manipulates the doubly-linked check result list in memory
-stashing objects of different type altogether causing memory corruption.
-
-while the "thing" mod_gearman does in core memory remains a clear
-violation of the neb api ("subscribe to a neb callback and do stuff")
-it's just yet another proof that the neb api is not a safe place for
-innovative core features at all.
-
-reverting the check_source feature in 1.x for the sake of compatibility
-and only using 'check_source' in Icinga 2 as additional attribute.
-
-(been saying that for 4+ years now that core memory manipulation by addons
-is a bad thing, but noone ever believed me)
-
-refs #4958
----
-
-diff --git a/Changelog b/Changelog
-index dd1d90b..9a06f1d 100644
---- a/Changelog
-+++ b/Changelog
-@@ -13,6 +13,12 @@ UPGRADE NOTES
- - idoutils: ${source}/module/idoutils/config/updates
- * package locations may differ!
-
-+1.10.1 - XX/YY/2013
-+
-+* core/idoutils: revert check_source attribute due to mod_gearman manipulating in-memory checkresult list #4958 - MF
-+ ** classic ui/idoutils schema: functionality is kept only for Icinga 2 support
-+
-+
- 1.10.0 - 24/10/2013
-
- * idoutils: slahistory table must be removed manually after enable_sla removal #4363
-diff --git a/base/broker.c b/base/broker.c
-index 58f1acb..0cfff17 100644
---- a/base/broker.c
-+++ b/base/broker.c
-@@ -258,7 +258,7 @@ int broker_event_handler(int type, int flags, int attr, int eventhandler_type, v
-
-
- /* send host check data to broker */
--int broker_host_check(int type, int flags, int attr, host *hst, int check_type, int state, int state_type, struct timeval start_time, struct timeval end_time, char *cmd, double latency, double exectime, int timeout, int early_timeout, int retcode, char *cmdline, char *output, char *long_output, char *perfdata, struct timeval *timestamp, char *check_source) {
-+int broker_host_check(int type, int flags, int attr, host *hst, int check_type, int state, int state_type, struct timeval start_time, struct timeval end_time, char *cmd, double latency, double exectime, int timeout, int early_timeout, int retcode, char *cmdline, char *output, char *long_output, char *perfdata, struct timeval *timestamp) {
- char *command_buf = NULL;
- char *command_name = NULL;
- char *command_args = NULL;
-@@ -317,7 +317,7 @@ int broker_host_check(int type, int flags, int attr, host *hst, int check_type,
-
-
- /* send service check data to broker */
--int broker_service_check(int type, int flags, int attr, service *svc, int check_type, struct timeval start_time, struct timeval end_time, char *cmd, double latency, double exectime, int timeout, int early_timeout, int retcode, char *cmdline, struct timeval *timestamp, char *check_source) {
-+int broker_service_check(int type, int flags, int attr, service *svc, int check_type, struct timeval start_time, struct timeval end_time, char *cmd, double latency, double exectime, int timeout, int early_timeout, int retcode, char *cmdline, struct timeval *timestamp) {
- char *command_buf = NULL;
- char *command_name = NULL;
- char *command_args = NULL;
-diff --git a/base/checks.c b/base/checks.c
-index b092e81..16d1cd7 100644
---- a/base/checks.c
-+++ b/base/checks.c
-@@ -541,7 +541,7 @@ int run_async_service_check(service *svc, int check_options, double latency, int
- end_time.tv_usec = 0L;
-
- /* send data to event broker */
-- neb_result = broker_service_check(NEBTYPE_SERVICECHECK_ASYNC_PRECHECK, NEBFLAG_NONE, NEBATTR_NONE, svc, SERVICE_CHECK_ACTIVE, start_time, end_time, svc->service_check_command, svc->latency, 0.0, 0, FALSE, 0, NULL, NULL, NULL);
-+ neb_result = broker_service_check(NEBTYPE_SERVICECHECK_ASYNC_PRECHECK, NEBFLAG_NONE, NEBATTR_NONE, svc, SERVICE_CHECK_ACTIVE, start_time, end_time, svc->service_check_command, svc->latency, 0.0, 0, FALSE, 0, NULL, NULL);
-
- if (neb_result == NEBERROR_CALLBACKCANCEL || neb_result == NEBERROR_CALLBACKOVERRIDE) {
- log_debug_info(DEBUGL_CHECKS, 0, "Check of service '%s' on host '%s' was %s by a module\n",
-@@ -610,7 +610,7 @@ int run_async_service_check(service *svc, int check_options, double latency, int
-
- #ifdef USE_EVENT_BROKER
- /* send data to event broker */
-- neb_result = broker_service_check(NEBTYPE_SERVICECHECK_INITIATE, NEBFLAG_NONE, NEBATTR_NONE, svc, SERVICE_CHECK_ACTIVE, start_time, end_time, svc->service_check_command, svc->latency, 0.0, service_check_timeout, FALSE, 0, processed_command, NULL, NULL);
-+ neb_result = broker_service_check(NEBTYPE_SERVICECHECK_INITIATE, NEBFLAG_NONE, NEBATTR_NONE, svc, SERVICE_CHECK_ACTIVE, start_time, end_time, svc->service_check_command, svc->latency, 0.0, service_check_timeout, FALSE, 0, processed_command, NULL);
-
- my_free(svc->processed_command);
- svc->processed_command = strdup(processed_command);
-@@ -1194,7 +1194,6 @@ int handle_async_service_check_result(service *temp_service, check_result *queue
- log_debug_info(DEBUGL_CHECKS, 2, "Short Output: %s\n", (temp_service->plugin_output == NULL) ? "NULL" : temp_service->plugin_output);
- log_debug_info(DEBUGL_CHECKS, 2, "Long Output: %s\n", (temp_service->long_plugin_output == NULL) ? "NULL" : temp_service->long_plugin_output);
- log_debug_info(DEBUGL_CHECKS, 2, "Perf Data: %s\n", (temp_service->perf_data == NULL) ? "NULL" : temp_service->perf_data);
-- log_debug_info(DEBUGL_CHECKS, 2, "Check Source: %s\n", (queued_check_result->source == NULL) ? "NULL" : queued_check_result->source);
-
- /* grab the return code */
- temp_service->current_state = queued_check_result->return_code;
-@@ -1818,15 +1817,9 @@ int handle_async_service_check_result(service *temp_service, check_result *queue
- }
- }
-
-- /* set check source */
-- if (queued_check_result->source != NULL)
-- temp_service->check_source = (char *)strdup(queued_check_result->source);
-- else
-- temp_service->check_source = (char *)strdup("(local)");
--
- #ifdef USE_EVENT_BROKER
- /* send data to event broker */
-- broker_service_check(NEBTYPE_SERVICECHECK_PROCESSED, NEBFLAG_NONE, NEBATTR_NONE, temp_service, temp_service->check_type, queued_check_result->start_time, queued_check_result->finish_time, temp_service->service_check_command, temp_service->latency, temp_service->execution_time, service_check_timeout, queued_check_result->early_timeout, queued_check_result->return_code, temp_service->processed_command, NULL, temp_service->check_source);
-+ broker_service_check(NEBTYPE_SERVICECHECK_PROCESSED, NEBFLAG_NONE, NEBATTR_NONE, temp_service, temp_service->check_type, queued_check_result->start_time, queued_check_result->finish_time, temp_service->service_check_command, temp_service->latency, temp_service->execution_time, service_check_timeout, queued_check_result->early_timeout, queued_check_result->return_code, temp_service->processed_command, NULL);
- #endif
-
- /* set the checked flag */
-@@ -2855,7 +2848,7 @@ int run_sync_host_check_3x(host *hst, int *check_result_code, int check_options,
- /* send data to event broker */
- end_time.tv_sec = 0L;
- end_time.tv_usec = 0L;
-- broker_host_check(NEBTYPE_HOSTCHECK_INITIATE, NEBFLAG_NONE, NEBATTR_NONE, hst, HOST_CHECK_ACTIVE, hst->current_state, hst->state_type, start_time, end_time, hst->host_check_command, hst->latency, 0.0, host_check_timeout, FALSE, 0, NULL, NULL, NULL, NULL, NULL, NULL);
-+ broker_host_check(NEBTYPE_HOSTCHECK_INITIATE, NEBFLAG_NONE, NEBATTR_NONE, hst, HOST_CHECK_ACTIVE, hst->current_state, hst->state_type, start_time, end_time, hst->host_check_command, hst->latency, 0.0, host_check_timeout, FALSE, 0, NULL, NULL, NULL, NULL, NULL);
- #endif
-
- /* execute the host check */
-@@ -2874,7 +2867,7 @@ int run_sync_host_check_3x(host *hst, int *check_result_code, int check_options,
-
- #ifdef USE_EVENT_BROKER
- /* send data to event broker */
-- broker_host_check(NEBTYPE_HOSTCHECK_PROCESSED, NEBFLAG_NONE, NEBATTR_NONE, hst, HOST_CHECK_ACTIVE, hst->current_state, hst->state_type, start_time, end_time, hst->host_check_command, hst->latency, hst->execution_time, host_check_timeout, FALSE, hst->current_state, hst->processed_command, hst->plugin_output, hst->long_plugin_output, hst->perf_data, NULL, hst->check_source);
-+ broker_host_check(NEBTYPE_HOSTCHECK_PROCESSED, NEBFLAG_NONE, NEBATTR_NONE, hst, HOST_CHECK_ACTIVE, hst->current_state, hst->state_type, start_time, end_time, hst->host_check_command, hst->latency, hst->execution_time, host_check_timeout, FALSE, hst->current_state, hst->processed_command, hst->plugin_output, hst->long_plugin_output, hst->perf_data, NULL);
- #endif
-
- return result;
-@@ -2916,7 +2909,7 @@ int execute_sync_host_check_3x(host *hst) {
- end_time.tv_usec = 0L;
-
- /* send data to event broker */
-- neb_result = broker_host_check(NEBTYPE_HOSTCHECK_SYNC_PRECHECK, NEBFLAG_NONE, NEBATTR_NONE, hst, HOST_CHECK_ACTIVE, hst->current_state, hst->state_type, start_time, end_time, hst->host_check_command, hst->latency, 0.0, host_check_timeout, FALSE, 0, NULL, NULL, NULL, NULL, NULL, NULL);
-+ neb_result = broker_host_check(NEBTYPE_HOSTCHECK_SYNC_PRECHECK, NEBFLAG_NONE, NEBATTR_NONE, hst, HOST_CHECK_ACTIVE, hst->current_state, hst->state_type, start_time, end_time, hst->host_check_command, hst->latency, 0.0, host_check_timeout, FALSE, 0, NULL, NULL, NULL, NULL, NULL);
-
- /*
- * neb module wants to cancel/override the host check
-@@ -2966,11 +2959,11 @@ int execute_sync_host_check_3x(host *hst) {
- /* send data to event broker */
- end_time.tv_sec = 0L;
- end_time.tv_usec = 0L;
-- broker_host_check(NEBTYPE_HOSTCHECK_RAW_START, NEBFLAG_NONE, NEBATTR_NONE, hst, HOST_CHECK_ACTIVE, return_result, hst->state_type, start_time, end_time, hst->host_check_command, 0.0, 0.0, host_check_timeout, early_timeout, result, processed_command, hst->plugin_output, hst->long_plugin_output, hst->perf_data, NULL, NULL);
-+ broker_host_check(NEBTYPE_HOSTCHECK_RAW_START, NEBFLAG_NONE, NEBATTR_NONE, hst, HOST_CHECK_ACTIVE, return_result, hst->state_type, start_time, end_time, hst->host_check_command, 0.0, 0.0, host_check_timeout, early_timeout, result, processed_command, hst->plugin_output, hst->long_plugin_output, hst->perf_data, NULL);
- #endif
-
- log_debug_info(DEBUGL_COMMANDS, 1, "Raw host check command: %s\n", raw_command);
-- log_debug_info(DEBUGL_COMMANDS, 0, "Processed host check command: %s\n", processed_command);
-+ log_debug_info(DEBUGL_COMMANDS, 0, "Processed host check ommand: %s\n", processed_command);
- my_free(raw_command);
-
- /* clear plugin output and performance data buffers */
-@@ -3037,12 +3030,9 @@ int execute_sync_host_check_3x(host *hst) {
- /* high resolution end time for event broker */
- gettimeofday(&end_time, NULL);
-
-- /* set check source */
-- hst->check_source = (char *)strdup("(local)");
--
- #ifdef USE_EVENT_BROKER
- /* send data to event broker */
-- broker_host_check(NEBTYPE_HOSTCHECK_RAW_END, NEBFLAG_NONE, NEBATTR_NONE, hst, HOST_CHECK_ACTIVE, return_result, hst->state_type, start_time, end_time, hst->host_check_command, 0.0, exectime, host_check_timeout, early_timeout, result, processed_command, hst->plugin_output, hst->long_plugin_output, hst->perf_data, NULL, hst->check_source);
-+ broker_host_check(NEBTYPE_HOSTCHECK_RAW_END, NEBFLAG_NONE, NEBATTR_NONE, hst, HOST_CHECK_ACTIVE, return_result, hst->state_type, start_time, end_time, hst->host_check_command, 0.0, exectime, host_check_timeout, early_timeout, result, processed_command, hst->plugin_output, hst->long_plugin_output, hst->perf_data, NULL);
- #endif
-
- log_debug_info(DEBUGL_CHECKS, 0, "** Sync host check done: state=%d\n", return_result);
-@@ -3187,7 +3177,7 @@ int run_async_host_check_3x(host *hst, int check_options, double latency, int sc
- end_time.tv_usec = 0L;
-
- /* send data to event broker */
-- neb_result = broker_host_check(NEBTYPE_HOSTCHECK_ASYNC_PRECHECK, NEBFLAG_NONE, NEBATTR_NONE, hst, HOST_CHECK_ACTIVE, hst->current_state, hst->state_type, start_time, end_time, hst->host_check_command, hst->latency, 0.0, host_check_timeout, FALSE, 0, NULL, NULL, NULL, NULL, NULL, NULL);
-+ neb_result = broker_host_check(NEBTYPE_HOSTCHECK_ASYNC_PRECHECK, NEBFLAG_NONE, NEBATTR_NONE, hst, HOST_CHECK_ACTIVE, hst->current_state, hst->state_type, start_time, end_time, hst->host_check_command, hst->latency, 0.0, host_check_timeout, FALSE, 0, NULL, NULL, NULL, NULL, NULL);
-
- /* neb module wants to cancel the host check - the check will be rescheduled for a later time by the scheduling logic */
- if (neb_result == NEBERROR_CALLBACKCANCEL)
-@@ -3309,7 +3299,7 @@ int run_async_host_check_3x(host *hst, int check_options, double latency, int sc
-
- #ifdef USE_EVENT_BROKER
- /* send data to event broker */
-- broker_host_check(NEBTYPE_HOSTCHECK_INITIATE, NEBFLAG_NONE, NEBATTR_NONE, hst, HOST_CHECK_ACTIVE, hst->current_state, hst->state_type, start_time, end_time, hst->host_check_command, hst->latency, 0.0, host_check_timeout, FALSE, 0, processed_command, NULL, NULL, NULL, NULL, NULL);
-+ broker_host_check(NEBTYPE_HOSTCHECK_INITIATE, NEBFLAG_NONE, NEBATTR_NONE, hst, HOST_CHECK_ACTIVE, hst->current_state, hst->state_type, start_time, end_time, hst->host_check_command, hst->latency, 0.0, host_check_timeout, FALSE, 0, processed_command, NULL, NULL, NULL, NULL);
- #endif
-
- /* reset latency (permanent value for this check will get set later) */
-@@ -3507,7 +3497,6 @@ int handle_async_host_check_result_3x(host *temp_host, check_result *queued_chec
- log_debug_info(DEBUGL_CHECKS, 2, "\tLatency: %.3f\n", temp_host->latency);
- log_debug_info(DEBUGL_CHECKS, 2, "\tReturn Status: %d\n", queued_check_result->return_code);
- log_debug_info(DEBUGL_CHECKS, 2, "\tOutput: %s\n", (queued_check_result == NULL) ? "NULL" : queued_check_result->output);
-- log_debug_info(DEBUGL_CHECKS, 2, "\tSource: %s\n", (queued_check_result == NULL) ? "NULL" : queued_check_result->source);
-
- /* decrement the number of host checks still out there... */
- if (queued_check_result->check_type == HOST_CHECK_ACTIVE && currently_running_host_checks > 0)
-@@ -3663,11 +3652,6 @@ int handle_async_host_check_result_3x(host *temp_host, check_result *queued_chec
- result = HOST_DOWN;
- }
-
-- /* set check source */
|
