Update of /cvsroot/nagios/nagios/cgi
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv29682/cgi
Modified Files:
cmd.c
Log Message:
Buffer slots patches, ackowledgement comments are now deleted when ack is removed.
Index: cmd.c
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/cmd.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** cmd.c 19 May 2006 14:24:32 -0000 1.33
--- cmd.c 26 Dec 2006 23:20:15 -0000 1.34
***************
*** 4,8 ****
*
* Copyright (c) 1999-2006 Ethan Galstad (nagios@...)
! * Last Modified: 05-18-2006
*
* License:
--- 4,8 ----
*
* Copyright (c) 1999-2006 Ethan Galstad (nagios@...)
! * Last Modified: 12-26-2006
*
* License:
***************
*** 941,945 ****
}
printf("<tr><td CLASS='optBoxItem'>Persistent%s:</td><td><b>",(cmd==CMD_ACKNOWLEDGE_HOST_PROBLEM)?" Comment":"");
! printf("<INPUT TYPE='checkbox' NAME='persistent' CHECKED>");
printf("</b></td></tr>\n");
printf("<tr><td CLASS='optBoxRequiredItem'>Author (Your Name):</td><td><b>");
--- 941,945 ----
}
printf("<tr><td CLASS='optBoxItem'>Persistent%s:</td><td><b>",(cmd==CMD_ACKNOWLEDGE_HOST_PROBLEM)?" Comment":"");
! printf("<INPUT TYPE='checkbox' NAME='persistent' %s>",(cmd==CMD_ACKNOWLEDGE_HOST_PROBLEM)?"":"CHECKED");
printf("</b></td></tr>\n");
printf("<tr><td CLASS='optBoxRequiredItem'>Author (Your Name):</td><td><b>");
***************
*** 967,971 ****
}
printf("<tr><td CLASS='optBoxItem'>Persistent%s:</td><td><b>",(cmd==CMD_ACKNOWLEDGE_SVC_PROBLEM)?" Comment":"");
! printf("<INPUT TYPE='checkbox' NAME='persistent' CHECKED>");
printf("</b></td></tr>\n");
printf("<tr><td CLASS='optBoxRequiredItem'>Author (Your Name):</td><td><b>");
--- 967,971 ----
}
printf("<tr><td CLASS='optBoxItem'>Persistent%s:</td><td><b>",(cmd==CMD_ACKNOWLEDGE_SVC_PROBLEM)?" Comment":"");
! printf("<INPUT TYPE='checkbox' NAME='persistent' %s",(cmd==CMD_ACKNOWLEDGE_SVC_PROBLEM)?"":"CHECKED");
printf("</b></td></tr>\n");
printf("<tr><td CLASS='optBoxRequiredItem'>Author (Your Name):</td><td><b>");
***************
*** 2352,2356 ****
printf("If you want acknowledgement to disable notifications until the host recovers, check the 'Sticky Acknowledgement' checkbox.\n");
printf("Contacts for this host will receive a notification about the acknowledgement, so they are aware that someone is working on the problem. Additionally, a comment will also be added to the host.\n");
! printf("Make sure to enter your name and fill in a brief description of what you are doing in the comment field. If you would like the host comment to be retained between restarts of Nagios, check\n");
printf("the 'Persistent Comment' checkbox. If you do not want an acknowledgement notification sent out to the appropriate contacts, uncheck the 'Send Notification' checkbox.\n");
break;
--- 2352,2356 ----
printf("If you want acknowledgement to disable notifications until the host recovers, check the 'Sticky Acknowledgement' checkbox.\n");
printf("Contacts for this host will receive a notification about the acknowledgement, so they are aware that someone is working on the problem. Additionally, a comment will also be added to the host.\n");
! printf("Make sure to enter your name and fill in a brief description of what you are doing in the comment field. If you would like the host comment to remain once the acknowledgement is removed, check\n");
printf("the 'Persistent Comment' checkbox. If you do not want an acknowledgement notification sent out to the appropriate contacts, uncheck the 'Send Notification' checkbox.\n");
break;
***************
*** 2360,2364 ****
printf("If you want acknowledgement to disable notifications until the service recovers, check the 'Sticky Acknowledgement' checkbox.\n");
printf("Contacts for this service will receive a notification about the acknowledgement, so they are aware that someone is working on the problem. Additionally, a comment will also be added to the service.\n");
! printf("Make sure to enter your name and fill in a brief description of what you are doing in the comment field. If you would like the service comment to be retained between restarts of Nagios, check\n");
printf("the 'Persistent Comment' checkbox. If you do not want an acknowledgement notification sent out to the appropriate contacts, uncheck the 'Send Notification' checkbox.\n");
break;
--- 2360,2364 ----
printf("If you want acknowledgement to disable notifications until the service recovers, check the 'Sticky Acknowledgement' checkbox.\n");
printf("Contacts for this service will receive a notification about the acknowledgement, so they are aware that someone is working on the problem. Additionally, a comment will also be added to the service.\n");
! printf("Make sure to enter your name and fill in a brief description of what you are doing in the comment field. If you would like the service comment to remain once the acknowledgement is removed, check\n");
printf("the 'Persistent Comment' checkbox. If you do not want an acknowledgement notification sent out to the appropriate contacts, uncheck the 'Send Notification' checkbox.\n");
break;
***************
*** 2431,2442 ****
case CMD_REMOVE_HOST_ACKNOWLEDGEMENT:
printf("This command is used to remove an acknowledgement for a particular host problem. Once the acknowledgement is removed, notifications may start being\n");
! printf("sent out about the host problem. Note: Removing the acknowledgement does <i>not</i> remove the host comment that was originally associated\n");
! printf("with the acknowledgement. You'll have to remove that as well if that's what you want.\n");
break;
case CMD_REMOVE_SVC_ACKNOWLEDGEMENT:
printf("This command is used to remove an acknowledgement for a particular service problem. Once the acknowledgement is removed, notifications may start being\n");
! printf("sent out about the service problem. Note: Removing the acknowledgement does <i>not</i> remove the service comment that was originally associated\n");
! printf("with the acknowledgement. You'll have to remove that as well if that's what you want.\n");
break;
--- 2431,2440 ----
case CMD_REMOVE_HOST_ACKNOWLEDGEMENT:
printf("This command is used to remove an acknowledgement for a particular host problem. Once the acknowledgement is removed, notifications may start being\n");
! printf("sent out about the host problem. \n");
break;
case CMD_REMOVE_SVC_ACKNOWLEDGEMENT:
printf("This command is used to remove an acknowledgement for a particular service problem. Once the acknowledgement is removed, notifications may start being\n");
! printf("sent out about the service problem.\n");
break;

