Title: [opsview-base] [155] Merge from BRAN-4.2: Amend how the status.cgi stats are calculated
- Revision
- 155
- Author
- dferguson
- Date
- 2012-12-19 08:51:35 +0000 (Wed, 19 Dec 2012)
Log Message
Merge from BRAN-4.2: Amend how the status.cgi stats are calculated
Modified Paths
Added Paths
Property Changed
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BRAN-4.3:54-62
/branches/DEV-Nagios_4:63-125
/branches/DEV-Nagios_4-will_need_to_merge:77-148
/branches/nagvis-iframe:33
+ /branches/BRAN-4.2:152
/branches/BRAN-4.3:54-62
/branches/DEV-Nagios_4:63-125
/branches/DEV-Nagios_4-will_need_to_merge:77-148
/branches/nagvis-iframe:33
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2012-12-18 17:05:13 UTC (rev 154)
+++ trunk/Makefile 2012-12-19 08:51:35 UTC (rev 155)
@@ -555,6 +555,7 @@
cd ${NAGIOS} && patch -p1 < ../patches/nagios_free_objects_fix.patch
# Below required otherwise installs hang
cd ${NAGIOS} && patch -p1 < ../patches/nagios_daemonise_worker_helpers.patch
+ cd ${NAGIOS} && patch -p1 < ../patches/nagios_cgi_statuscgi_hostsenabled.patch
if [ $(KERNEL_NAME) = 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 [ $(KERNEL_NAME) = Darwin ] ; then \
Copied: trunk/patches/nagios_cgi_statuscgi_hostsenabled.patch (from rev 152, branches/BRAN-4.2/patches/nagios_cgi_statuscgi_hostsenabled.patch)
===================================================================
--- trunk/patches/nagios_cgi_statuscgi_hostsenabled.patch (rev 0)
+++ trunk/patches/nagios_cgi_statuscgi_hostsenabled.patch 2012-12-19 08:51:35 UTC (rev 155)
@@ -0,0 +1,18 @@
+diff -ur nagios-3.2.3.orig/cgi/status.c nagios-3.2.3/cgi/status.c
+--- nagios-3.2.3.orig/cgi/status.c 2012-12-14 14:18:43.000000000 +0000
++++ nagios-3.2.3/cgi/status.c 2012-12-14 14:21:43.000000000 +0000
+@@ -941,12 +941,12 @@
+ total_up++;
+ else if(temp_hoststatus->status==HOST_DOWN){
+ total_down++;
+- if(temp_hoststatus->problem_has_been_acknowledged==FALSE && temp_hoststatus->notifications_enabled==TRUE && temp_hoststatus->checks_enabled==TRUE && temp_hoststatus->scheduled_downtime_depth==0)
++ if(temp_hoststatus->problem_has_been_acknowledged==FALSE && temp_hoststatus->notifications_enabled==TRUE && temp_hoststatus->scheduled_downtime_depth==0)
+ problem_hosts_down++;
+ }
+ else if(temp_hoststatus->status==HOST_UNREACHABLE){
+ total_unreachable++;
+- if(temp_hoststatus->problem_has_been_acknowledged==FALSE && temp_hoststatus->notifications_enabled==TRUE && temp_hoststatus->checks_enabled==TRUE && temp_hoststatus->scheduled_downtime_depth==0)
++ if(temp_hoststatus->problem_has_been_acknowledged==FALSE && temp_hoststatus->notifications_enabled==TRUE && temp_hoststatus->scheduled_downtime_depth==0)
+ problem_hosts_unreachable++;
+ }
+
_______________________________________________
Opsview-checkins mailing list
[email protected]
http://lists.opsview.org/lists/listinfo/opsview-checkins
