[Nagios-checkins] nagios/xdata xcddefault.c, 1.17, 1.18 xcddefault.h, 1.6, 1.7 xrddefault.c, 1.40,
Nagios network monitoring software is enterprise server monitoring
Brought to you by:
egalstad,
sawolf-nagios
From: Ethan G. <ega...@us...> - 2006-12-26 23:20:24
|
Update of /cvsroot/nagios/nagios/xdata In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv29682/xdata Modified Files: xcddefault.c xcddefault.h xrddefault.c xsddefault.c Log Message: Buffer slots patches, ackowledgement comments are now deleted when ack is removed. Index: xrddefault.c =================================================================== RCS file: /cvsroot/nagios/nagios/xdata/xrddefault.c,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** xrddefault.c 14 Dec 2006 05:25:21 -0000 1.40 --- xrddefault.c 26 Dec 2006 23:20:16 -0000 1.41 *************** *** 4,8 **** * * Copyright (c) 1999-2006 Ethan Galstad (na...@na...) ! * Last Modified: 12-13-2006 * * License: --- 4,8 ---- * * Copyright (c) 1999-2006 Ethan Galstad (na...@na...) ! * Last Modified: 12-26-2006 * * License: *************** *** 605,608 **** --- 605,610 ---- unsigned long process_host_attribute_mask=0L; unsigned long process_service_attribute_mask=0L; + int remove_comment=FALSE; + int ack=FALSE; #ifdef DEBUG0 *************** *** 801,805 **** /* delete the comment if necessary */ /* it seems a bit backwards to add and then immediately delete the comment, but its necessary to track comment deletions in the event broker */ ! if(persistent==FALSE || (find_host(host_name)==NULL) || (data_type==XRDDEFAULT_SERVICECOMMENT_DATA && find_service(host_name,service_description)==NULL)) delete_comment((data_type==XRDDEFAULT_HOSTCOMMENT_DATA)?HOST_COMMENT:SERVICE_COMMENT,comment_id); --- 803,828 ---- /* delete the comment if necessary */ /* it seems a bit backwards to add and then immediately delete the comment, but its necessary to track comment deletions in the event broker */ ! remove_comment=FALSE; ! /* host no longer exists */ ! if((temp_host=find_host(host_name))==NULL) ! remove_comment=TRUE; ! /* service no longer exists */ ! else if(data_type==XRDDEFAULT_SERVICECOMMENT_DATA && (temp_service=find_service(host_name,service_description))==NULL) ! remove_comment=TRUE; ! /* acknowledgement comments get deleted if they're not persistent and the original problem is no longer acknowledged */ ! else if(entry_type==ACKNOWLEDGEMENT_COMMENT){ ! ack=FALSE; ! if(data_type==XRDDEFAULT_HOSTCOMMENT_DATA) ! ack=temp_host->problem_has_been_acknowledged; ! else ! ack=temp_service->problem_has_been_acknowledged; ! if(ack==FALSE && persistent==FALSE) ! remove_comment=TRUE; ! } ! /* non-persistent comments don't last past restarts UNLESS they're acks (see above) */ ! else if(persistent==FALSE) ! remove_comment=TRUE; ! ! if(remove_comment==TRUE) delete_comment((data_type==XRDDEFAULT_HOSTCOMMENT_DATA)?HOST_COMMENT:SERVICE_COMMENT,comment_id); Index: xsddefault.c =================================================================== RCS file: /cvsroot/nagios/nagios/xdata/xsddefault.c,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** xsddefault.c 22 Dec 2006 00:37:31 -0000 1.42 --- xsddefault.c 26 Dec 2006 23:20:17 -0000 1.43 *************** *** 4,8 **** * * Copyright (c) 2000-2006 Ethan Galstad (na...@na...) ! * Last Modified: 05-20-2006 * * License: --- 4,8 ---- * * Copyright (c) 2000-2006 Ethan Galstad (na...@na...) ! * Last Modified: 12-26-2006 * * License: *************** *** 89,94 **** extern int aggregate_status_updates; ! extern unsigned long external_command_buffer_slots; ! extern unsigned long check_result_buffer_slots; extern circular_buffer external_command_buffer; extern circular_buffer check_result_buffer; --- 89,94 ---- extern int aggregate_status_updates; ! extern int external_command_buffer_slots; ! extern int check_result_buffer_slots; extern circular_buffer external_command_buffer; extern circular_buffer check_result_buffer; *************** *** 405,412 **** fprintf(fp,"\tnext_event_id=%lu\n",next_event_id); fprintf(fp,"\tnext_notification_id=%lu\n",next_notification_id); ! fprintf(fp,"\tmax_external_command_buffer_slots=%lu\n",external_command_buffer_slots); ! fprintf(fp,"\tused_external_command_buffer_slots=%lu\n",external_command_buffer.items); ! fprintf(fp,"\tmax_check_result_buffer_slots=%lu\n",check_result_buffer_slots); ! fprintf(fp,"\tused_check_result_buffer_slots=%lu\n",check_result_buffer.items); fprintf(fp,"\t}\n\n"); --- 405,412 ---- fprintf(fp,"\tnext_event_id=%lu\n",next_event_id); fprintf(fp,"\tnext_notification_id=%lu\n",next_notification_id); ! fprintf(fp,"\ttotal_external_command_buffer_slots=%d\n",external_command_buffer_slots); ! fprintf(fp,"\tused_external_command_buffer_slots=%d\n",external_command_buffer.items); ! fprintf(fp,"\ttotal_check_result_buffer_slots=%d\n",check_result_buffer_slots); ! fprintf(fp,"\tused_check_result_buffer_slots=%d\n",check_result_buffer.items); fprintf(fp,"\t}\n\n"); Index: xcddefault.h =================================================================== RCS file: /cvsroot/nagios/nagios/xdata/xcddefault.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** xcddefault.h 1 Mar 2006 23:26:34 -0000 1.6 --- xcddefault.h 26 Dec 2006 23:20:16 -0000 1.7 *************** *** 4,8 **** * * Copyright (c) 2000-2006 Ethan Galstad (na...@na...) ! * Last Modified: 03-01-2006 * * License: --- 4,8 ---- * * Copyright (c) 2000-2006 Ethan Galstad (na...@na...) ! * Last Modified: 12-26-2006 * * License: *************** *** 34,39 **** int xcddefault_delete_host_comment(unsigned long); int xcddefault_delete_service_comment(unsigned long); - int xcddefault_delete_all_host_comments(char *); - int xcddefault_delete_all_service_comments(char *,char *); #endif --- 34,37 ---- Index: xcddefault.c =================================================================== RCS file: /cvsroot/nagios/nagios/xdata/xcddefault.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** xcddefault.c 1 Mar 2006 23:26:34 -0000 1.17 --- xcddefault.c 26 Dec 2006 23:20:16 -0000 1.18 *************** *** 4,8 **** * * Copyright (c) 2000-2006 Ethan Galstad (na...@na...) ! * Last Modified: 03-01-2006 * * License: --- 4,8 ---- * * Copyright (c) 2000-2006 Ethan Galstad (na...@na...) ! * Last Modified: 12-26-2006 * * License: *************** *** 171,193 **** - /* deletes all comments for a particular host */ - int xcddefault_delete_all_host_comments(char *host_name){ - - /* update comment file */ - xcddefault_save_comment_data(); - - return OK; - } - - - /* deletes all comments for a particular service */ - int xcddefault_delete_all_service_comments(char *host_name, char *svc_description){ - - /* update comment file */ - xcddefault_save_comment_data(); - - return OK; - } - /******************************************************************/ --- 171,174 ---- |