Implement more detailed bandwidth monitoring

modules/nagios/files/nagios.cfg

Index: modules/nagios/files/nagios.cfg
===================================================================
--- a/modules/nagios/files/nagios.cfg
+++ b/modules/nagios/files/nagios.cfg
@@ -1,19 +1,19 @@
 ##############################################################################
 #
-# NAGIOS.CFG - Sample Main Config File for Nagios 
+# NAGIOS.CFG - Sample Main Config File for Nagios
 #
 #
 ##############################################################################
 
 
 # LOG FILE
 # This is the main log file where service and host events are logged
-# for historical purposes.  This should be the first option specified 
+# for historical purposes.  This should be the first option specified
 # in the config file!!!
 
 log_file=/var/log/nagios3/nagios.log
 
 # Commands definitions
 cfg_file=/etc/nagios3/commands.cfg
 
 # Debian also defaults to using the check commands defined by the debian
@@ -56,33 +56,33 @@ cfg_dir=/etc/nagios3/conf.d
 #cfg_dir=/etc/nagios3/switches
 #cfg_dir=/etc/nagios3/routers
 
 
 
 
 # OBJECT CACHE FILE
 # This option determines where object definitions are cached when
-# Nagios starts/restarts.  The CGIs read object definitions from 
+# Nagios starts/restarts.  The CGIs read object definitions from
 # this cache file (rather than looking at the object config files
 # directly) in order to prevent inconsistencies that can occur
 # when the config files are modified after Nagios starts.
 
 object_cache_file=/var/cache/nagios3/objects.cache
 
 
 
 # PRE-CACHED OBJECT FILE
 # This options determines the location of the precached object file.
 # If you run Nagios with the -p command line option, it will preprocess
 # your object configuration file(s) and write the cached config to this
 # file.  You can then start Nagios with the -u option to have it read
 # object definitions from this precached file, rather than the standard
 # object configuration files (see the cfg_file and cfg_dir options above).
-# Using a precached object file can speed up the time needed to (re)start 
+# Using a precached object file can speed up the time needed to (re)start
 # the Nagios process if you've got a large and/or complex configuration.
 # Read the documentation section on optimizing Nagios to find our more
 # about how this feature works.
 
 precached_object_file=/var/lib/nagios3/objects.precache
 
 
 
@@ -106,33 +106,33 @@ resource_file=/etc/nagios3/resource.cfg
 #  restarts.
 
 status_file=/var/cache/nagios3/status.dat
 
 
 
 # STATUS FILE UPDATE INTERVAL
 # This option determines the frequency (in seconds) that
-# Nagios will periodically dump program, host, and 
+# Nagios will periodically dump program, host, and
 # service status data.
 
 status_update_interval=10
 
 
 
 # NAGIOS USER
-# This determines the effective user that Nagios should run as.  
+# This determines the effective user that Nagios should run as.
 # You can either supply a username or a UID.
 
 nagios_user=nagios
 
 
 
 # NAGIOS GROUP
-# This determines the effective group that Nagios should run as.  
+# This determines the effective group that Nagios should run as.
 # You can either supply a group name or a GID.
 
 nagios_group=nagios
 
 
 
 # EXTERNAL COMMAND OPTION
 # This option allows you to specify whether or not Nagios should check
@@ -148,46 +148,46 @@ check_external_commands=0
 
 # EXTERNAL COMMAND CHECK INTERVAL
 # This is the interval at which Nagios should check for external commands.
 # This value works of the interval_length you specify later.  If you leave
 # that at its default value of 60 (seconds), a value of 1 here will cause
 # Nagios to check for external commands every minute.  If you specify a
 # number followed by an "s" (i.e. 15s), this will be interpreted to mean
 # actual seconds rather than a multiple of the interval_length variable.
-# Note: In addition to reading the external command file at regularly 
+# Note: In addition to reading the external command file at regularly
 # scheduled intervals, Nagios will also check for external commands after
 # event handlers are executed.
 # NOTE: Setting this value to -1 causes Nagios to check the external
 # command file as often as possible.
 
 #command_check_interval=15s
 command_check_interval=-1
 
 
 
 # EXTERNAL COMMAND FILE
 # This is the file that Nagios checks for external command requests.
 # It is also where the command CGI will write commands that are submitted
 # by users, so it must be writeable by the user that the web server
