Title: [opsview] [5315] Tiny Nagios CGI fixes
- Revision
- 5315
- Author
- tvoon
- Date
- 2010-11-04 23:43:18 +0000 (Thu, 04 Nov 2010)
Log Message
Tiny Nagios CGI fixes
Modified Paths
Added Paths
Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES 2010-11-04 23:31:27 UTC (rev 5314)
+++ trunk/CHANGES 2010-11-04 23:43:18 UTC (rev 5315)
@@ -78,6 +78,7 @@
cloned, so will need to be set correctly
Fixed UTF8 encoding from Nagios CGIs returned through Opsview
Fixed visual glitch of background image on forms with a long amount of data
+ Fixed 2 small Nagios CGI bugs
WARNINGS:
There are some manual post install tasks required. See
Modified: trunk/opsview-base/Makefile
===================================================================
--- trunk/opsview-base/Makefile 2010-11-04 23:31:27 UTC (rev 5314)
+++ trunk/opsview-base/Makefile 2010-11-04 23:43:18 UTC (rev 5315)
@@ -437,6 +437,8 @@
cd ${NAGIOS}/cgi && patch -p0 < ../../patches/nagios_trends_nofixedsize.patch
cd ${NAGIOS}/cgi && patch -p0 < ../../patches/nagios_trends_no_nagios_restarts.patch
cd ${NAGIOS} && patch -p1 < ../patches/nagios_remove_unnecessary_status_update.patch
+ # Below in Nagios 3.2.4+
+ cd ${NAGIOS} && patch -p1 < ../patches/nagios_extinfo_tidyups.patch
if [ `uname -s` = Linux ] ; then \
cd ${NAGIOS} && CFLAGS="${CFLAGS}" ./configure --with-nagios-user=$(NAGIOS_USER) --with-nagios-group=$(NAGIOS_GROUP) --with-command-group=$(NAGIOS_GROUP) --with-cgiurl=/cgi-bin --with-htmurl=/ --enable-libtap ; \
elif [ `uname -s` = Darwin ] ; then \
Added: trunk/opsview-base/patches/nagios_extinfo_tidyups.patch
===================================================================
--- trunk/opsview-base/patches/nagios_extinfo_tidyups.patch (rev 0)
+++ trunk/opsview-base/patches/nagios_extinfo_tidyups.patch 2010-11-04 23:43:18 UTC (rev 5315)
@@ -0,0 +1,22 @@
+diff -ur nagios-3.2.3.original/cgi/extinfo.c nagios-3.2.3/cgi/extinfo.c
+--- nagios-3.2.3.original/cgi/extinfo.c 2010-11-04 23:34:18.000000000 +0000
++++ nagios-3.2.3/cgi/extinfo.c 2010-11-04 23:37:00.000000000 +0000
+@@ -840,7 +840,7 @@
+ printf("<TR><TD CLASS='dataVar'>Last Log File Rotation:</TD><TD CLASS='dataVal'>%s</TD></TR>\n",(last_log_rotation==(time_t)0)?"N/A":date_time);
+
+ /* PID */
+- printf("<TR><TD CLASS='dataVar'>Nagios PID</TD><TD CLASS='dataval'>%d</TD></TR>\n",nagios_pid);
++ printf("<TR><TD CLASS='dataVar'>Nagios PID</TD><TD CLASS='dataVal'>%d</TD></TR>\n",nagios_pid);
+
+ /* notifications enabled */
+ printf("<TR><TD CLASS='dataVar'>Notifications Enabled?</TD><TD CLASS='dataVal'><DIV CLASS='notifications%s'> %s </DIV></TD></TR>\n",(enable_notifications==TRUE)?"ENABLED":"DISABLED",(enable_notifications==TRUE)?"YES":"NO");
+@@ -2956,7 +2956,7 @@
+ printf("&service=%s'><img src='' border=0 ALT='Enable Active Checks Of This Service' TITLE='Enable Active Checks Of This Service'></a>\n",url_encode(temp_svcstatus->description),url_images_path,ENABLED_ICON);
+ }
+ printf("<a href=''><img src='' border=0 ALT='Re-schedule This Service Check' TITLE='Re-schedule This Service Check'></a>\n",url_encode(temp_svcstatus->description),url_images_path,DELAY_ICON);
++ printf("&service=%s'><img src='' border=0 ALT='Re-schedule This Service Check' TITLE='Re-schedule This Service Check'></a>\n",url_encode(temp_svcstatus->description),url_images_path,DELAY_ICON);
+ printf("</TD>\n");
+ }
+
+Binary files nagios-3.2.3.original/cgi/extinfo.cgi and nagios-3.2.3/cgi/extinfo.cgi differ
_______________________________________________
Opsview-checkins mailing list
[email protected]
http://lists.opsview.org/lists/listinfo/opsview-checkins
