Update of /cvsroot/nagios/nagios/cgi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12270/cgi
Modified Files:
avail.c cmd.c config.c extinfo.c histogram.c history.c
notifications.c outages.c showlog.c status.c statusmap.c
summary.c tac.c trends.c
Log Message:
doc updates, stylesheet madness fix, new external commands for freshness
checking
Index: extinfo.c
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/extinfo.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** extinfo.c 26 Oct 2004 03:28:43 -0000 1.51
--- extinfo.c 31 Oct 2004 04:16:02 -0000 1.52
***************
*** 4,8 ****
*
* Copyright (c) 1999-2004 Ethan Galstad (nagios@xxxxxxxxxx)
! * Last Modified: 10-25-2004
*
* License:
--- 4,8 ----
*
* Copyright (c) 1999-2004 Ethan Galstad (nagios@xxxxxxxxxx)
! * Last Modified: 10-30-2004
*
* License:
***************
*** 509,515 ****
printf("</title>\n");
! if(use_stylesheet==TRUE)
printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>",url_stylesheets_path,EXTINFO_CSS);
!
printf("</head>\n");
--- 509,516 ----
printf("</title>\n");
! if(use_stylesheet==TRUE){
! printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>",url_stylesheets_path,COMMON_CSS);
printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>",url_stylesheets_path,EXTINFO_CSS);
! }
printf("</head>\n");
Index: notifications.c
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/notifications.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** notifications.c 30 Oct 2004 23:39:15 -0000 1.11
--- notifications.c 31 Oct 2004 04:16:02 -0000 1.12
***************
*** 237,240 ****
--- 237,241 ----
printf("<option value=%d %s>Service
critical\n",NOTIFICATION_SERVICE_CRITICAL,(notification_options==NOTIFICATION_SERVICE_CRITICAL)?"selected":"");
printf("<option value=%d %s>Service
recovery\n",NOTIFICATION_SERVICE_RECOVERY,(notification_options==NOTIFICATION_SERVICE_RECOVERY)?"selected":"");
+ printf("<option value=%d %s>Service
flapping\n",NOTIFICATION_SERVICE_FLAP,(notification_options==NOTIFICATION_SERVICE_FLAP)?"selected":"");
if(query_type!=FIND_SERVICE){
printf("<option value=%d %s>Host
acknowledgements\n",NOTIFICATION_HOST_ACK,(notification_options==NOTIFICATION_HOST_ACK)?"selected":"");
***************
*** 242,245 ****
--- 243,247 ----
printf("<option value=%d %s>Host
unreachable\n",NOTIFICATION_HOST_UNREACHABLE,(notification_options==NOTIFICATION_HOST_UNREACHABLE)?"selected":"");
printf("<option value=%d %s>Host
recovery\n",NOTIFICATION_HOST_RECOVERY,(notification_options==NOTIFICATION_HOST_RECOVERY)?"selected":"");
+ printf("<option value=%d %s>Host
flapping\n",NOTIFICATION_HOST_FLAP,(notification_options==NOTIFICATION_HOST_FLAP)?"selected":"");
}
printf("</select></td>\n");
***************
*** 311,317 ****
printf("</title>\n");
! if(use_stylesheet==TRUE)
printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>\n",url_stylesheets_path,NOTIFICATIONS_CSS);
!
printf("</head>\n");
--- 313,321 ----
printf("</title>\n");
! if(use_stylesheet==TRUE){
! printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>\n",url_stylesheets_path,COMMON_CSS);
printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>\n",url_stylesheets_path,NOTIFICATIONS_CSS);
! }
!
printf("</head>\n");
***************
*** 583,586 ****
--- 587,600 ----
strcpy(alert_level_class,"ACKNOWLEDGEMENT");
}
+ else if(strstr(alert_level,"FLAPPINGSTART (")){
+ strcpy(alert_level,"FLAPPING START");
+
notification_detail_type=NOTIFICATION_SERVICE_FLAP;
+ strcpy(alert_level_class,"UNKNOWN");
+ }
+ else if(strstr(alert_level,"FLAPPINGSTOP (")){
+ strcpy(alert_level,"FLAPPING STOP");
+
notification_detail_type=NOTIFICATION_SERVICE_FLAP;
+ strcpy(alert_level_class,"UNKNOWN");
+ }
else{
strcpy(alert_level,"UNKNOWN");
***************
*** 611,614 ****
--- 625,638 ----
notification_detail_type=NOTIFICATION_HOST_ACK;
}
+ else if(strstr(alert_level,"FLAPPINGSTART (")){
+ strcpy(alert_level,"FLAPPING START");
+ strcpy(alert_level_class,"UNKNOWN");
+
notification_detail_type=NOTIFICATION_HOST_FLAP;
+ }
+ else if(strstr(alert_level,"FLAPPINGSTOP (")){
+ strcpy(alert_level,"FLAPPING STOP");
+ strcpy(alert_level_class,"UNKNOWN");
+
notification_detail_type=NOTIFICATION_HOST_FLAP;
+ }
}
Index: cmd.c
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/cmd.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** cmd.c 26 Mar 2004 06:04:04 -0000 1.25
--- cmd.c 31 Oct 2004 04:16:02 -0000 1.26
***************
*** 4,8 ****
*
* Copyright (c) 1999-2004 Ethan Galstad (nagios@xxxxxxxxxx)
! * Last Modified: 03-25-2004
*
* License:
--- 4,8 ----
*
* Copyright (c) 1999-2004 Ethan Galstad (nagios@xxxxxxxxxx)
! * Last Modified: 10-30-2004
*
* License:
***************
*** 241,246 ****
printf("</title>\n");
! if(use_stylesheet==TRUE)
printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>\n",url_stylesheets_path,COMMAND_CSS);
printf("</head>\n");
--- 241,248 ----
printf("</title>\n");
! if(use_stylesheet==TRUE){
! printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>\n",url_stylesheets_path,COMMON_CSS);
printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>\n",url_stylesheets_path,COMMAND_CSS);
+ }
printf("</head>\n");
Index: summary.c
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/summary.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** summary.c 30 Oct 2004 23:39:15 -0000 1.18
--- summary.c 31 Oct 2004 04:16:03 -0000 1.19
***************
*** 716,722 ****
printf("</title>\n");
! if(use_stylesheet==TRUE)
printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>\n",url_stylesheets_path,SUMMARY_CSS);
!
printf("</head>\n");
--- 716,724 ----
printf("</title>\n");
! if(use_stylesheet==TRUE){
! printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>\n",url_stylesheets_path,COMMON_CSS);
printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>\n",url_stylesheets_path,SUMMARY_CSS);
! }
!
printf("</head>\n");
Index: outages.c
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/outages.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** outages.c 15 Aug 2003 01:34:09 -0000 1.14
--- outages.c 31 Oct 2004 04:16:03 -0000 1.15
***************
*** 3,8 ****
* OUTAGES.C - Nagios Network Outages CGI
*
! * Copyright (c) 1999-2003 Ethan Galstad (nagios@xxxxxxxxxx)
! * Last Modified: 08-14-2003
*
* License:
--- 3,8 ----
* OUTAGES.C - Nagios Network Outages CGI
*
! * Copyright (c) 1999-2004 Ethan Galstad (nagios@xxxxxxxxxx)
! * Last Modified: 10-30-2004
*
* License:
***************
*** 231,236 ****
printf("</title>\n");
! if(use_stylesheet==TRUE)
printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>",url_stylesheets_path,OUTAGES_CSS);
printf("</head>\n");
--- 231,238 ----
printf("</title>\n");
! if(use_stylesheet==TRUE){
! printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>",url_stylesheets_path,COMMON_CSS);
printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>",url_stylesheets_path,OUTAGES_CSS);
+ }
printf("</head>\n");
Index: config.c
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/config.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** config.c 25 Oct 2004 05:05:54 -0000 1.22
--- config.c 31 Oct 2004 04:16:02 -0000 1.23
***************
*** 4,8 ****
*
* Copyright (c) 1999-2004 Ethan Galstad (nagios@xxxxxxxxxx)
! * Last Modified: 10-24-2004
*
* This CGI program will display various configuration information.
--- 4,8 ----
*
* Copyright (c) 1999-2004 Ethan Galstad (nagios@xxxxxxxxxx)
! * Last Modified: 10-30-2004
*
* This CGI program will display various configuration information.
***************
*** 322,327 ****
printf("</title>\n");
! if(use_stylesheet==TRUE)
printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>\n",url_stylesheets_path,CONFIG_CSS);
printf("</head>\n");
--- 322,329 ----
printf("</title>\n");
! if(use_stylesheet==TRUE){
! printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>\n",url_stylesheets_path,COMMON_CSS);
printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>\n",url_stylesheets_path,CONFIG_CSS);
+ }
printf("</head>\n");
Index: statusmap.c
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/statusmap.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** statusmap.c 25 Oct 2004 05:05:54 -0000 1.25
--- statusmap.c 31 Oct 2004 04:16:03 -0000 1.26
***************
*** 4,8 ****
*
* Copyright (c) 1999-2004 Ethan Galstad (nagios@xxxxxxxxxx)
! * Last Modified: 10-24-2004
*
* Description:
--- 4,8 ----
*
* Copyright (c) 1999-2004 Ethan Galstad (nagios@xxxxxxxxxx)
! * Last Modified: 10-30-2004
*
* Description:
***************
*** 331,336 ****
printf("</title>\n");
! if(use_stylesheet==TRUE)
printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>\n",url_stylesheets_path,STATUSMAP_CSS);
/* write JavaScript code for popup window */
--- 331,338 ----
printf("</title>\n");
! if(use_stylesheet==TRUE){
! printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>\n",url_stylesheets_path,COMMON_CSS);
printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>\n",url_stylesheets_path,STATUSMAP_CSS);
+ }
/* write JavaScript code for popup window */
Index: tac.c
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/tac.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** tac.c 5 Jan 2004 02:45:35 -0000 1.22
--- tac.c 31 Oct 2004 04:16:03 -0000 1.23
***************
*** 4,8 ****
*
* Copyright (c) 2001-2004 Ethan Galstad (nagios@xxxxxxxxxx)
! * Last Modified: 01-05-2004
*
* This CGI program will display the contents of the Nagios
--- 4,8 ----
*
* Copyright (c) 2001-2004 Ethan Galstad (nagios@xxxxxxxxxx)
! * Last Modified: 10-30-2004
*
* This CGI program will display the contents of the Nagios
***************
*** 335,340 ****
printf("</TITLE>\n");
! if(use_stylesheet==TRUE)
printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>\n",url_stylesheets_path,TAC_CSS);
printf("</HEAD>\n");
--- 335,342 ----
printf("</TITLE>\n");
! if(use_stylesheet==TRUE){
! printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>\n",url_stylesheets_path,COMMON_CSS);
printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>\n",url_stylesheets_path,TAC_CSS);
+ }
printf("</HEAD>\n");
Index: avail.c
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/avail.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** avail.c 30 Oct 2004 23:39:15 -0000 1.26
--- avail.c 31 Oct 2004 04:16:02 -0000 1.27
***************
*** 1073,1078 ****
printf("</title>\n");
! if(use_stylesheet==TRUE)
printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>\n",url_stylesheets_path,AVAIL_CSS);
printf("</head>\n");
--- 1073,1080 ----
printf("</title>\n");
! if(use_stylesheet==TRUE){
! printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>\n",url_stylesheets_path,COMMON_CSS);
printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>\n",url_stylesheets_path,AVAIL_CSS);
+ }
printf("</head>\n");
Index: history.c
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/history.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** history.c 30 Oct 2004 23:39:15 -0000 1.16
--- history.c 31 Oct 2004 04:16:02 -0000 1.17
***************
*** 324,330 ****
printf("</title>\n");
! if(use_stylesheet==TRUE)
printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>\n",url_stylesheets_path,HISTORY_CSS);
!
printf("</head>\n");
printf("<BODY CLASS='history'>\n");
--- 324,332 ----
printf("</title>\n");
! if(use_stylesheet==TRUE){
! printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>\n",url_stylesheets_path,COMMON_CSS);
printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>\n",url_stylesheets_path,HISTORY_CSS);
! }
!
printf("</head>\n");
printf("<BODY CLASS='history'>\n");
Index: showlog.c
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/showlog.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** showlog.c 30 Oct 2004 23:39:15 -0000 1.10
--- showlog.c 31 Oct 2004 04:16:03 -0000 1.11
***************
*** 197,202 ****
printf("</TITLE>\n");
! if(use_stylesheet==TRUE)
printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>\n",url_stylesheets_path,SHOWLOG_CSS);
printf("</HEAD>\n");
--- 197,204 ----
printf("</TITLE>\n");
! if(use_stylesheet==TRUE){
! printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>\n",url_stylesheets_path,COMMON_CSS);
printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>\n",url_stylesheets_path,SHOWLOG_CSS);
+ }
printf("</HEAD>\n");
Index: histogram.c
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/histogram.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** histogram.c 30 Oct 2004 23:39:15 -0000 1.17
--- histogram.c 31 Oct 2004 04:16:02 -0000 1.18
***************
*** 1002,1007 ****
printf("</title>\n");
! if(use_stylesheet==TRUE)
printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>\n",url_stylesheets_path,HISTOGRAM_CSS);
printf("</head>\n");
--- 1002,1009 ----
printf("</title>\n");
! if(use_stylesheet==TRUE){
! printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>\n",url_stylesheets_path,COMMON_CSS);
printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>\n",url_stylesheets_path,HISTOGRAM_CSS);
+ }
printf("</head>\n");
Index: trends.c
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/trends.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** trends.c 30 Oct 2004 23:39:15 -0000 1.26
--- trends.c 31 Oct 2004 04:16:03 -0000 1.27
***************
*** 1105,1111 ****
printf("</title>\n");
! if(use_stylesheet==TRUE)
printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>\n",url_stylesheets_path,TRENDS_CSS);
!
/* write JavaScript code for popup window */
if(display_type!=DISPLAY_NO_TRENDS)
--- 1105,1113 ----
printf("</title>\n");
! if(use_stylesheet==TRUE){
! printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>\n",url_stylesheets_path,COMMON_CSS);
printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>\n",url_stylesheets_path,TRENDS_CSS);
! }
!
/* write JavaScript code for popup window */
if(display_type!=DISPLAY_NO_TRENDS)
Index: status.c
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/status.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** status.c 25 Oct 2004 05:05:54 -0000 1.35
--- status.c 31 Oct 2004 04:16:03 -0000 1.36
***************
*** 3,8 ****
* STATUS.C - Nagios Status CGI
*
! * Copyright (c) 1999-2003 Ethan Galstad (nagios@xxxxxxxxxx)
! * Last Modified: 10-24-2003
*
* License:
--- 3,8 ----
* STATUS.C - Nagios Status CGI
*
! * Copyright (c) 1999-2004 Ethan Galstad (nagios@xxxxxxxxxx)
! * Last Modified: 10-30-2004
*
* License:
***************
*** 504,509 ****
printf("</title>\n");
! if(use_stylesheet==TRUE)
printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>",url_stylesheets_path,STATUS_CSS);
printf("</head>\n");
--- 504,511 ----
printf("</title>\n");
! if(use_stylesheet==TRUE){
! printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>",url_stylesheets_path,COMMON_CSS);
printf("<LINK REL='stylesheet' TYPE='text/css'
HREF='%s%s'>",url_stylesheets_path,STATUS_CSS);
+ }
printf("</head>\n");
-------------------------------------------------------
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click
|