-# is running as (usually 'nobody').  Permissions should be set at the 
+# is running as (usually 'nobody').  Permissions should be set at the
 # directory level instead of on the file, as the file is deleted every
 # time its contents are processed.
 # Debian Users: In case you didn't read README.Debian yet, _NOW_ is the
 # time to do it.
 
 command_file=/var/lib/nagios3/rw/nagios.cmd
 
 
 
 # EXTERNAL COMMAND BUFFER SLOTS
 # This settings is used to tweak the number of items or "slots" that
-# the Nagios daemon should allocate to the buffer that holds incoming 
-# external commands before they are processed.  As external commands 
-# are processed by the daemon, they are removed from the buffer.  
+# the Nagios daemon should allocate to the buffer that holds incoming
+# external commands before they are processed.  As external commands
+# are processed by the daemon, they are removed from the buffer.
 
 external_command_buffer_slots=4096
 
 
 
 # LOCK FILE
 # This is the lockfile that Nagios will use to store its PID number
 # in when it is running in daemon mode.
@@ -260,17 +260,17 @@ event_broker_options=-1
 #	w	= Weekly rotation (midnight on Saturday evening)
 #	m	= Monthly rotation (midnight last day of month)
 
 log_rotation_method=d
 
 
 
 # LOG ARCHIVE PATH
-# This is the directory where archived (rotated) log files should be 
+# This is the directory where archived (rotated) log files should be
 # placed (assuming you've chosen to do log rotation).
 
 log_archive_path=/var/log/nagios3/archives
 
 
 
 # LOGGING OPTIONS
 # If you want messages logged to the syslog facility, as well as the
@@ -423,17 +423,17 @@ host_inter_check_delay_method=s
 # program start time that an initial check of all hosts should
 # be completed.  Default is 30 minutes.
 
 max_host_check_spread=30
 
 
 
 # MAXIMUM CONCURRENT SERVICE CHECKS
-# This option allows you to specify the maximum number of 
+# This option allows you to specify the maximum number of
 # service checks that can be run in parallel at any given time.
 # Specifying a value of 1 for this variable essentially prevents
 # any service checks from being parallelized.  A value of 0
 # will not restrict the number of concurrent checks that are
 # being executed.
 
 max_concurrent_checks=0
 
@@ -445,40 +445,40 @@ max_concurrent_checks=0
 
 check_result_reaper_frequency=10
 
 
 
 
 # MAX CHECK RESULT REAPER TIME
 # This is the max amount of time (in seconds) that  a single
-# check result reaper event will be allowed to run before 
+# check result reaper event will be allowed to run before
 # returning control back to Nagios so it can perform other
 # duties.
 
 max_check_result_reaper_time=30
 
 
 
 
 # CHECK RESULT PATH
 # This is directory where Nagios stores the results of host and
 # service checks that have not yet been processed.
 #
 # Note: Make sure that only one instance of Nagios has access
-# to this directory!  
+# to this directory!
 
 check_result_path=/var/lib/nagios3/spool/checkresults
 
 
 
 
 # MAX CHECK RESULT FILE AGE
 # This option determines the maximum age (in seconds) which check
-# result files are considered to be valid.  Files older than this 
+# result files are considered to be valid.  Files older than this
 # threshold will be mercilessly deleted without further processing.
 
 max_check_result_file_age=3600
 
 
 
 
 # CACHED HOST CHECK HORIZON
@@ -530,24 +530,24 @@ enable_predictive_host_dependency_checks
 #  0 = Disable predictive checks
 #  1 = Enable predictive checks (default)
 
 enable_predictive_service_dependency_checks=1
 
 
 
 # SOFT STATE DEPENDENCIES
-# This option determines whether or not Nagios will use soft state 
-# information when checking host and service dependencies. Normally 
-# Nagios will only use the latest hard host or service state when 
+# This option determines whether or not Nagios will use soft state
+# information when checking host and service dependencies. Normally
+# Nagios will only use the latest hard host or service state when
 # checking dependencies. If you want it to use the latest state (regardless
-# of whether its a soft or hard state type), enable this option. 
+# of whether its a soft or hard state type), enable this option.
 # Values:
-#  0 = Don't use soft state dependencies (default) 
-#  1 = Use soft state dependencies 
+#  0 = Don't use soft state dependencies (default)
+#  1 = Use soft state dependencies
 
 soft_state_dependencies=0
 
 
 
 # TIME CHANGE ADJUSTMENT THRESHOLDS
 # These options determine when Nagios will react to detected changes
 # in system time (either forward or backwards).