Update of /cvsroot/nagios/nagios
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27520
Modified Files:
Changelog
Log Message:
New directives for plugin epn support
Index: Changelog
===================================================================
RCS file: /cvsroot/nagios/nagios/Changelog,v
retrieving revision 1.157
retrieving revision 1.158
diff -C2 -d -r1.157 -r1.158
*** Changelog 22 Dec 2006 00:37:30 -0000 1.157
--- Changelog 26 Dec 2006 16:50:19 -0000 1.158
***************
*** 115,119 ****
- Added 'enable_embedded_perl' option to main config file to control whether epn is enabled/disabled
- Added support for perl plugins to specify whether or not they should be run under the epn... The
! second line of a perl plugin may start with '#USE_EPN' or '#NO_EPN' to explicity indicate that it
should be run under the epn.
- Added 'use_embedded_perl_implicitly' option to main config file to determine whether or not perl
--- 115,119 ----
- Added 'enable_embedded_perl' option to main config file to control whether epn is enabled/disabled
- Added support for perl plugins to specify whether or not they should be run under the epn... The
! second to tenth line of a perl plugin may start with '# nagios: +epn' or '# nagios: -epn' to explicity indicate that it
should be run under the epn.
- Added 'use_embedded_perl_implicitly' option to main config file to determine whether or not perl

Community

Help

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:

I agree to receive quotes, newsletters and other information from sourceforge.net and its partners regarding IT services and products. I understand that I can withdraw my consent at any time. Please refer to our Privacy Policy or Contact Us for more details