[Nagios-checkins] nagios/base checks.c, 1.98, 1.99 commands.c, 1.78, 1.79 config.c, 1.75, 1.76 even
Nagios network monitoring software is enterprise server monitoring
Brought to you by:
egalstad,
sawolf-nagios
Update of /cvsroot/nagios/nagios/base In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv29682/base Modified Files: checks.c commands.c config.c events.c nagios.c nagiostats.c sehandlers.c utils.c Log Message: Buffer slots patches, ackowledgement comments are now deleted when ack is removed. Index: sehandlers.c =================================================================== RCS file: /cvsroot/nagios/nagios/base/sehandlers.c,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** sehandlers.c 12 Dec 2006 18:56:48 -0000 1.42 --- sehandlers.c 26 Dec 2006 23:20:14 -0000 1.43 *************** *** 4,8 **** * * Copyright (c) 1999-2006 Ethan Galstad (na...@na...) ! * Last Modified: 12-12-2006 * * License: --- 4,8 ---- * * Copyright (c) 1999-2006 Ethan Galstad (na...@na...) ! * Last Modified: 12-26-2006 * * License: *************** *** 694,703 **** --- 694,711 ---- /* reset the acknowledgement flag if necessary */ if(hst->acknowledgement_type==ACKNOWLEDGEMENT_NORMAL){ + hst->problem_has_been_acknowledged=FALSE; hst->acknowledgement_type=ACKNOWLEDGEMENT_NONE; + + /* remove any non-persistant comments associated with the ack */ + delete_host_acknowledgement_comments(hst); } else if(hst->acknowledgement_type==ACKNOWLEDGEMENT_STICKY && hst->current_state==HOST_UP){ + hst->problem_has_been_acknowledged=FALSE; hst->acknowledgement_type=ACKNOWLEDGEMENT_NONE; + + /* remove any non-persistant comments associated with the ack */ + delete_host_acknowledgement_comments(hst); } Index: checks.c =================================================================== RCS file: /cvsroot/nagios/nagios/base/checks.c,v retrieving revision 1.98 retrieving revision 1.99 diff -C2 -d -r1.98 -r1.99 *** checks.c 12 Dec 2006 21:39:55 -0000 1.98 --- checks.c 26 Dec 2006 23:20:12 -0000 1.99 *************** *** 4,8 **** * * Copyright (c) 1999-2006 Ethan Galstad (na...@na...) ! * Last Modified: 12-12-2006 * * License: --- 4,8 ---- * * Copyright (c) 1999-2006 Ethan Galstad (na...@na...) ! * Last Modified: 12-26-2006 * * License: *************** *** 935,944 **** --- 935,952 ---- if(temp_service->acknowledgement_type==ACKNOWLEDGEMENT_NORMAL){ + temp_service->problem_has_been_acknowledged=FALSE; temp_service->acknowledgement_type=ACKNOWLEDGEMENT_NONE; + + /* remove any non-persistant comments associated with the ack */ + delete_service_acknowledgement_comments(temp_service); } else if(temp_service->acknowledgement_type==ACKNOWLEDGEMENT_STICKY && temp_service->current_state==STATE_OK){ + temp_service->problem_has_been_acknowledged=FALSE; temp_service->acknowledgement_type=ACKNOWLEDGEMENT_NONE; + + /* remove any non-persistant comments associated with the ack */ + delete_service_acknowledgement_comments(temp_service); } Index: config.c =================================================================== RCS file: /cvsroot/nagios/nagios/base/config.c,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** config.c 26 Dec 2006 16:50:20 -0000 1.75 --- config.c 26 Dec 2006 23:20:13 -0000 1.76 *************** *** 4,8 **** * * Copyright (c) 1999-2006 Ethan Galstad (na...@na...) ! * Last Modified: 12-21-2006 * * License: --- 4,8 ---- * * Copyright (c) 1999-2006 Ethan Galstad (na...@na...) ! * Last Modified: 12-26-2006 * * License: *************** *** 190,195 **** extern service **service_hashlist; ! extern unsigned long external_command_buffer_slots; ! extern unsigned long check_result_buffer_slots; --- 190,195 ---- extern service **service_hashlist; ! extern int external_command_buffer_slots; ! extern int check_result_buffer_slots; *************** *** 1535,1542 **** else if(!strcmp(variable,"external_command_buffer_slots")) ! external_command_buffer_slots=strtoul(value,NULL,0); else if(!strcmp(variable,"check_result_buffer_slots")) ! check_result_buffer_slots=strtoul(value,NULL,0); /*** AUTH_FILE VARIABLE USED BY EMBEDDED PERL INTERPRETER ***/ --- 1535,1542 ---- else if(!strcmp(variable,"external_command_buffer_slots")) ! external_command_buffer_slots=atoi(value); else if(!strcmp(variable,"check_result_buffer_slots")) ! check_result_buffer_slots=atoi(value); /*** AUTH_FILE VARIABLE USED BY EMBEDDED PERL INTERPRETER ***/ Index: utils.c =================================================================== RCS file: /cvsroot/nagios/nagios/base/utils.c,v retrieving revision 1.145 retrieving revision 1.146 diff -C2 -d -r1.145 -r1.146 *** utils.c 26 Dec 2006 16:50:20 -0000 1.145 --- utils.c 26 Dec 2006 23:20:14 -0000 1.146 *************** *** 237,242 **** extern circular_buffer check_result_buffer; extern circular_buffer event_broker_buffer; ! extern unsigned long external_command_buffer_slots; ! extern unsigned long check_result_buffer_slots; /* from GNU defines errno as a macro, since it's a per-thread variable */ --- 237,242 ---- extern circular_buffer check_result_buffer; extern circular_buffer event_broker_buffer; ! extern int external_command_buffer_slots; ! extern int check_result_buffer_slots; /* from GNU defines errno as a macro, since it's a per-thread variable */ Index: nagios.c =================================================================== RCS file: /cvsroot/nagios/nagios/base/nagios.c,v retrieving revision 1.104 retrieving revision 1.105 diff -C2 -d -r1.104 -r1.105 *** nagios.c 22 Dec 2006 00:37:30 -0000 1.104 --- nagios.c 26 Dec 2006 23:20:14 -0000 1.105 *************** *** 249,254 **** circular_buffer check_result_buffer; pthread_t worker_threads[TOTAL_WORKER_THREADS]; ! unsigned long external_command_buffer_slots=DEFAULT_EXTERNAL_COMMAND_BUFFER_SLOTS; ! unsigned long check_result_buffer_slots=DEFAULT_CHECK_RESULT_BUFFER_SLOTS; --- 249,254 ---- circular_buffer check_result_buffer; pthread_t worker_threads[TOTAL_WORKER_THREADS]; ! int external_command_buffer_slots=DEFAULT_EXTERNAL_COMMAND_BUFFER_SLOTS; ! int check_result_buffer_slots=DEFAULT_CHECK_RESULT_BUFFER_SLOTS; Index: events.c =================================================================== RCS file: /cvsroot/nagios/nagios/base/events.c,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** events.c 22 Dec 2006 00:37:30 -0000 1.48 --- events.c 26 Dec 2006 23:20:14 -0000 1.49 *************** *** 4,8 **** * * Copyright (c) 1999-2006 Ethan Galstad (na...@na...) ! * Last Modified: 12-21-2006 * * License: --- 4,8 ---- * * Copyright (c) 1999-2006 Ethan Galstad (na...@na...) ! * Last Modified: 12-26-2006 * * License: *************** *** 83,87 **** extern int time_change_threshold; ! extern unsigned long check_result_buffer_slots; timed_event *event_list_low=NULL; --- 83,87 ---- extern int time_change_threshold; ! extern int check_result_buffer_slots; timed_event *event_list_low=NULL; Index: commands.c =================================================================== RCS file: /cvsroot/nagios/nagios/base/commands.c,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** commands.c 22 Dec 2006 00:37:30 -0000 1.78 --- commands.c 26 Dec 2006 23:20:13 -0000 1.79 *************** *** 4,8 **** * * Copyright (c) 1999-2006 Ethan Galstad (na...@na...) ! * Last Modified: 12-21-2006 * * License: --- 4,8 ---- * * Copyright (c) 1999-2006 Ethan Galstad (na...@na...) ! * Last Modified: 12-26-2006 * * License: *************** *** 90,94 **** extern pthread_t worker_threads[TOTAL_WORKER_THREADS]; extern circular_buffer external_command_buffer; ! extern unsigned long external_command_buffer_slots; --- 90,94 ---- extern pthread_t worker_threads[TOTAL_WORKER_THREADS]; extern circular_buffer external_command_buffer; ! extern int external_command_buffer_slots; *************** *** 3921,3924 **** --- 3921,3927 ---- update_host_status(hst,FALSE); + /* remove any non-persistant comments associated with the ack */ + delete_host_acknowledgement_comments(hst); + #ifdef DEBUG0 printf("remove_host_acknowledgement() end\n"); *************** *** 3942,3945 **** --- 3945,3951 ---- update_service_status(svc,FALSE); + /* remove any non-persistant comments associated with the ack */ + delete_service_acknowledgement_comments(svc); + #ifdef DEBUG0 printf("remove_service_acknowledgement() end\n"); Index: nagiostats.c =================================================================== RCS file: /cvsroot/nagios/nagios/base/nagiostats.c,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** nagiostats.c 22 Dec 2006 00:37:31 -0000 1.32 --- nagiostats.c 26 Dec 2006 23:20:14 -0000 1.33 *************** *** 8,12 **** * Copyright (c) 2003-2006 Ethan Galstad (na...@na...) * ! * Last Modified: 12-21-2006 * * License: --- 8,12 ---- * Copyright (c) 2003-2006 Ethan Galstad (na...@na...) * ! * Last Modified: 12-26-2006 * * License: *************** *** 141,148 **** int active_hosts_checked_last_1hour=0; ! unsigned long max_external_command_buffer_slots=0L; ! unsigned long used_external_command_buffer_slots=0L; ! unsigned long max_check_result_buffer_slots=0L; ! unsigned long used_check_result_buffer_slots=0L; --- 141,148 ---- int active_hosts_checked_last_1hour=0; ! int total_external_command_buffer_slots=0; ! int used_external_command_buffer_slots=0; ! int total_check_result_buffer_slots=0; ! int used_check_result_buffer_slots=0; *************** *** 269,275 **** printf(" NAGIOSPID pid number of Nagios deamon.\n"); printf(" NAGIOSVERPID string with Nagios version and PID.\n"); ! printf(" MAXCMDBUF number of external command buffer slots available.\n"); printf(" USEDCMDBUF number of external command buffer slots currently in use.\n"); ! printf(" MAXCHKBUF number of check result buffer slots available.\n"); printf(" USEDCHKBUF number of check result buffer slots currently in use.\n"); printf(" NUMSERVICES total number of services.\n"); --- 269,275 ---- printf(" NAGIOSPID pid number of Nagios deamon.\n"); printf(" NAGIOSVERPID string with Nagios version and PID.\n"); ! printf(" TOTCMDBUF total number of external command buffer slots available.\n"); printf(" USEDCMDBUF number of external command buffer slots currently in use.\n"); ! printf(" TOTCHKBUF total number of check result buffer slots available.\n"); printf(" USEDCHKBUF number of check result buffer slots currently in use.\n"); printf(" NUMSERVICES total number of services.\n"); *************** *** 380,391 **** ! else if(!strcmp(temp_ptr,"MAXCMDBUF")) ! printf("%lu\n",max_external_command_buffer_slots); else if(!strcmp(temp_ptr,"USEDCMDBUF")) ! printf("%lu\n",used_external_command_buffer_slots); ! else if(!strcmp(temp_ptr,"MAXCHKBUF")) ! printf("%lu\n",max_check_result_buffer_slots); else if(!strcmp(temp_ptr,"USEDCHKBUF")) ! printf("%lu\n",used_check_result_buffer_slots); else if(!strcmp(temp_ptr,"NUMSERVICES")) --- 380,391 ---- ! else if(!strcmp(temp_ptr,"TOTCMDBUF")) ! printf("%d\n",total_external_command_buffer_slots); else if(!strcmp(temp_ptr,"USEDCMDBUF")) ! printf("%d\n",used_external_command_buffer_slots); ! else if(!strcmp(temp_ptr,"TOTCHKBUF")) ! printf("%d\n",total_check_result_buffer_slots); else if(!strcmp(temp_ptr,"USEDCHKBUF")) ! printf("%d\n",used_check_result_buffer_slots); else if(!strcmp(temp_ptr,"NUMSERVICES")) *************** *** 586,591 **** printf("Program Running Time: %dd %dh %dm %ds\n",days,hours,minutes,seconds); printf("Nagios PID: %lu\n",nagios_pid); ! printf("Used/Max External Command Buffers: %lu / %lu\n",used_external_command_buffer_slots,max_external_command_buffer_slots); ! printf("Used/Max Check Result Buffers: %lu / %lu\n",used_check_result_buffer_slots,max_check_result_buffer_slots); printf("\n"); printf("Total Services: %d\n",status_service_entries); --- 586,591 ---- printf("Program Running Time: %dd %dh %dm %ds\n",days,hours,minutes,seconds); printf("Nagios PID: %lu\n",nagios_pid); ! printf("Used/Total External Command Buffers: %d / %d\n",used_external_command_buffer_slots,total_external_command_buffer_slots); ! printf("Used/Total Check Result Buffers: %d / %d\n",used_check_result_buffer_slots,total_check_result_buffer_slots); printf("\n"); printf("Total Services: %d\n",status_service_entries); *************** *** 961,972 **** if(!strcmp(var,"program_start")) program_start=strtoul(val,NULL,10); ! else if(!strcmp(var,"max_external_command_buffer_slots")) ! max_external_command_buffer_slots=strtoul(val,NULL,10); else if(!strcmp(var,"used_external_command_buffer_slots")) ! used_external_command_buffer_slots=strtoul(val,NULL,10); ! else if(!strcmp(var,"max_check_result_buffer_slots")) ! max_check_result_buffer_slots=strtoul(val,NULL,10); else if(!strcmp(var,"used_check_result_buffer_slots")) ! used_check_result_buffer_slots=strtoul(val,NULL,10); else if(!strcmp(var,"nagios_pid")) nagios_pid=strtoul(val,NULL,10); --- 961,972 ---- if(!strcmp(var,"program_start")) program_start=strtoul(val,NULL,10); ! else if(!strcmp(var,"total_external_command_buffer_slots")) ! total_external_command_buffer_slots=atoi(val); else if(!strcmp(var,"used_external_command_buffer_slots")) ! used_external_command_buffer_slots=atoi(val); ! else if(!strcmp(var,"total_check_result_buffer_slots")) ! total_check_result_buffer_slots=atoi(val); else if(!strcmp(var,"used_check_result_buffer_slots")) ! used_check_result_buffer_slots=atoi(val); else if(!strcmp(var,"nagios_pid")) nagios_pid=strtoul(val,NULL,10); |