@@ -555,17 +555,17 @@ soft_state_dependencies=0
 #time_change_threshold=900
 
 
 
 # AUTO-RESCHEDULING OPTION
 # This option determines whether or not Nagios will attempt to
 # automatically reschedule active host and service checks to
 # "smooth" them out over time.  This can help balance the load on
-# the monitoring server.  
+# the monitoring server.
 # WARNING: THIS IS AN EXPERIMENTAL FEATURE - IT CAN DEGRADE
 # PERFORMANCE, RATHER THAN INCREASE IT, IF USED IMPROPERLY
 
 auto_reschedule_checks=0
 
 
 
 # AUTO-RESCHEDULING INTERVAL
@@ -618,29 +618,29 @@ ocsp_timeout=5
 perfdata_timeout=5
 
 
 
 # RETAIN STATE INFORMATION
 # This setting determines whether or not Nagios will save state
 # information for services and hosts before it shuts down.  Upon
 # startup Nagios will reload all saved service and host state
-# information before starting to monitor.  This is useful for 
+# information before starting to monitor.  This is useful for
 # maintaining long-term data on state statistics, etc, but will
 # slow Nagios down a bit when it (re)starts.  Since its only
 # a one-time penalty, I think its well worth the additional
 # startup delay.
 
 retain_state_information=1
 
 
 
 # STATE RETENTION FILE
 # This is the file that Nagios should use to store host and
-# service state information before it shuts down.  The state 
+# service state information before it shuts down.  The state
 # information in this file is also read immediately prior to
 # starting to monitor the network when Nagios is restarted.
 # This file is used only if the retain_state_information
 # variable is set to 1.
 
 state_retention_file=/var/lib/nagios3/retention.dat
 
 
@@ -653,17 +653,17 @@ state_retention_file=/var/lib/nagios3/re
 # data before shutting down or restarting.  If you have disabled
 # state retention, this option has no effect.
 
 retention_update_interval=60
 
 
 
 # USE RETAINED PROGRAM STATE
-# This setting determines whether or not Nagios will set 
+# This setting determines whether or not Nagios will set
 # program status variables based on the values saved in the
 # retention file.  If you want to use retained program status
 # information, set this value to 1.  If not, set this value
 # to 0.
 
 use_retained_program_state=1
 
 
@@ -680,17 +680,17 @@ use_retained_scheduling_info=1
 
 
 # RETAINED ATTRIBUTE MASKS (ADVANCED FEATURE)
 # The following variables are used to specify specific host and
 # service attributes that should *not* be retained by Nagios during
 # program restarts.
 #
 # The values of the masks are bitwise ANDs of values specified
-# by the "MODATTR_" definitions found in include/common.h.  
+# by the "MODATTR_" definitions found in include/common.h.
 # For example, if you do not want the current enabled/disabled state
 # of flap detection and event handlers for hosts to be retained, you
 # would use a value of 24 for the host attribute mask...
 # MODATTR_EVENT_HANDLER_ENABLED (8) + MODATTR_FLAP_DETECTION_ENABLED (16) = 24
 
 # This mask determines what host attributes are not retained
 retained_host_attribute_mask=0
 
@@ -714,39 +714,39 @@ retained_contact_service_attribute_mask=
 
 
 # INTERVAL LENGTH
 # This is the seconds per unit interval as used in the
 # host/contact/service configuration files.  Setting this to 60 means
 # that each interval is one minute long (60 seconds).  Other settings
 # have not been tested much, so your mileage is likely to vary...
 
-interval_length=60
+interval_length=57
 
 
 
 # CHECK FOR UPDATES
 # This option determines whether Nagios will automatically check to
 # see if new updates (releases) are available.  It is recommend that you
 # enable this option to ensure that you stay on top of the latest critical
 # patches to Nagios.  Nagios is critical to you - make sure you keep it in
 # good shape.  Nagios will check once a day for new updates. Data collected
-# by Nagios Enterprises from the update check is processed in accordance 
+# by Nagios Enterprises from the update check is processed in accordance
 # with our privacy policy - see http://api.nagios.org for details.
 
 check_for_updates=1
 
 
 
 # BARE UPDATE CHECK
 # This option deterines what data Nagios will send to api.nagios.org when
