Skip to content

Commit

Permalink
Doc updates, new option for bare update check
Browse files Browse the repository at this point in the history 
git-svn-id: https://nagios.svn.sourceforge.net/svnroot/nagios/nagioscore/trunk@1226 5f96b256-904b-4d8d-8c98-d829582c6739
  • Loading branch information
Ethan Galstad committed Dec 14, 2008
1 parent fa10d94 commit 07d870f
Show file tree
Hide file tree
Showing 17 changed files with 310 additions and 182 deletions.
6 changes: 5 additions & 1 deletion base/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* CONFIG.C - Configuration input and verification routines for Nagios
*
* Copyright (c) 1999-2008 Ethan Galstad ([email protected])
* Last Modified: 12-04-2008
* Last Modified: 12-14-2008
*
* License:
*
Expand Down Expand Up @@ -123,6 +123,7 @@ extern int auto_reschedule_checks;
extern int additional_freshness_latency;

extern int check_for_updates;
extern int bare_update_check;

extern int use_aggressive_host_checking;
extern unsigned long cached_host_check_horizon;
Expand Down Expand Up @@ -1287,6 +1288,9 @@ int read_main_config_file(char *main_config_file){
else if(!strcmp(variable,"check_for_updates"))
check_for_updates=(atoi(value)>0)?TRUE:FALSE;

else if(!strcmp(variable,"bare_update_check"))
bare_update_check=(atoi(value)>0)?TRUE:FALSE;

/*** AUTH_FILE VARIABLE USED BY EMBEDDED PERL INTERPRETER ***/
else if(!strcmp(variable,"auth_file")){

Expand Down
3 changes: 2 additions & 1 deletion base/nagios.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* Copyright (c) 1999-2007 Ethan Galstad (http://www.nagios.org)
*
* First Written: 01-28-1999 (start of development)
* Last Modified: 12-10-2008
* Last Modified: 12-14-2008
*
* Description:
*
Expand Down Expand Up @@ -131,6 +131,7 @@ int auto_rescheduling_window=DEFAULT_AUTO_RESCHEDULING_WINDOW;
int additional_freshness_latency=DEFAULT_ADDITIONAL_FRESHNESS_LATENCY;

int check_for_updates=DEFAULT_CHECK_FOR_UPDATES;
int bare_update_check=DEFAULT_BARE_UPDATE_CHECK;
time_t last_update_check=0L;
int update_available=FALSE;
char *last_program_version=NULL;
Expand Down
2 changes: 1 addition & 1 deletion base/nagiostats.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* License: GPL
* Copyright (c) 2003-2008 Ethan Galstad ([email protected])
*
* Last Modified: 12-10-2008
* Last Modified: 12-14-2008
*
* License:
*
Expand Down
7 changes: 5 additions & 2 deletions base/utils.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* UTILS.C - Miscellaneous utility functions for Nagios
*
* Copyright (c) 1999-2008 Ethan Galstad ([email protected])
* Last Modified: 12-12-2008
* Last Modified: 12-14-2008
*
* License:
*
Expand Down Expand Up @@ -149,6 +149,7 @@ extern int auto_reschedule_checks;
extern int additional_freshness_latency;

extern int check_for_updates;
extern int bare_update_check;
extern time_t last_update_check;
extern char *last_program_version;
extern int update_available;
Expand Down Expand Up @@ -4427,7 +4428,9 @@ int query_update_api(void){
}

/* generate the query */
asprintf(&api_query,"v=1&product=nagios&tinycheck=1&stableonly=1&version=%s%s",PROGRAM_VERSION,(api_query_opts==NULL)?"":api_query_opts);
asprintf(&api_query,"v=1&product=nagios&tinycheck=1&stableonly=1");
if(bare_update_check==FALSE)
asprintf(&api_query,"&version=%s%s",api_query,PROGRAM_VERSION,(api_query_opts==NULL)?"":api_query_opts);

/* generate the HTTP request */
asprintf(&buf,"POST %s HTTP/1.0\r\n",api_path);
Expand Down
4 changes: 3 additions & 1 deletion configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1309,7 +1309,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
PKG_NAME=nagios
PKG_VERSION="3.0.6"
PKG_HOME_URL="http://www.nagios.org/"
PKG_REL_DATE="12-10-2008"
PKG_REL_DATE="12-14-2008"
ac_aux_dir=
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
Expand Down Expand Up @@ -8209,6 +8209,8 @@ fi
perl subst include/locations.h
perl subst html/config.inc.php
echo ""
echo "Creating sample config files in sample-config/ ..."
Expand Down
4 changes: 3 additions & 1 deletion configure.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ AC_PREFIX_DEFAULT(/usr/local/nagios)
PKG_NAME=nagios
PKG_VERSION="3.0.6"
PKG_HOME_URL="http://www.nagios.org/"
PKG_REL_DATE="12-10-2008"
PKG_REL_DATE="12-14-2008"

dnl Figure out how to invoke "install" and what install options to use.
AC_PROG_INSTALL
Expand Down Expand Up @@ -767,6 +767,8 @@ AC_OUTPUT(Makefile subst pkginfo base/Makefile common/Makefile contrib/Makefile


perl subst include/locations.h
perl subst html/config.inc.php


echo ""
echo "Creating sample config files in sample-config/ ..."
Expand Down
2 changes: 1 addition & 1 deletion html/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ clean:
rm -f stylesheets/*~

distclean: clean
rm -f Makefile side.php
rm -f Makefile config.inc.php side.php

devclean: distclean

Expand Down
11 changes: 0 additions & 11 deletions html/config.inc.php
View file

This file was deleted.

17 changes: 17 additions & 0 deletions html/config.inc.php.in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?php
//
// AUTO


$cfg['cgi_config_file']='@sysconfdir@/cgi.cfg'; // location of the CGI config file
$cfg['main_config_file']='@sysconfdir@/nagios.cfg'; // default location of the main Nagios config file

$cfg['status_file']='@localstatedir@/status.dat'; // default location of Nagios status file
$cfg['state_retention_file']='@localstatedir@/retention.dat'; // default location of Nagios retention file



// utilities
require_once(dirname(__FILE__).'/includes/utils.inc.php');

?>
193 changes: 51 additions & 142 deletions html/docs/configmain.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,148 +58,7 @@ <h1 class="PageTitle">Main Configuration File Options</h1>
<strong><u>Configuration File Variables</u></strong>
</p>

<!--
<a href="#log_file">Log file</a><br>
<a href="#cfg_file">Object configuration file</a><br>
<a href="#cfg_dir">Object configuration directory</a><br>
<a href="#object_cache_file">Object cache file</a><br>
<a href="#precached_object_file">Precached object file</a><br>
<a href="#resource_file">Resource file</a><br>
<a href="#temp_file">Temp file</a><br>
<a href="#temp_path">Temp path</a><br>
<br>
<a href="#status_file">Status file</a><br>
<a href="#status_update_interval">Status file update interval</a><br>
<br>
<a href="#nagios_user">Nagios user</a><br>
<a href="#nagios_group">Nagios group</a><br>
<br>
<a href="#enable_notifications">Notifications option</a><br>
<a href="#execute_service_checks">Service check execution option</a><br>
<a href="#accept_passive_service_checks">Passive service check acceptance option</a><br>
<a href="#execute_host_checks">Host check execution option</a><br>
<a href="#accept_passive_host_checks">Passive host check acceptance option</a><br>
<a href="#enable_event_handlers">Event handler option</a><br>
<br>
<a href="#log_rotation_method">Log rotation method</a><br>
<a href="#log_archive_path">Log archive path</a><br>
<br>
<a href="#check_external_commands">External command check option</a><br>
<a href="#command_check_interval">External command check interval</a><br>
<a href="#command_file">External command file</a><br>
<a href="#external_command_buffer_slots">External command buffer slots option</a><br>
<br>
<a href="#lock_file">Lock file</a><br>
<br>
<a href="#retain_state_information">State retention option</a><br>
<a href="#state_retention_file">State retention file</a><br>
<a href="#retention_update_interval">Automatic state retention update interval</a><br>
<a href="#use_retained_program_state">Use retained program state option</a><br>
<a href="#use_retained_scheduling_info">Use retained scheduling info option</a><br>
<a href="#retained_host_attribute_mask">Retained host/service attribute masks</a><br>
<a href="#retained_process_host_attribute_mask">Retained process attribute masks</a><br>
<a href="#retained_contact_host_attribute_mask">Retained contact attribute masks</a><br>
<br>
<a href="#use_syslog">Syslog logging option</a><br>
<a href="#log_notifications">Notification logging option</a><br>
<a href="#log_service_retries">Service check retry logging option</a><br>
<a href="#log_host_retries">Host retry logging option</a><br>
<a href="#log_event_handlers">Event handler logging option</a><br>
<a href="#log_initial_states">Initial state logging option</a><br>
<a href="#log_external_commands">External command logging option</a><br>
<a href="#log_passive_checks">Passive check logging option</a><br>
<br>
<a href="#global_host_event_handler">Global host event handler</a><br>
<a href="#global_service_event_handler">Global service event handler</a><br>
<br>
<a href="#sleep_time">Inter-check sleep time</a><br>
<a href="#service_inter_check_delay_method">Service inter-check delay method</a><br>
<a href="#max_service_check_spread">Maximum service check spread</a><br>
<a href="#service_interleave_factor">Service interleave factor</a><br>
<a href="#max_concurrent_checks">Maximum concurrent service checks</a><br>
<a href="#check_result_reaper_frequency">Check result reaper frequency</a><br>
<a href="#max_check_result_reaper_time">Maximum check result reaper time</a><br>
<a href="#check_result_path">Check result path</a><br>
<a href="#max_check_result_file_age">Maximum check result file age</a><br>
<a href="#host_inter_check_delay_method">Host inter-check delay method</a><br>
<a href="#max_host_check_spread">Maximum host check spread</a><br>
<a href="#interval_length">Timing interval length</a><br>
<a href="#auto_reschedule_checks">Auto-rescheduling option</a><br>
<a href="#auto_rescheduling_interval">Auto-rescheduling interval</a><br>
<a href="#auto_rescheduling_window">Auto-rescheduling window</a><br>
<br>
<a href="#use_aggressive_host_checking">Aggressive host checking option</a><br>
<a href="#translate_passive_host_checks">Translate passive host checks option</a><br>
<a href="#passive_host_checks_are_soft">Passive host checks are SOFT option</a><br>
<a href="#enable_predictive_host_dependency_checks">Predictive host dependency checks option</a><br>
<a href="#enable_predictive_service_dependency_checks">Predictive service dependency checks option</a><br>
<a href="#cached_host_check_horizon">Cached host check horizon</a><br>
<a href="#cached_service_check_horizon">Cached service check horizon</a><br>
<br>
<a href="#use_large_installation_tweaks">Large installation tweaks option</a><br>
<br>
<a href="#enable_flap_detection">Flap detection option</a><br>
<a href="#low_service_flap_threshold">Low service flap threshold</a><br>
<a href="#high_service_flap_threshold">High service flap threshold</a><br>
<a href="#low_host_flap_threshold">Low host flap threshold</a><br>
<a href="#high_host_flap_threshold">High host flap threshold</a><br>
<br>
<a href="#soft_service_dependencies">Soft service dependencies option</a><br>
<br>
<a href="#service_check_timeout">Service check timeout</a><br>
<a href="#host_check_timeout">Host check timeout</a><br>
<a href="#event_handler_timeout">Event handler timeout</a><br>
<a href="#notification_timeout">Notification timeout</a><br>
<a href="#ocsp_timeout">Obsessive compulsive service processor timeout</a><br>
<a href="#ochp_timeout">Obsessive compulsive host processor timeout</a><br>
<a href="#perfdata_timeout">Performance data processor command timeout</a><br>
<br>
<a href="#obsess_over_services">Obsess over services option</a><br>
<a href="#ocsp_command">Obsessive compulsive service processor command</a><br>
<a href="#obsess_over_hosts">Obsess over hosts option</a><br>
<a href="#ochp_command">Obsessive compulsive host processor command</a><br>
<br>
<a href="#process_performance_data">Performance data processing option</a><br>
<a href="#host_perfdata_command">Host performance data processing command</a><br>
<a href="#service_perfdata_command">Service performance data processing command</a><br>
<a href="#host_perfdata_file">Host performance data file</a><br>
<a href="#service_perfdata_file">Service performance data file</a><br>
<a href="#host_perfdata_file_template">Host performance data file template</a><br>
<a href="#service_perfdata_file_template">Service performance data file template</a><br>
<a href="#host_perfdata_file_mode">Host performance data file mode</a><br>
<a href="#service_perfdata_file_mode">Service performance data file mode</a><br>
<a href="#host_perfdata_file_processing_interval">Host performance data file processing interval</a><br>
<a href="#service_perfdata_file_processing_interval">Service performance data file processing interval</a><br>
<a href="#host_perfdata_file_processing_command">Host performance data file processing command</a><br>
<a href="#service_perfdata_file_processing_command">Service performance data file processing command</a><br>
<br>
<a href="#check_for_orphaned_services">Orphaned service check option</a><br>
<a href="#check_for_orphaned_host">Orphaned host check option</a><br>
<br>
<a href="#check_service_freshness">Service freshness checking option</a><br>
<a href="#service_freshness_check_interval">Service freshness check interval</a><br>
<a href="#check_host_freshness">Host freshness checking option</a><br>
<a href="#host_freshness_check_interval">Host freshness check interval</a><br>
<br>
<a href="#enable_embedded_perl">Embedded Perl interpreter option</a><br>
<a href="#use_embedded_perl_implicitly">Embedded Perl implicit use option</a><br>
<br>
<a href="#date_format">Date format</a><br>
<br>
<a href="#illegal_object_name_chars">Illegal object name characters</a><br>
<a href="#illegal_macro_output_chars">Illegal macro output characters</a><br>
<br>
<a href="#use_regexp_matching">Regular expression matching option</a><br>
<a href="#use_true_regexp_matching">True regular expression matching option</a><br>
<br>
<a href="#admin_email">Administrator email address</a><br>
<a href="#admin_pager">Administrator pager</a><br>
<br>
<a href="#debug_file">Debug file</a><br>
<a href="#debug_level">Debug level</a><br>
<a href="#debug_verbosity">Debug verbosity</a><br>
<a href="#max_debug_file_size">Maximum debug file size option</a><br>
//-->


<p>
Below you will find descriptions of each main Nagios configuration file option...
Expand Down Expand Up @@ -859,6 +718,56 @@ <h1 class="PageTitle">Main Configuration File Options</h1>
</p>


<a name="check_for_updates"></a>
<table border="0" width="100%" class="Default">
<tr>
<td bgcolor="#cbcbcb"><strong>Update Checks</strong></td>
</tr>
</table>
<br>


<table border="0" class="Default">
<tr>
<td>Format:</td>
<td><strong>check_for_updates=&lt;0/1&gt;</strong></td>
</tr>
<tr>
<td>Example:</td>
<td><font color="red"><strong>check_for_updates=1</strong></font></td>
</tr>
</table>

<p>
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 with our privacy policy - see <a href="http://api.nagios.org">http://api.nagios.org</a> for details.
</p>


<a name="bare_update_checks"></a>
<table border="0" width="100%" class="Default">
<tr>
<td bgcolor="#cbcbcb"><strong>Bare Update Checks</strong></td>
</tr>
</table>
<br>


<table border="0" class="Default">
<tr>
<td>Format:</td>
<td><strong>bare_update_checks=&lt;0/1&gt;</strong></td>
</tr>
<tr>
<td>Example:</td>
<td><font color="red"><strong>bare_update_checks</strong></font></td>
</tr>
</table>

<p>
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 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 Nagios. Enable this option if you do not wish for this information to be sent.
</p>


<a name="lock_file"></a>
<table border="0" width="100%" class="Default">
<tr>
Expand Down
10 changes: 9 additions & 1 deletion html/docs/whatsnew.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,15 @@ <h1 class="PageTitle">What's New in Nagios 3</h1>
<ul>
<li>The DEBUGx compile options available in the configure script for have been removed.</li>
<li>Debugging information can now be written to a separate debug file, which is automatically rotated when it reaches a user-defined size. This should make debugging problems much easier, as you don't need to recompiled Nagios. Full support for writing debugging information to file is being added during the alpha development phase, so it may not be complete when you try it.</li>
<li>Variables that affect the debug log in <a href="configmain.html#debug_file">debug_file</a>, <a href="configmain.html#debug_level">debug_level</a>, <a href="configmain.html#debug_verbosity">debug_verbosity</a>, and <a href="configmain.html#max_debug_file_size">max_debug_file_size</a>.</li>
<li>Variables that affect the debug log are <a href="configmain.html#debug_file">debug_file</a>, <a href="configmain.html#debug_level">debug_level</a>, <a href="configmain.html#debug_verbosity">debug_verbosity</a>, and <a href="configmain.html#max_debug_file_size">max_debug_file_size</a>.</li>
</ul>
</li>
<br>

<li><b>Update Checks</b>:<br>
<ul>
<li>Nagios will now check approximately once a day to see if a new version is available. This is useful to keep on top of security patches and new releases. Update notices will appear in the web interface.</li>
<li>Variables that affect the update check are <a href="configmain.html#check_for_updates">check_for_updates</a> and <a href="configmain.html#base_update_check">bare_update_check</a>.</li>
</ul>
</li>
<br>
Expand Down
Loading

0 comments on commit 07d870f

Please sign in to comment.