New config options with Ubuntu 14.04's nagios

diff --git a/cgi.cfg b/cgi.cfg
index dc7464524e122cb664149307a8fdf9bc80ef3b56..1d6cc30e7f4459d71d1dd18af5c829ac7ff24397 100644 (file)
--- a/cgi.cfg
+++ b/cgi.cfg
@@ -287,6 +287,13 @@ ping_syntax=/bin/ping -n -U -c 5 $HOSTADDRESS$
 
 refresh_rate=90
 
+# DEFAULT PAGE LIMIT
+# This option allows you to specify the default number of results 
+# displayed on the status.cgi.  This number can be adjusted from
+# within the UI after the initial page load. Setting this to 0
+# will show all results.  
+
+result_limit=100
 
 
 # ESCAPE HTML TAGS

diff --git a/nagios.cfg b/nagios.cfg
index 0abfe8fa67a7a2a34c156f1f9b2bacbd56e761bd..99bbe45d002dfea694fea8c6d42f5e9d51ca453a 100644 (file)
--- a/nagios.cfg
+++ b/nagios.cfg
@@ -908,6 +908,18 @@ process_performance_data=0
 
 
 
+# HOST AND SERVICE PERFORMANCE DATA PROCESS EMPTY RESULTS
+# THese options determine wether the core will process empty perfdata
+# results or not. This is needed for distributed monitoring, and intentionally
+# turned on by default.
+# If you don't require empty perfdata - saving some cpu cycles
+# on unwanted macro calculation - you can turn that off. Be careful!
+# Values: 1 = enable, 0 = disable
+
+#host_perfdata_process_empty_results=1
+#service_perfdata_process_empty_results=1
+
+
 # OBSESS OVER SERVICE CHECKS OPTION
 # This determines whether or not Nagios will obsess over service
 # checks and run the ocsp_command defined below.  Unless you're
@@ -1023,6 +1035,22 @@ service_freshness_check_interval=60
 
 
 
+# SERVICE CHECK TIMEOUT STATE
+# This setting determines the state Nagios will report when a
+# service check times out - that is does not respond within
+# service_check_timeout seconds.  This can be useful if a
+# machine is running at too high a load and you do not want
+# to consider a failed service check to be critical (the default).
+# Valid settings are:
+# c - Critical (default)
+# u - Unknown
+# w - Warning
+# o - OK
+
+service_check_timeout_state=c
+
+
+
 # HOST FRESHNESS CHECK OPTION
 # This option determines whether or not Nagios will periodically
 # check the "freshness" of host results.  Enabling this option