-# it checks for updates.  By default, Nagios will send information on the 
+# it checks for updates.  By default, Nagios will send information on the
 # current version of Nagios you have installed, as well as an indicator as
 # to whether this was a new installation or not.  Nagios Enterprises uses
-# this data to determine the number of users running specific version of 
+# this data to determine the number of users running specific version of
 # Nagios.  Enable this option if you do not want this information to be sent.
 
 bare_update_check=0
 
 
 
 # AGGRESSIVE HOST CHECKING OPTION
 # If you don't want to turn on aggressive host checking features, set
@@ -756,17 +756,17 @@ bare_update_check=0
 # base/checks.c
 
 use_aggressive_host_checking=0
 
 
 
 # SERVICE CHECK EXECUTION OPTION
 # This determines whether or not Nagios will actively execute
-# service checks when it initially starts.  If this option is 
+# service checks when it initially starts.  If this option is
 # disabled, checks are not actively made, but Nagios can still
 # receive and process passive check results that come in.  Unless
 # you're implementing redundant hosts or have a special need for
 # disabling the execution of service checks, leave this enabled!
 # Values: 1 = enable checks, 0 = disable checks
 
 execute_service_checks=1
 
@@ -778,17 +778,17 @@ execute_service_checks=1
 # Values: 1 = accept passive checks, 0 = reject passive checks
 
 accept_passive_service_checks=1
 
 
 
 # HOST CHECK EXECUTION OPTION
 # This determines whether or not Nagios will actively execute
-# host checks when it initially starts.  If this option is 
+# host checks when it initially starts.  If this option is
 # disabled, checks are not actively made, but Nagios can still
 # receive and process passive check results that come in.  Unless
 # you're implementing redundant hosts or have a special need for
 # disabling the execution of host checks, leave this enabled!
 # Values: 1 = enable checks, 0 = disable checks
 
 execute_host_checks=1
 
@@ -835,17 +835,17 @@ enable_event_handlers=1
 process_performance_data=1
 
 
 
 # HOST AND SERVICE PERFORMANCE DATA PROCESSING COMMANDS
 # These commands are run after every host and service check is
 # performed.  These commands are executed only if the
 # enable_performance_data option (above) is set to 1.  The command
-# argument is the short name of a command definition that you 
+# argument is the short name of a command definition that you
 # define in your host configuration file.  Read the HTML docs for
 # more information on performance data.
 
 host_perfdata_command=process-host-perfdata
 service_perfdata_command=process-service-perfdata
 
 
 
@@ -915,17 +915,17 @@ service_perfdata_command=process-service
 
 obsess_over_services=0
 
 
 
 # OBSESSIVE COMPULSIVE SERVICE PROCESSOR COMMAND
 # This is the command that is run for every service check that is
 # processed by Nagios.  This command is executed only if the
-# obsess_over_services option (above) is set to 1.  The command 
+# obsess_over_services option (above) is set to 1.  The command
 # argument is the short name of a command definition that you
 # define in your host configuration file. Read the HTML docs for
 # more information on implementing distributed monitoring.
 
 #ocsp_command=somecommand
 
 
 
@@ -939,17 +939,17 @@ obsess_over_services=0
 
 obsess_over_hosts=0
 
 
 
 # OBSESSIVE COMPULSIVE HOST PROCESSOR COMMAND
 # This is the command that is run for every host check that is
 # processed by Nagios.  This command is executed only if the
-# obsess_over_hosts option (above) is set to 1.  The command 
+# obsess_over_hosts option (above) is set to 1.  The command
 # argument is the short name of a command definition that you
 # define in your host configuration file. Read the HTML docs for
 # more information on implementing distributed monitoring.
 
 #ochp_command=somecommand
 
 
 
@@ -978,19 +978,19 @@ translate_passive_host_checks=0
 # by enabling this option.
 # Values: 0 = passive checks are HARD, 1 = passive checks are SOFT
 
 passive_host_checks_are_soft=0
 
 
 
 # ORPHANED HOST/SERVICE CHECK OPTIONS
-# These options determine whether or not Nagios will periodically 
+# These options determine whether or not Nagios will periodically
 # check for orphaned host service checks.  Since service checks are
-# not rescheduled until the results of their previous execution 
+# not rescheduled until the results of their previous execution
 # instance are processed, there exists a possibility that some
 # checks may never get rescheduled.  A similar situation exists for
 # host checks, although the exact scheduling details differ a bit
 # from service checks.  Orphaned checks seem to be a rare
 # problem and should not happen under normal circumstances.
 # If you have problems with service checks never getting
 # rescheduled, make sure you have orphaned service checks enabled.
 # Values: 1 = enable checks, 0 = disable checks
