Skip to content

GitLab

univention-pkg-icinga
univention-pkg-icinga
Commit b64d2902 authored by Alexander Wirt's avatar Alexander Wirt
Browse files
Options

Imported Upstream version 1.7.1

parent c3664d6b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3282 additions and 3596 deletions
Changelog
View file @ b64d2902
......@@ -4,6 +4,26 @@ Icinga 1.7.x Change Log
Thanks to all contributers, testers and developers. Please read AUTHORS and THANKS for a detailed list :-)
1.7.1 - 18/06/2012
FIXES
* core: use prefix in solaris service definition #2609 - TD/CF
* core: fix various memory leaks in downtime eventhandling on SIGHUP (Carlos Velasco) #2666 - MF
* classic ui: Fixed status.cgi time out when displaying hostgroups in large environments #2617 - RB
* classic ui: Fixed Invalid JSON output for hostgroup overview (Torsten Rehn) #2680 - RB
* classic ui: Fixed Confusing use of display_name in JSON and CSV output (Torsten Rehn) #2681 - RB
* classic ui: Fixed wrong totals in "Service Status Summary" on Status Summary page (Mark Ziesemer) #2689 - RB
* idoutils: fix small compiler issues #2620 - TD/CF
* idoutils: fix upgradedb script typos & past changes #2682 - MF
* config: check_ido2db_procs.cfg should not depend on local-service template #2616 - MF
* install: adapt lsb headers for icinga and ido2db #2637 - MF
* install: fix typo in contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event (thanks uosiu) #2671 - MF
1.7.0 - 15/05/2012
!!! ATTENTION !!!
......
Changelog_json
View file @ b64d2902
......@@ -2,6 +2,10 @@
Classic-UI JSON Change Log
#######################
1.7.1 - only values added, no existing values changed
* added host_display_name to host and service status data
* added service_display_name to service status data
1.7.0 - array names changed!!!! #2343
comments -> host_comments / service_comments
downtimes -> host_downtimes / service_downtimes
......
Makefile.in
View file @ b64d2902
......@@ -78,7 +78,7 @@ MKDIR=/bin/mkdir
###############################
# Global
###############################
ICINGA_VERSION=1.7.0
ICINGA_VERSION=1.7.1
CP=@CP@
......@@ -271,6 +271,7 @@ distclean: clean
rm -f Makefile subst p1.pl
rm -f config.log config.status config.cache
rm -f t/var/objects.precache.generated t/var/objects.precache
rm -f solaris/icinga.xml
devclean: distclean
......
README.RHEL.idoutils
View file @ b64d2902
......@@ -51,7 +51,7 @@ Create Database, User, Grants
mysql> CREATE DATABASE icinga;
Query OK, 1 row affected (0.01 sec)
mysql> GRANT USAGE ON *.* TO 'icinga'@'localhost'
mysql> GRANT USAGE ON icinga.* TO 'icinga'@'localhost'
IDENTIFIED BY 'icinga'
WITH MAX_QUERIES_PER_HOUR 0
MAX_CONNECTIONS_PER_HOUR 0
......
THANKS
View file @ b64d2902
......@@ -241,6 +241,7 @@ in various ways. If we missed your name, let us know.
* Joachim Raber
* Alain Radix
* Kenneth Ray
* Torsten Rehn
* Nick Reinking
* Rob Remus
* Alessandro Ren
......@@ -315,6 +316,7 @@ in various ways. If we missed your name, let us know.
* Esteban Manchado Velazquez
* Geert Vanderkelen
* Jan Vejvalka
* Carlos Velasco
* Robert August Vincent II
* Dave Viner
* Ton Voon
......@@ -337,6 +339,7 @@ in various ways. If we missed your name, let us know.
* Cliff Woolley
* Mitch Wright
* Jason Young
* Mark Ziesemer
* Michal Zimen
* Dennis van Zuijlekom
* Pawel Zuzelski
base/utils.c
View file @ b64d2902
......@@ -4264,6 +4264,8 @@ void free_memory(icinga_macros *mac) {
/* free memory for the high priority event list */
this_event = event_list_high;
while (this_event != NULL) {
if (this_event->event_type == EVENT_SCHEDULED_DOWNTIME)
my_free(this_event->event_data);
next_event = this_event->next;
my_free(this_event);
this_event = next_event;
......@@ -4275,6 +4277,8 @@ void free_memory(icinga_macros *mac) {
/* free memory for the low priority event list */
this_event = event_list_low;
while (this_event != NULL) {
if (this_event->event_type == EVENT_SCHEDULED_DOWNTIME)
my_free(this_event->event_data);
next_event = this_event->next;
my_free(this_event);
this_event = next_event;
......
cgi/extinfo.c
View file @ b64d2902
......@@ -3056,9 +3056,9 @@ void show_comments(int type) {
printf("\"expires\": \"%s\" }", expire_time);
} else if (content_type == CSV_CONTENT) {
if (display_type == DISPLAY_COMMENTS) {
printf("%s%s%s%s", csv_data_enclosure, (temp_host->display_name != NULL) ? temp_host->display_name : temp_host->name, csv_data_enclosure, csv_delimiter);
printf("%s%s%s%s", csv_data_enclosure, temp_host->name, csv_data_enclosure, csv_delimiter);
if (type == SERVICE_COMMENT)
printf("%s%s%s%s", csv_data_enclosure, (temp_service->display_name != NULL) ? temp_service->display_name : temp_service->description, csv_data_enclosure, csv_delimiter);
printf("%s%s%s%s", csv_data_enclosure, temp_service->description, csv_data_enclosure, csv_delimiter);
else
printf("%s%s%s", csv_data_enclosure, csv_data_enclosure, csv_delimiter);
}
......@@ -3246,9 +3246,9 @@ void show_downtime(int type) {
}
} else if (content_type == CSV_CONTENT) {
if (display_type == DISPLAY_DOWNTIME) {
printf("%s%s%s%s", csv_data_enclosure, (temp_host->display_name != NULL) ? temp_host->display_name : temp_host->name, csv_data_enclosure, csv_delimiter);
printf("%s%s%s%s", csv_data_enclosure, temp_host->name, csv_data_enclosure, csv_delimiter);
if (type == SERVICE_DOWNTIME)
printf("%s%s%s%s", csv_data_enclosure, (temp_service->display_name != NULL) ? temp_service->display_name : temp_service->description, csv_data_enclosure, csv_delimiter);
printf("%s%s%s%s", csv_data_enclosure, temp_service->description, csv_data_enclosure, csv_delimiter);
else
printf("%s%s%s", csv_data_enclosure, csv_data_enclosure, csv_delimiter);
}
......@@ -3529,14 +3529,14 @@ void show_scheduling_queue(void) {
/* host name */
if (temp_host != NULL)
snprintf(display_host, sizeof(display_host) - 1, "%s", (temp_host->display_name != NULL) ? temp_host->display_name : temp_host->name);
snprintf(display_host, sizeof(display_host) - 1, "%s", (temp_host->display_name != NULL && content_type == HTML_CONTENT) ? temp_host->display_name : temp_host->name);
else
snprintf(display_host, sizeof(display_host) - 1, "%s", temp_svcstatus->host_name);
display_host[sizeof(display_host)-1] = '\x0';
/* service name */
if (temp_service != NULL)
snprintf(display_service, sizeof(display_service) - 1, "%s", (temp_service->display_name != NULL) ? temp_service->display_name : temp_svcstatus->description);
snprintf(display_service, sizeof(display_service) - 1, "%s", (temp_service->display_name != NULL && content_type == HTML_CONTENT) ? temp_service->display_name : temp_svcstatus->description);
else
snprintf(display_service, sizeof(display_service) - 1, "%s", temp_svcstatus->description);
display_service[sizeof(display_service)-1] = '\x0';
......@@ -3595,7 +3595,7 @@ void show_scheduling_queue(void) {
/* host name*/
if (temp_host != NULL)
snprintf(display_host, sizeof(display_host) - 1, "%s", (temp_host->display_name != NULL) ? temp_host->display_name : temp_host->name);
snprintf(display_host, sizeof(display_host) - 1, "%s", (temp_host->display_name != NULL && content_type == HTML_CONTENT) ? temp_host->display_name : temp_host->name);
else
snprintf(display_host, sizeof(display_host) - 1, "%s", temp_hststatus->host_name);
display_host[sizeof(display_host)-1] = '\x0';
......
cgi/notifications.c
View file @ b64d2902
......@@ -634,7 +634,7 @@ void display_notifications(void) {
temp_service = find_service(host_name, service_name);
if (temp_host != NULL) {
snprintf(displayed_host_name, sizeof(displayed_host_name), "%s", (temp_host->display_name != NULL) ? temp_host->display_name : temp_host->name);
snprintf(displayed_host_name, sizeof(displayed_host_name), "%s", (temp_host->display_name != NULL && content_type == HTML_CONTENT) ? temp_host->display_name : temp_host->name);
displayed_host_name[sizeof(displayed_host_name)-1] = '\x0';
if (temp_entry->type == LOGENTRY_HOST_NOTIFICATION) {
......@@ -642,7 +642,7 @@ void display_notifications(void) {
show_entry = FALSE;
} else {
if (temp_service != NULL) {
snprintf(displayed_service_desc, sizeof(displayed_service_desc), "%s", (temp_service->display_name != NULL) ? temp_service->display_name : temp_service->description);
snprintf(displayed_service_desc, sizeof(displayed_service_desc), "%s", (temp_service->display_name != NULL && content_type == HTML_CONTENT) ? temp_service->display_name : temp_service->description);
displayed_service_desc[sizeof(displayed_service_desc)-1] = '\x0';
if (is_authorized_for_service(temp_service, &current_authdata) == FALSE)
......
cgi/outages.c
View file @ b64d2902
......@@ -369,11 +369,11 @@ void display_network_outages(void) {
printf(",\n");
json_start = FALSE;
printf("{ \"severity\": %d, ", temp_hostoutage->severity);
printf(" \"host\": \"%s\", ", (temp_hostoutage->hst->display_name != NULL) ? json_encode(temp_hostoutage->hst->display_name) : json_encode(temp_hostoutage->hst->name));
printf(" \"host\": \"%s\", ", json_encode(temp_hostoutage->hst->name));
printf(" \"state\": \"%s\", ", status);
} else if (content_type == CSV_CONTENT) {
printf("%s%d%s%s", csv_data_enclosure, temp_hostoutage->severity, csv_data_enclosure, csv_delimiter);
printf("%s%s%s%s", csv_data_enclosure, (temp_hostoutage->hst->display_name != NULL) ? temp_hostoutage->hst->display_name : temp_hostoutage->hst->name, csv_data_enclosure, csv_delimiter);
printf("%s%s%s%s", csv_data_enclosure, temp_hostoutage->hst->name, csv_data_enclosure, csv_delimiter);
printf("%s%s%s%s", csv_data_enclosure, status, csv_data_enclosure, csv_delimiter);
} else {
printf("<TR CLASS='%s'>\n", bg_class);
......
cgi/status.c
View file @ b64d2902
......@@ -124,6 +124,7 @@ extern servicestatus *servicestatus_list;
#define STATUS_COUNTED_UNFILTERED 2
#define STATUS_COUNTED_FILTERED 4
#define STATUS_BELONGS_TO_SG 8
#define STATUS_BELONGS_TO_HG 16
/** @} */
/** @name NUMBER OF NAMED OBJECTS
......@@ -571,6 +572,7 @@ int main(void) {
hoststatus *temp_hoststatus = NULL;
servicestatus *temp_servicestatus = NULL;
servicesmember *temp_sg_member = NULL;
hostsmember *temp_hg_member = NULL;
int regex_i = 0, i = 0;
int len;
int show_dropdown = NO_STATUS;
......@@ -901,9 +903,11 @@ int main(void) {
if (temp_servicegroup != NULL && is_authorized_for_servicegroup(temp_servicegroup, &current_authdata) == TRUE) {
for (temp_sg_member = temp_servicegroup->members; temp_sg_member != NULL; temp_sg_member = temp_sg_member->next) {
temp_hoststatus = find_hoststatus(temp_sg_member->host_name);
temp_hoststatus->added |= STATUS_BELONGS_TO_SG;
if (temp_hoststatus != NULL)
temp_hoststatus->added |= STATUS_BELONGS_TO_SG;
temp_servicestatus = find_servicestatus(temp_sg_member->host_name, temp_sg_member->service_description);
temp_servicestatus->added |= STATUS_BELONGS_TO_SG;
if (temp_servicestatus != NULL)
temp_servicestatus->added |= STATUS_BELONGS_TO_SG;
}
}
}
......@@ -912,15 +916,42 @@ int main(void) {
if (is_authorized_for_servicegroup(temp_servicegroup, &current_authdata) == TRUE) {
for (temp_sg_member = temp_servicegroup->members; temp_sg_member != NULL; temp_sg_member = temp_sg_member->next) {
temp_hoststatus = find_hoststatus(temp_sg_member->host_name);
temp_hoststatus->added |= STATUS_BELONGS_TO_SG;
if (temp_hoststatus != NULL)
temp_hoststatus->added |= STATUS_BELONGS_TO_SG;
temp_servicestatus = find_servicestatus(temp_sg_member->host_name, temp_sg_member->service_description);
temp_servicestatus->added |= STATUS_BELONGS_TO_SG;
if (temp_servicestatus != NULL)
temp_servicestatus->added |= STATUS_BELONGS_TO_SG;
}
}
}
}
}
/* pre filter for all host groups as well */
if (display_type == DISPLAY_HOSTGROUPS) {
if (show_all_hostgroups == FALSE) {
for (i = 0; req_hostgroups[i].entry != NULL; i++) {
temp_hostgroup = find_hostgroup(req_hostgroups[i].entry);
if (temp_hostgroup != NULL && (show_partial_hostgroups == TRUE || is_authorized_for_hostgroup(temp_hostgroup, &current_authdata) == TRUE)) {
for (temp_hg_member = temp_hostgroup->members; temp_hg_member != NULL; temp_hg_member = temp_hg_member->next) {
temp_hoststatus = find_hoststatus(temp_hg_member->host_name);
if (temp_hoststatus != NULL)
temp_hoststatus->added |= STATUS_BELONGS_TO_HG;
}
}
}
} else {
for (temp_hostgroup = hostgroup_list; temp_hostgroup != NULL; temp_hostgroup = temp_hostgroup->next) {
if (show_partial_hostgroups == TRUE || is_authorized_for_hostgroup(temp_hostgroup, &current_authdata) == TRUE) {
for (temp_hg_member = temp_hostgroup->members; temp_hg_member != NULL; temp_hg_member = temp_hg_member->next) {
temp_hoststatus = find_hoststatus(temp_hg_member->host_name);
if (temp_hoststatus != NULL)
temp_hoststatus->added |= STATUS_BELONGS_TO_HG;
}
}
}
}
}
/**
* Now iterate through servicestatus_list and hoststatus_list to find all hosts/services we need to display
......@@ -988,27 +1019,7 @@ int main(void) {
/* see if we should display a hostgroup */
else if (display_type == DISPLAY_HOSTGROUPS) {
found = FALSE;
if (show_all_hostgroups == FALSE) {
for (i = 0; req_hostgroups[i].entry != NULL; i++) {
temp_hostgroup = find_hostgroup(req_hostgroups[i].entry);
if (temp_hostgroup != NULL && \
(show_partial_hostgroups == TRUE || is_authorized_for_hostgroup(temp_hostgroup, &current_authdata) == TRUE) && \
is_host_member_of_hostgroup(temp_hostgroup, temp_host) == TRUE) {
found = TRUE;
break;
}
}
} else {
for (temp_hostgroup = hostgroup_list; temp_hostgroup != NULL; temp_hostgroup = temp_hostgroup->next) {
if ((show_partial_hostgroups == TRUE || is_authorized_for_hostgroup(temp_hostgroup, &current_authdata) == TRUE) && \
is_host_member_of_hostgroup(temp_hostgroup, temp_host) == TRUE) {
found = TRUE;
break;
}
}
}
if (found == FALSE)
if (!(temp_hoststatus->added & STATUS_BELONGS_TO_HG))
continue;
}
......@@ -1113,27 +1124,7 @@ int main(void) {
/* see if we should display a hostgroup */
else if (display_type == DISPLAY_HOSTGROUPS) {
found = FALSE;
if (show_all_hostgroups == FALSE) {
for (i = 0; req_hostgroups[i].entry != NULL; i++) {
temp_hostgroup = find_hostgroup(req_hostgroups[i].entry);
if (temp_hostgroup != NULL && \
(show_partial_hostgroups == TRUE || is_authorized_for_hostgroup(temp_hostgroup, &current_authdata) == TRUE) && \
is_host_member_of_hostgroup(temp_hostgroup, temp_host) == TRUE) {
found = TRUE;
break;
}
}
} else {
for (temp_hostgroup = hostgroup_list; temp_hostgroup != NULL; temp_hostgroup = temp_hostgroup->next) {
if ((show_partial_hostgroups == TRUE || is_authorized_for_hostgroup(temp_hostgroup, &current_authdata) == TRUE) && \
is_host_member_of_hostgroup(temp_hostgroup, temp_host) == TRUE) {
found = TRUE;
break;
}
}
}
if (found == FALSE)
if (!(temp_hoststatus->added & STATUS_BELONGS_TO_HG))
continue;
/* see if we should display a servicegroup */
......@@ -2555,8 +2546,8 @@ void show_service_detail(void) {
if (json_start == FALSE)
printf(",\n");
json_start = FALSE;
printf("{ \"host\": \"%s\", ", (temp_host->display_name != NULL) ? json_encode(temp_host->display_name) : json_encode(temp_host->name));
printf("\"service\": \"%s\", ", (temp_service->display_name != NULL) ? json_encode(temp_service->display_name) : json_encode(temp_service->description));
printf("{ \"host\": \"%s\", ", json_encode(temp_host->name));
printf("\"service\": \"%s\", ", json_encode(temp_service->description));
printf("\"status\": \"%s\", ", temp_status->status_string);
printf("\"last_check\": \"%s\", ", temp_status->last_check);
printf("\"duration\": \"%s\", ", temp_status->state_duration);
......@@ -2568,6 +2559,16 @@ void show_service_detail(void) {
printf("\"notifications_enabled\": %s, ", (temp_status->notifications_enabled == TRUE) ? "true" : "false");
printf("\"has_been_acknowledged\": %s, ", (temp_status->problem_has_been_acknowledged == TRUE) ? "true" : "false");
if (temp_host->display_name == NULL)
printf("\"host_display_name\": null, ");
else
printf("\"host_display_name\": \"%s\", ", json_encode(temp_host->display_name));
if (temp_service->display_name == NULL)
printf("\"service_display_name\": null, ");
else
printf("\"service_display_name\": \"%s\", ", json_encode(temp_service->display_name));
if (temp_status->plugin_output == NULL)
printf("\"status_information\": null }");
else
......@@ -2575,8 +2576,8 @@ void show_service_detail(void) {
/* print list in csv format */
} else if (content_type == CSV_CONTENT) {
printf("%s%s%s%s", csv_data_enclosure, (temp_host->display_name != NULL) ? temp_host->display_name : temp_host->name, csv_data_enclosure, csv_delimiter);
printf("%s%s%s%s", csv_data_enclosure, (temp_service->display_name != NULL) ? temp_service->display_name : temp_service->description, csv_data_enclosure, csv_delimiter);
printf("%s%s%s%s", csv_data_enclosure, temp_host->name, csv_data_enclosure, csv_delimiter);
printf("%s%s%s%s", csv_data_enclosure, temp_service->description, csv_data_enclosure, csv_delimiter);
printf("%s%s%s%s", csv_data_enclosure, temp_status->status_string, csv_data_enclosure, csv_delimiter);
printf("%s%s%s%s", csv_data_enclosure, temp_status->last_check, csv_data_enclosure, csv_delimiter);
......@@ -2967,7 +2968,7 @@ void show_host_detail(void) {
if (json_start == FALSE)
printf(",\n");
json_start = FALSE;
printf("{ \"host\": \"%s\", ", (temp_host->display_name != NULL) ? json_encode(temp_host->display_name) : json_encode(temp_host->name));
printf("{ \"host\": \"%s\", ", json_encode(temp_host->name));
printf("\"status\": \"%s\", ", temp_statusdata->status_string);
printf("\"last_check\": \"%s\", ", temp_statusdata->last_check);
printf("\"duration\": \"%s\", ", temp_statusdata->state_duration);
......@@ -2979,6 +2980,11 @@ void show_host_detail(void) {
printf("\"notifications_enabled\": %s, ", (temp_statusdata->notifications_enabled == TRUE) ? "true" : "false");
printf("\"has_been_acknowledged\": %s, ", (temp_statusdata->problem_has_been_acknowledged == TRUE) ? "true" : "false");
if (temp_host->display_name == NULL)
printf("\"host_display_name\": null, ");
else
printf("\"host_display_name\": \"%s\", ", json_encode(temp_host->display_name));
if (temp_statusdata->plugin_output == NULL)
printf("\"status_information\": null }");
else
......@@ -2986,7 +2992,7 @@ void show_host_detail(void) {
/* print list in csv format */
} else if (content_type == CSV_CONTENT) {
printf("%s%s%s%s", csv_data_enclosure, (temp_host->display_name != NULL) ? temp_host->display_name : temp_host->name, csv_data_enclosure, csv_delimiter);
printf("%s%s%s%s", csv_data_enclosure, temp_host->name, csv_data_enclosure, csv_delimiter);
printf("%s%s%s%s", csv_data_enclosure, temp_statusdata->status_string, csv_data_enclosure, csv_delimiter);
printf("%s%s%s%s", csv_data_enclosure, temp_statusdata->last_check, csv_data_enclosure, csv_delimiter);
......@@ -3592,6 +3598,7 @@ void show_servicegroup_service_totals_summary(servicegroup *temp_servicegroup) {
int services_critical_unacknowledged = 0;
servicesmember *temp_member = NULL;
servicestatus *temp_servicestatus = NULL;
servicestatus *last_servicestatus = NULL;
hoststatus *temp_hoststatus = NULL;
int problem = FALSE;
......@@ -3604,6 +3611,10 @@ void show_servicegroup_service_totals_summary(servicegroup *temp_servicegroup) {
if (temp_servicestatus == NULL)
continue;
/* skip this if it isn't a new service... */
if(temp_servicestatus == last_servicestatus)
continue;
/* find the status of the associated host */
temp_hoststatus = find_hoststatus(temp_servicestatus->host_name);
if (temp_hoststatus == NULL)
......@@ -3698,6 +3709,8 @@ void show_servicegroup_service_totals_summary(servicegroup *temp_servicegroup) {
else if (temp_servicestatus->status == SERVICE_PENDING)
services_pending++;
last_servicestatus = temp_servicestatus;
}
if (content_type == JSON_CONTENT) {
......@@ -4260,6 +4273,7 @@ void show_hostgroup_overviews(void) {
/* always add a comma, except for the first line */
if (json_start == FALSE)
printf(",\n");
json_start = FALSE;
} else {
if (current_column == 1)
printf("<TR>\n");
......
cgi/summary.c
View file @ b64d2902
......@@ -1762,16 +1762,16 @@ void display_recent_alerts(void) {
json_start = FALSE;
printf("{ \"time\": \"%s\", ", date_time);
printf("\"alert_type\": \"%s\", ", (temp_event->event_type == AE_HOST_ALERT) ? "Host Alert" : "Service Alert");
printf("\"host\": \"%s\", ", (temp_host->display_name != NULL) ? json_encode(temp_host->display_name) : json_encode(temp_host->name));
printf("\"host\": \"%s\", ", json_encode(temp_host->name));
if (temp_event->event_type == AE_HOST_ALERT)
printf("\"service\": null, ");
else
printf("\"service\": \"%s\", ", (temp_service->display_name != NULL) ? json_encode(temp_service->display_name) : json_encode(temp_service->description));
printf("\"service\": \"%s\", ", json_encode(temp_service->description));
} else if (content_type == CSV_CONTENT) {
printf("%s%s%s%s", csv_data_enclosure, date_time, csv_data_enclosure, csv_delimiter);
printf("%s%s%s%s", csv_data_enclosure, (temp_event->event_type == AE_HOST_ALERT) ? "Host Alert" : "Service Alert", csv_data_enclosure, csv_delimiter);
printf("%s%s%s%s", csv_data_enclosure, (temp_host->display_name != NULL) ? temp_host->display_name : temp_host->name, csv_data_enclosure, csv_delimiter);
printf("%s%s%s%s", csv_data_enclosure, (temp_event->event_type == AE_HOST_ALERT) ? "" : (temp_service->display_name != NULL) ? temp_service->display_name : temp_service->description, csv_data_enclosure, csv_delimiter);
printf("%s%s%s%s", csv_data_enclosure, temp_host->name, csv_data_enclosure, csv_delimiter);
printf("%s%s%s%s", csv_data_enclosure, (temp_event->event_type == AE_HOST_ALERT) ? "" : temp_service->description, csv_data_enclosure, csv_delimiter);
} else {
printf("<tr CLASS='data%s'>", (odd) ? "Even" : "Odd");
......
common/downtime.c
View file @ b64d2902
......@@ -203,8 +203,11 @@ int unschedule_downtime(int type, unsigned long downtime_id) {
if (((unsigned long)temp_event->event_data) == downtime_id)
break;
}
if (temp_event != NULL)
if (temp_event != NULL) {
remove_event(temp_event, &event_list_high, &event_list_high_tail);
my_free(temp_event->event_data);
my_free(temp_event);
}
/* delete downtime entry */
if (temp_downtime->type == HOST_DOWNTIME)
......
configure
View file @ b64d2902
This diff is collapsed.
configure.in
View file @ b64d2902
......@@ -9,9 +9,9 @@ AC_CONFIG_HEADER(include/config.h)
AC_PREFIX_DEFAULT(/usr/local/icinga)
PKG_NAME=icinga-core
PKG_VERSION="1.7.0"
PKG_VERSION="1.7.1"
PKG_HOME_URL="http://www.icinga.org/"
PKG_REL_DATE="05-15-2012"
PKG_REL_DATE="06-18-2012"
dnl Figure out how to invoke "install" and what install options to use.
AC_PROG_INSTALL
......@@ -1324,7 +1324,7 @@ AC_MSG_CHECKING(for -Wall based on os/compiler)
dnl OUTPUT
AC_OUTPUT(Makefile subst solaris/pkginfo base/Makefile common/Makefile contrib/Makefile cgi/Makefile html/Makefile module/Makefile module/idoutils/Makefile xdata/Makefile daemon-init daemon-init-redhat rc.ido2db module/idoutils/src/Makefile t-tap/Makefile t/Makefile module/idoutils/db/scripts/installdb module/idoutils/db/scripts/upgradedb module/idoutils/db/scripts/prepsql p1.pl)
AC_OUTPUT(Makefile subst solaris/pkginfo solaris/icinga.xml base/Makefile common/Makefile contrib/Makefile cgi/Makefile html/Makefile module/Makefile module/idoutils/Makefile xdata/Makefile daemon-init daemon-init-redhat rc.ido2db module/idoutils/src/Makefile t-tap/Makefile t/Makefile module/idoutils/db/scripts/installdb module/idoutils/db/scripts/upgradedb module/idoutils/db/scripts/prepsql p1.pl)
perl subst $srcdir/include/locations.h
......
contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event
View file @ b64d2902
......@@ -45,7 +45,7 @@ HARD)
# We should go back to being the slave host,
# so disable active checks
`eventhandlerdir/disable_active_service_checks`
`$eventhandlerdir/disable_active_service_checks`
;;
esac
......
daemon-init.in
View file @ b64d2902
......@@ -3,13 +3,15 @@
# chkconfig: 345 99 01
# description: Icinga network monitor
### BEGIN INIT INFO
# Provides: icinga
# Required-Start: $local_fs $network
# Required-Stop: $local_fs $network
# Default-Start: 3 4 5
# Default-Stop: 0 1 6
# Provides: icinga
# Required-Start: $local_fs $remote_fs $syslog $named $network $time
# Required-Stop: $local_fs $remote_fs $syslog $named $network
# Should-Start:
# Should-Stop:
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6