@@ -1048,19 +1048,19 @@ host_freshness_check_interval=60
 
 additional_freshness_latency=15
 
 
 
 
 # FLAP DETECTION OPTION
 # This option determines whether or not Nagios will try
-# and detect hosts and services that are "flapping".  
+# and detect hosts and services that are "flapping".
 # Flapping occurs when a host or service changes between
-# states too frequently.  When Nagios detects that a 
+# states too frequently.  When Nagios detects that a
 # host or service is flapping, it will temporarily suppress
 # notifications for that host/service until it stops
 # flapping.  Flap detection is very experimental, so read
 # the HTML documentation before enabling this feature!
 # Values: 1 = enable flap detection
 #         0 = disable flap detection (default)
 
 enable_flap_detection=1
@@ -1094,17 +1094,17 @@ date_format=iso8601
 
 
 # TIMEZONE OFFSET
 # This option is used to override the default timezone that this
 # instance of Nagios runs in.  If not specified, Nagios will use
 # the system configured timezone.
 #
 # NOTE: In order to display the correct timezone in the CGIs, you
-# will also need to alter the Apache directives for the CGI path 
+# will also need to alter the Apache directives for the CGI path
 # to include your timezone.  Example:
 #
 #   <Directory "/usr/local/nagios/sbin/">
 #      SetEnv TZ "Australia/Brisbane"
 #      ...
 #   </Directory>
 
 #use_timezone=US/Mountain
@@ -1131,17 +1131,17 @@ p1_file=/usr/lib/nagios3/p1.pl
 enable_embedded_perl=1
 
 
 
 # EMBEDDED PERL USAGE OPTION
 # This option determines whether or not Nagios will process Perl plugins
 # and scripts with the embedded Perl interpreter if the plugins/scripts
 # do not explicitly indicate whether or not it is okay to do so. Read
-# the HTML documentation on the embedded Perl interpreter for more 
+# the HTML documentation on the embedded Perl interpreter for more
 # information on how this option works.
 
 use_embedded_perl_implicitly=1
 
 
 
 # ILLEGAL OBJECT NAME CHARACTERS
 # This option allows you to specify illegal characters that cannot
@@ -1178,17 +1178,17 @@ illegal_macro_output_chars=`~$&|'"<>
 # group names/descriptions in some fields of various object types.
 # Values: 1 = enable regexp matching, 0 = disable regexp matching
 
 use_regexp_matching=0
 
 
 
 # "TRUE" REGULAR EXPRESSION MATCHING
-# This option controls whether or not "true" regular expression 
+# This option controls whether or not "true" regular expression
 # matching takes place in the object config files.  This option
 # only has an effect if regular expression matching is enabled
 # (see above).  If this option is DISABLED, regular expression
 # matching only occurs if a string contains wildcard characters
 # (* and ?).  If the option is ENABLED, regexp matching occurs
 # all the time (which can be annoying).
 # Values: 1 = enable true matching, 0 = disable true matching
 
@@ -1231,17 +1231,17 @@ daemon_dumps_core=0
 use_large_installation_tweaks=0
 
 
 
 # ENABLE ENVIRONMENT MACROS
 # This option determines whether or not Nagios will make all standard
 # macros available as environment variables when host/service checks
 # and system commands (event handlers, notifications, etc.) are
-# executed.  Enabling this option can cause performance issues in 
+# executed.  Enabling this option can cause performance issues in
 # large installations, as it will consume a bit more memory and (more
 # importantly) consume more CPU.
 # Values: 1 - Enable environment variable macros (default)
 #         0 - Disable environment variable macros
 
 enable_environment_macros=1
 
 
@@ -1272,17 +1272,17 @@ enable_environment_macros=1
 #child_processes_fork_twice=1
 
 
 
 # DEBUG LEVEL
 # This option determines how much (if any) debugging information will
 # be written to the debug file.  OR values together to log multiple
 # types of information.
-# Values: 
+# Values:
 #          -1 = Everything
 #          0 = Nothing
 #	   1 = Functions
 #          2 = Configuration
 #          4 = Process information
 #	   8 = Scheduled events
 #          16 = Host/service checks
 #          32 = Notifications