From 3121516d271a4f7fde7a25785d9da80e69600e66 Mon Sep 17 00:00:00 2001 From: "Z. Liu" Date: Fri, 6 Jan 2017 16:46:19 +0800 Subject: [PATCH 001/100] this fix make url_encode can be called twice --- cgi/cgiutils.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cgi/cgiutils.c b/cgi/cgiutils.c index a47d54ba3..d6f1b9985 100644 --- a/cgi/cgiutils.c +++ b/cgi/cgiutils.c @@ -1052,7 +1052,7 @@ const char *url_encode(const char *input) { return str; len = (int)strlen(input); - output_len = (int)sizeof(encoded_url_string[0]); + output_len = (int)sizeof(encoded_url_string[i]); str[0] = '\x0'; @@ -1087,7 +1087,8 @@ const char *url_encode(const char *input) { } } - str[sizeof(encoded_url_string[0]) - 1] = '\x0'; + str[sizeof(encoded_url_string[i]) - 1] = '\x0'; + i = !i; return str; } From 071e0ec2cdcd9930d298ac8e072f398062345330 Mon Sep 17 00:00:00 2001 From: Kai Kunstmann Date: Mon, 9 Jan 2017 16:18:40 +0100 Subject: [PATCH 002/100] Vent command pipe before remove to avoid deadlocks Removing a stalled command file, while there are processes trying/waiting to write into it, will deadlock those processes in a blocking open() system call. To allow such processes to die on a broken pipe, the pipe must be opened for reading without actually reading from it, which is what dd does here. To avoid a chicken-egg problem, the pipe is renamed beforehand. In order for the dd to not deadlock when there is no writing process, it is executed in the background in a subshell together with an empty echo to have at least one writing process. see http://unix.stackexchange.com/questions/335406/opening-named-pipe-blocks-forever-if-pipe-is-deleted-without-being-connected --- daemon-init.in | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/daemon-init.in b/daemon-init.in index f468df924..af1498c5f 100644 --- a/daemon-init.in +++ b/daemon-init.in @@ -158,6 +158,24 @@ pid_nagios () NagiosPID=`head -n 1 $NagiosRunFile` } +remove_commandfile () +{ + # Removing a stalled command file, while there are processes trying/waiting to write into it, + # will deadlock those processes in a blocking open() system call. To allow such processes to + # die on a broken pipe, the pipe must be opened for reading without actually reading from it, + # which is what dd does here. To avoid a chicken-egg problem, the pipe is renamed beforehand. + # In order for the dd to not deadlock when there is no writing process, it is executed in the + # background in a subshell together with an empty echo to have at least one writing process. + + # see http://unix.stackexchange.com/questions/335406/opening-named-pipe-blocks-forever-if-pipe-is-deleted-without-being-connected + + if [ -p $NagiosCommandFile ]; then + mv -f $NagiosCommandFile $NagiosCommandFile~ + (dd if=$NagiosCommandFile~ count=0 2>/dev/null & echo -n "" >$NagiosCommandFile~) + fi + + rm -f $NagiosCommandFile $NagiosCommandFile~ +} # Check that nagios exists. @@ -192,7 +210,7 @@ case "$1" in fi touch $NagiosVarDir/nagios.log $NagiosRetentionFile - rm -f $NagiosCommandFile + remove_commandfile touch $NagiosRunFile chown -h $NagiosUser:$NagiosGroup $NagiosRunFile $NagiosVarDir/nagios.log $NagiosRetentionFile $NagiosBin -d $NagiosCfgFile @@ -229,7 +247,8 @@ case "$1" in echo ' done.' fi - rm -f $NagiosStatusFile $NagiosRunFile $NagiosLockDir/$NagiosLockFile $NagiosCommandFile + remove_commandfile + rm -f $NagiosStatusFile $NagiosRunFile $NagiosLockDir/$NagiosLockFile ;; status) From e03e4fd470fbc8d4304d860d7b3b523c5d78373d Mon Sep 17 00:00:00 2001 From: "John C. Frickson" Date: Thu, 2 Mar 2017 10:24:24 -0600 Subject: [PATCH 003/100] very 15sec /var/log/messages is flooded with "nagios: set_environment_var" Fix for issue #337 My apologies -- left some debugging code in. --- Changelog | 6 ++++++ base/utils.c | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Changelog b/Changelog index 17d4c2bb3..1e9c9f41c 100644 --- a/Changelog +++ b/Changelog @@ -2,6 +2,12 @@ Nagios Core 4 Change Log ######################## +x.x.x - xxxx-xx-xx +------------------ +FIXED +* Every 15sec /var/log/messages is flooded with "nagios: set_environment_var" (John Frickson) + + 4.3.1 - 2017-02-23 ------------------ FIXES diff --git a/base/utils.c b/base/utils.c index 733fdef23..19e20c701 100644 --- a/base/utils.c +++ b/base/utils.c @@ -872,9 +872,6 @@ int set_environment_var(char *name, char *value, int set) { /* set the environment variable */ if(set == TRUE) { - log_debug_info(DEBUGL_EVENTS, 0, "set_environment_var '%s'='%s'\n", name, value); - syslog(LOG_DAEMON|LOG_INFO, "set_environment_var '%s'='%s'\n", name, value); - #ifdef HAVE_SETENV setenv(name, (value == NULL) ? "" : value, 1); #else From b6ba2f91d67f7d608d438c5aae9ef64ad0b5d501 Mon Sep 17 00:00:00 2001 From: "John C. Frickson" Date: Fri, 3 Mar 2017 10:02:02 -0600 Subject: [PATCH 004/100] Changed release date to ISO format (yyyy-mm-dd) --- Changelog | 1 + update-version | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Changelog b/Changelog index 1e9c9f41c..cafbb59a6 100644 --- a/Changelog +++ b/Changelog @@ -6,6 +6,7 @@ x.x.x - xxxx-xx-xx ------------------ FIXED * Every 15sec /var/log/messages is flooded with "nagios: set_environment_var" (John Frickson) +* Changed release date to ISO format (yyyy-mm-dd) (John Frickson) 4.3.1 - 2017-02-23 diff --git a/update-version b/update-version index 17dabbcb6..b61517911 100755 --- a/update-version +++ b/update-version @@ -3,11 +3,11 @@ # Get date (two formats) if [ -n "$2" ]; then LONGDATE=`date -d "$2" "+%B %d, %Y"` - SHORTDATE=`date -d "$2" "+%m-%d-%Y"` + SHORTDATE=`date -d "$2" "+%Y-%m-%d"` YEAR=`date -d "$2" "+%Y"` else LONGDATE=`date "+%B %d, %Y"` - SHORTDATE=`date "+%m-%d-%Y"` + SHORTDATE=`date "+%Y-%m-%d"` YEAR=`date "+%Y"` fi @@ -15,7 +15,7 @@ fi CURRENTVERSION=4.3.1 # Last date -LASTDATE=02-23-2017 +LASTDATE=2017-02-23 if [ "x$1" = "x" ] then From f61ed03682ad9be213b2e30d69c9cb5297802e11 Mon Sep 17 00:00:00 2001 From: "John C. Frickson" Date: Thu, 9 Mar 2017 16:06:17 -0600 Subject: [PATCH 005/100] `make all` fails if unzip is not installed Fix for issue #58 --- Changelog | 1 + configure | 46 ++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 6 ++++++ 3 files changed, 53 insertions(+) diff --git a/Changelog b/Changelog index cafbb59a6..742f636b2 100644 --- a/Changelog +++ b/Changelog @@ -7,6 +7,7 @@ x.x.x - xxxx-xx-xx FIXED * Every 15sec /var/log/messages is flooded with "nagios: set_environment_var" (John Frickson) * Changed release date to ISO format (yyyy-mm-dd) (John Frickson) +* `make all` fails if unzip is not installed (John Frickson) 4.3.1 - 2017-02-23 diff --git a/configure b/configure index 1974f0746..0e2cbb547 100755 --- a/configure +++ b/configure @@ -623,6 +623,7 @@ ac_includes_default="\ enable_option_checking=no ac_subst_vars='LTLIBOBJS LIBOBJS +UNZIP PERL USE_EVENTBROKER INITDIR @@ -5932,6 +5933,51 @@ fi if test -z "$PERL"; then as_fn_error $? "Cannot continue without perl!" "$LINENO" 5 fi + +# Extract the first word of "unzip", so it can be a program name with args. +set dummy unzip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_UNZIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $UNZIP in + [\\/]* | ?:[\\/]*) + ac_cv_path_UNZIP="$UNZIP" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_UNZIP="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +UNZIP=$ac_cv_path_UNZIP +if test -n "$UNZIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNZIP" >&5 +$as_echo "$UNZIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +if test -z "$UNZIP"; then + as_fn_error $? "Cannot continue without unzip!" "$LINENO" 5 +fi + ac_config_files="$ac_config_files Makefile lib/Makefile subst pkginfo base/Makefile common/Makefile contrib/Makefile cgi/Makefile html/Makefile module/Makefile worker/Makefile worker/ping/Makefile xdata/Makefile daemon-init t/Makefile t-tap/Makefile" diff --git a/configure.ac b/configure.ac index 6335d1a87..06f87ab2d 100644 --- a/configure.ac +++ b/configure.ac @@ -788,6 +788,12 @@ AC_PATH_PROG(PERL,perl) if test -z "$PERL"; then AC_MSG_ERROR([Cannot continue without perl!]) fi + +AC_PATH_PROG(UNZIP,unzip) +if test -z "$UNZIP"; then + AC_MSG_ERROR([Cannot continue without unzip!]) +fi + AC_OUTPUT(Makefile lib/Makefile subst pkginfo base/Makefile common/Makefile contrib/Makefile cgi/Makefile html/Makefile module/Makefile worker/Makefile worker/ping/Makefile xdata/Makefile daemon-init t/Makefile t-tap/Makefile) From 5910ccb882a28a90b9f0d2559673d1f8dbef1517 Mon Sep 17 00:00:00 2001 From: "John C. Frickson" Date: Tue, 14 Mar 2017 10:11:08 -0500 Subject: [PATCH 006/100] Quick Search no longer allows search by Alias Fix for issue #335 --- Changelog | 1 + cgi/status.c | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Changelog b/Changelog index 742f636b2..347e88c19 100644 --- a/Changelog +++ b/Changelog @@ -8,6 +8,7 @@ FIXED * Every 15sec /var/log/messages is flooded with "nagios: set_environment_var" (John Frickson) * Changed release date to ISO format (yyyy-mm-dd) (John Frickson) * `make all` fails if unzip is not installed (John Frickson) +* Quick Search no longer allows search by Alias (John Frickson) 4.3.1 - 2017-02-23 diff --git a/cgi/status.c b/cgi/status.c index e0cab72b1..b7928358d 100644 --- a/cgi/status.c +++ b/cgi/status.c @@ -861,7 +861,11 @@ void show_service_status_totals(void) { count_service = 1; else if (!strcmp(host_name, temp_host->address)) count_service = 1; - else if(host_filter != NULL && 0 == regexec(&preg_hostname, temp_host->address, 0, NULL, 0)) + else if(host_filter != NULL && navbar_search_addresses == TRUE && 0 == regexec(&preg_hostname, temp_host->address, 0, NULL, 0)) + count_service = 1; + else if (!strcmp(host_name, temp_host->alias)) + count_service = 1; + else if(host_filter != NULL && navbar_search_aliases == TRUE && 0 == regexec(&preg_hostname, temp_host->alias, 0, NULL, 0)) count_service = 1; } else if(display_type == DISPLAY_SERVICEGROUPS) { @@ -1105,7 +1109,11 @@ void show_host_status_totals(void) { count_host = 1; else if (!strcmp(host_name, temp_host->address)) count_host = 1; - else if(host_filter != NULL && 0 == regexec(&preg_hostname, temp_host->address, 0, NULL, 0)) + else if(host_filter != NULL && navbar_search_addresses == TRUE && 0 == regexec(&preg_hostname, temp_host->address, 0, NULL, 0)) + count_host = 1; + else if (!strcmp(host_name, temp_host->alias)) + count_host = 1; + else if(host_filter != NULL && navbar_search_aliases == TRUE && 0 == regexec(&preg_hostname, temp_host->alias, 0, NULL, 0)) count_host = 1; } else if(display_type == DISPLAY_SERVICEGROUPS) { @@ -2185,7 +2193,9 @@ void show_host_detail(void) { if (show_all_hosts == FALSE) { if(host_filter != NULL) { - if (regexec(&preg_hostname, temp_host->name, 0, NULL, 0) != 0 && regexec(&preg_hostname, temp_host->address, 0, NULL, 0) != 0) + if (regexec(&preg_hostname, temp_host->name, 0, NULL, 0) != 0 + && regexec(&preg_hostname, temp_host->address, 0, NULL, 0) != 0 + && regexec(&preg_hostname, temp_host->alias, 0, NULL, 0) != 0) continue; } else if (strcmp(host_name, temp_host->name)) continue; From a261e0dc9e2d7296f34c33f828a9c0103f940eea Mon Sep 17 00:00:00 2001 From: "John C. Frickson" Date: Tue, 14 Mar 2017 12:34:16 -0500 Subject: [PATCH 007/100] flexible downtime on a service immediately turns off notifications Fix for issue #346 --- Changelog | 1 + base/notifications.c | 5 ++-- common/downtime.c | 70 ++++++++++++++++++++++++++++++++++++++++++++ include/downtime.h | 2 ++ 4 files changed, 76 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 347e88c19..27e0f8270 100644 --- a/Changelog +++ b/Changelog @@ -9,6 +9,7 @@ FIXED * Changed release date to ISO format (yyyy-mm-dd) (John Frickson) * `make all` fails if unzip is not installed (John Frickson) * Quick Search no longer allows search by Alias (John Frickson) +* flexible downtime on a service immediately turns off notifications (John Frickson) 4.3.1 - 2017-02-23 diff --git a/base/notifications.c b/base/notifications.c index e90ab2631..c7b070469 100644 --- a/base/notifications.c +++ b/base/notifications.c @@ -29,6 +29,7 @@ #include "../include/broker.h" #include "../include/neberrors.h" #include "../include/workers.h" +#include "../include/downtime.h" /*** silly helpers ****/ static contact *find_contact_by_name_or_alias(const char *name) @@ -598,13 +599,13 @@ int check_service_notification_viability(service *svc, int type, int options) { } /* if this service is currently in a flex downtime period, don't send the notification */ - if(svc->pending_flex_downtime > 0) { + if(svc->pending_flex_downtime > 0 && is_service_in_pending_flex_downtime(svc) == TRUE) { log_debug_info(DEBUGL_NOTIFICATIONS, 1, "This service is starting a flex downtime, so we won't send notifications.\n"); return ERROR; } /* if this host is currently in a flex downtime period, don't send the notification */ - if(temp_host->pending_flex_downtime > 0) { + if(temp_host->pending_flex_downtime > 0 && is_host_in_pending_flex_downtime(temp_host) == TRUE) { log_debug_info(DEBUGL_NOTIFICATIONS, 1, "The host this service is associated with is starting a flex downtime, so we won't send notifications.\n"); return ERROR; } diff --git a/common/downtime.c b/common/downtime.c index d0990f373..56f5079b0 100644 --- a/common/downtime.c +++ b/common/downtime.c @@ -849,6 +849,76 @@ int check_pending_flex_service_downtime(service *svc) { return OK; } +int is_host_in_pending_flex_downtime(struct host *temp_host) +{ + scheduled_downtime *temp_downtime = NULL; + time_t current_time = 0L; + + log_debug_info(DEBUGL_FUNCTIONS, 0, "is_host_in_pending_flex_downtime()\n"); + + if (temp_host == NULL) + return FALSE; + + time(¤t_time); + + /* check all downtime entries */ + for (temp_downtime = scheduled_downtime_list; temp_downtime != NULL; temp_downtime = temp_downtime->next) { + if(temp_downtime->type != HOST_DOWNTIME) + continue; + if(temp_downtime->fixed == TRUE) + continue; + if(temp_downtime->is_in_effect == TRUE) + continue; + /* triggered downtime entries should be ignored here */ + if(temp_downtime->triggered_by != 0) + continue; + + /* this entry matches our host! */ + if(find_host(temp_downtime->host_name) == temp_host) { + /* if the time boundaries are okay, start this scheduled downtime */ + if(temp_downtime->start_time <= current_time && current_time <= temp_downtime->end_time) + return TRUE; + } + } + + return FALSE; +} + +int is_service_in_pending_flex_downtime(struct service *temp_service) +{ + scheduled_downtime *temp_downtime = NULL; + time_t current_time = 0L; + + log_debug_info(DEBUGL_FUNCTIONS, 0, "is_service_in_pending_flex_downtime()\n"); + + if(temp_service == NULL) + return FALSE; + + time(¤t_time); + + /* check all downtime entries */ + for(temp_downtime = scheduled_downtime_list; temp_downtime != NULL; temp_downtime = temp_downtime->next) { + if(temp_downtime->type != SERVICE_DOWNTIME) + continue; + if(temp_downtime->fixed == TRUE) + continue; + if(temp_downtime->is_in_effect == TRUE) + continue; + /* triggered downtime entries should be ignored here */ + if(temp_downtime->triggered_by != 0) + continue; + + /* this entry matches our service! */ + if(find_service(temp_downtime->host_name, temp_downtime->service_description) == temp_service) { + /* if the time boundaries are okay, start this scheduled downtime */ + if(temp_downtime->start_time <= current_time && current_time <= temp_downtime->end_time) + return TRUE; + } + } + + return FALSE; +} + /* checks for (and removes) expired downtime entries */ int check_for_expired_downtime(void) { diff --git a/include/downtime.h b/include/downtime.h index 106549600..4bee3d217 100644 --- a/include/downtime.h +++ b/include/downtime.h @@ -85,6 +85,8 @@ int handle_scheduled_downtime_by_id(unsigned long); int check_pending_flex_host_downtime(struct host *); int check_pending_flex_service_downtime(struct service *); +int is_host_in_pending_flex_downtime(struct host *); +int is_service_in_pending_flex_downtime(struct service *); int check_for_expired_downtime(void); #endif From 02ee521677b2b48d3a6e4b290907d45e578e1b5f Mon Sep 17 00:00:00 2001 From: Parth Laxmikant Kolekar Date: Wed, 15 Mar 2017 14:58:46 +0530 Subject: [PATCH 008/100] Update timeperiods.cfg.in your * --- sample-config/template-object/timeperiods.cfg.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sample-config/template-object/timeperiods.cfg.in b/sample-config/template-object/timeperiods.cfg.in index a8682ef36..8b6eddd63 100644 --- a/sample-config/template-object/timeperiods.cfg.in +++ b/sample-config/template-object/timeperiods.cfg.in @@ -59,7 +59,7 @@ define timeperiod{ # Some U.S. holidays # Note: The timeranges for each holiday are meant to *exclude* the holidays from being # treated as a valid time for notifications, etc. You probably don't want your pager -# going off on New Year's. Although you're employer might... :-) +# going off on New Year's. Although your employer might... :-) define timeperiod{ name us-holidays timeperiod_name us-holidays From ebf13d81a89a7265652cd24367c52c5e452d5d1b Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 03:38:03 +0000 Subject: [PATCH 009/100] spelling: acknowledgement --- base/notifications.c | 4 ++-- cgi/archivejson.c | 4 ++-- cgi/archiveutils.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/base/notifications.c b/base/notifications.c index c7b070469..274a18204 100644 --- a/base/notifications.c +++ b/base/notifications.c @@ -440,7 +440,7 @@ int check_service_notification_viability(service *svc, int type, int options) { /****************************************/ - /*** SPECIAL CASE FOR ACKNOWLEGEMENTS ***/ + /*** SPECIAL CASE FOR ACKNOWLEDGEMENTS ***/ /****************************************/ /* acknowledgements only have to pass three general filters, although they have another test of their own... */ @@ -1362,7 +1362,7 @@ int check_host_notification_viability(host *hst, int type, int options) { /****************************************/ - /*** SPECIAL CASE FOR ACKNOWLEGEMENTS ***/ + /*** SPECIAL CASE FOR ACKNOWLEDGEMENTS ***/ /****************************************/ /* acknowledgements only have to pass three general filters, although they have another test of their own... */ diff --git a/cgi/archivejson.c b/cgi/archivejson.c index 3fd44efd8..253a8da6c 100644 --- a/cgi/archivejson.c +++ b/cgi/archivejson.c @@ -174,7 +174,7 @@ const string_value_mapping valid_host_notification_types[] = { { "hostcustom", AU_NOTIFICATION_HOST_CUSTOM, "Host Custom" }, { "hostack", AU_NOTIFICATION_HOST_ACK, - "Host Acknowlegement" }, + "Host Acknowledgement" }, { "hostflapstart", AU_NOTIFICATION_HOST_FLAPPING_START, "Host Flapping Start" }, { "hostflapstop", AU_NOTIFICATION_HOST_FLAPPING_STOP, @@ -194,7 +194,7 @@ const string_value_mapping valid_service_notification_types[] = { { "custom", AU_NOTIFICATION_SERVICE_CUSTOM, "Service Custom" }, { "serviceack", AU_NOTIFICATION_SERVICE_ACK, - "Service Acknowlegement" }, + "Service Acknowledgement" }, { "serviceflapstart", AU_NOTIFICATION_SERVICE_FLAPPING_START, "Service Flapping Start" }, { "serviceflapstop", AU_NOTIFICATION_SERVICE_FLAPPING_STOP, diff --git a/cgi/archiveutils.c b/cgi/archiveutils.c index d5444f0c5..b37ffcf7f 100644 --- a/cgi/archiveutils.c +++ b/cgi/archiveutils.c @@ -86,7 +86,7 @@ const string_value_mapping svm_au_notification_types[] = { { "hostcustom", AU_NOTIFICATION_HOST_CUSTOM, "Host Custom" }, { "hostack", AU_NOTIFICATION_HOST_ACK, - "Host Acknowlegement" }, + "Host Acknowledgement" }, { "hostflapstart", AU_NOTIFICATION_HOST_FLAPPING_START, "Host Flapping Start" }, { "hostflapstop", AU_NOTIFICATION_HOST_FLAPPING_STOP, @@ -100,7 +100,7 @@ const string_value_mapping svm_au_notification_types[] = { { "custom", AU_NOTIFICATION_SERVICE_CUSTOM, "Service Custom" }, { "serviceack", AU_NOTIFICATION_SERVICE_ACK, - "Service Acknowlegement" }, + "Service Acknowledgement" }, { "serviceflapstart", AU_NOTIFICATION_SERVICE_FLAPPING_START, "Service Flapping Start" }, { "serviceflapstop", AU_NOTIFICATION_SERVICE_FLAPPING_STOP, From 2b0ea940fd204a9783990dd51004310e9875b53b Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 03:39:31 +0000 Subject: [PATCH 010/100] spelling: actual --- lib/pqueue.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pqueue.h b/lib/pqueue.h index c017762bb..59b4fc405 100644 --- a/lib/pqueue.h +++ b/lib/pqueue.h @@ -62,7 +62,7 @@ typedef struct pqueue_t pqueue_set_pri_f setpri; /**< callback to set priority of a node */ pqueue_get_pos_f getpos; /**< callback to get position of a node */ pqueue_set_pos_f setpos; /**< callback to set position of a node */ - void **d; /**< The actualy queue in binary heap form */ + void **d; /**< The actual queue in binary heap form */ } pqueue_t; From e4c117ae25e1d555c153b1c2df226da533f469a2 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 03:39:53 +0000 Subject: [PATCH 011/100] spelling: added --- lib/snprintf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/snprintf.c b/lib/snprintf.c index d7018ebed..e89709041 100644 --- a/lib/snprintf.c +++ b/lib/snprintf.c @@ -77,7 +77,7 @@ * Fix incorrect zpadlen handling in fmtfp. * Thanks to Ollie Oldham for spotting it. * few mods to make it easier to compile the tests. - * addedd the "Ollie" test to the floating point ones. + * added the "Ollie" test to the floating point ones. * * Martin Pool (mbp@samba.org) April 2003 * Remove NO_CONFIG_H so that the test case can be built within a source From 77834b06f33ea9c664df47f06282334096841a94 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 03:46:01 +0000 Subject: [PATCH 012/100] spelling: argument --- lib/runcmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/runcmd.c b/lib/runcmd.c index ffa64e2a8..93f1dd106 100644 --- a/lib/runcmd.c +++ b/lib/runcmd.c @@ -355,7 +355,7 @@ int runcmd_open(const char *cmd, int *pfd, int *pfderr, char **env, cmd2strv_errors = runcmd_cmd2strv(cmd, &argc, argv); if (cmd2strv_errors == RUNCMD_EALLOC) { - /* We couldn't allocate the parsed arument array. */ + /* We couldn't allocate the parsed argument array. */ free(argv); return RUNCMD_EALLOC; } From 57f5a6c8857568f542c3a0185b9c1c7076c6a82e Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 03:45:52 +0000 Subject: [PATCH 013/100] spelling: artificially --- html/js/map-directive.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/js/map-directive.js b/html/js/map-directive.js index f743b9a19..2c2fb1a3d 100644 --- a/html/js/map-directive.js +++ b/html/js/map-directive.js @@ -2131,7 +2131,7 @@ angular.module("mapApp") return d.id || (d.id = ++$scope.nodeID); }); - // Traverse the data, artifically setting the layout + // Traverse the data, artificially setting the layout //for collapsed children updateToggledNodes($scope.hostTree, updateDescendantsOnCollapse); From 6a89a9c649edf8af52a8031e4ba4292e7c37545f Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 03:47:56 +0000 Subject: [PATCH 014/100] spelling: availability --- cgi/archivejson.c | 2 +- html/js/trends-graph.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cgi/archivejson.c b/cgi/archivejson.c index 253a8da6c..935f62ef6 100644 --- a/cgi/archivejson.c +++ b/cgi/archivejson.c @@ -405,7 +405,7 @@ option_help archive_json_help[] = { { "alertcount", "alertlist", "notificationcount", "notificationlist", "statechangelist", "availability", NULL }, "hostname", - "Description for the service requested. For availibility reports, " + "Description for the service requested. For availability reports, " "if the availability object type is services and the " "servicedescription is not specified, the report will be generated " "either for all services or for all services on the specified host, " diff --git a/html/js/trends-graph.js b/html/js/trends-graph.js index e11c4978e..ad467fc3d 100644 --- a/html/js/trends-graph.js +++ b/html/js/trends-graph.js @@ -286,7 +286,7 @@ angular.module("trendsApp") d3.select("g#groupXAxis").select("path").remove(); }; - // Handle a succesful availabilty response + // Handle a succesful availability response var onAvailabilitySuccess = function(json) { // Local layout variables From 03c6197f9526bbf4f828bbcfff9a666d41285e07 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 03:50:19 +0000 Subject: [PATCH 015/100] spelling: button --- Changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 27e0f8270..3526a6306 100644 --- a/Changelog +++ b/Changelog @@ -230,7 +230,7 @@ FIXES * Fixes to make all/html target tolerant of being run multiple times (Eric Stanley) * For user-supplied maps, converted node group to have transform (Eric Stanley) * Fixed issue transitioning from circular markup map to other maps (Eric Stanley) -* Fix displayForm to trigger on the buttom press (Scott Wilkerson) +* Fix displayForm to trigger on the button press (Scott Wilkerson) * Fix fo getBBox crash on Firefox (Eric Stanley) * Fixed map now resets zoom when form apply()'d (Eric Stanley) * Fixed so close box on dialogs actually closes dialog (Eric Stanley) From 0102abf356a26b956c088fcad57494913512be49 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 03:51:03 +0000 Subject: [PATCH 016/100] spelling: cellpadding --- cgi/tac.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cgi/tac.c b/cgi/tac.c index d0eaf6eaf..8f04c20b8 100644 --- a/cgi/tac.c +++ b/cgi/tac.c @@ -879,7 +879,7 @@ void display_tac_overview(void) { /* right column */ printf("\n"); - printf("\n"); + printf("
\n"); printf("\n"); @@ -892,7 +892,7 @@ void display_tac_overview(void) { printf("
\n"); - printf("\n"); + printf("
\n"); printf("\n"); printf("\n", EXTINFO_CGI, DISPLAY_PERFORMANCE); printf("\n"); @@ -900,10 +900,10 @@ void display_tac_overview(void) { printf("\n"); printf("
 Monitoring Performance
\n"); - printf("\n"); + printf("
\n"); printf("\n"); printf("
\n"); - printf("\n"); + printf("
\n"); printf("\n"); printf("", EXTINFO_CGI, DISPLAY_PERFORMANCE); printf("\n", EXTINFO_CGI, DISPLAY_PERFORMANCE, min_service_execution_time, max_service_execution_time, average_service_execution_time); @@ -1029,11 +1029,11 @@ void display_tac_overview(void) { strncpy(service_health_image, THERM_OK_IMAGE, sizeof(service_health_image)); service_health_image[sizeof(service_health_image) - 1] = '\x0'; - printf("
Service Check Execution Time:%.2f / %.2f / %.3f sec
\n"); + printf("
\n"); printf("\n"); printf("
\n"); - printf("\n"); + printf("
\n"); printf("\n"); printf("\n"); printf("\n"); @@ -1041,10 +1041,10 @@ void display_tac_overview(void) { printf("\n"); printf("
 Network Health
\n"); - printf("\n"); + printf("
\n"); printf("\n"); printf("
\n"); - printf("\n"); + printf("
\n"); printf("\n"); printf(""); printf("\n", url_images_path, host_health_image, (percent_host_health < 5.0) ? 5 : (int)percent_host_health, percent_host_health, percent_host_health); From 22931ae34bbbcf79c14e0b673ba9a046dec8e125 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 03:51:26 +0000 Subject: [PATCH 017/100] spelling: checks --- base/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/utils.c b/base/utils.c index 19e20c701..49a0c3261 100644 --- a/base/utils.c +++ b/base/utils.c @@ -3080,7 +3080,7 @@ int check_for_nagios_updates(int force, int reschedule) { if(update_uid == 0L) update_uid = current_time; - /* update chekcs are disabled */ + /* update checks are disabled */ if(check_for_updates == FALSE) do_check = FALSE; /* we checked for updates recently, so don't do it again */ From 011643e54c27e4448025926211ef67258db5742c Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 03:51:59 +0000 Subject: [PATCH 018/100] spelling: children --- html/js/map-directive.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/html/js/map-directive.js b/html/js/map-directive.js index 2c2fb1a3d..50ad4ad0b 100644 --- a/html/js/map-directive.js +++ b/html/js/map-directive.js @@ -1060,11 +1060,11 @@ angular.module("mapApp") // Sort the hosts array hosts.sort(); - // First remove any childen of the node that are not + // First remove any children of the node that are not // in the list of hosts if (node.hasOwnProperty("children") && node.children != null) { - node.childen = node.children.filter(function(e) { + node.children = node.children.filter(function(e) { return findElement(hosts, e.hostInfo.name, function(list, index) { return list[index]; @@ -1086,7 +1086,7 @@ angular.module("mapApp") // If the node has no children and the host list // does, create the property and initialize it - if (!node.hasOwnProperty("chlidren") || + if (!node.hasOwnProperty("children") || node.children == null) { node.children = new Array; } From d6e1529efc04f067b329c8792c56f5a932a79ed4 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 03:52:40 +0000 Subject: [PATCH 019/100] spelling: collapsed --- html/js/map-directive.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/js/map-directive.js b/html/js/map-directive.js index 50ad4ad0b..d19b4c454 100644 --- a/html/js/map-directive.js +++ b/html/js/map-directive.js @@ -2921,7 +2921,7 @@ angular.module("mapApp") // Note: reparenting the tree is not implemented // because the map doesn't appear any different // after reparenting. However, reparenting would - // affect what is collapesd/expanded when an + // affect what is collapsed/expanded when an // interior node is click, so it eventually may // make sense. toggleNode(d); From 9edff1ec75bbf015aa8055643868dd800505c138 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 03:52:58 +0000 Subject: [PATCH 020/100] spelling: command --- xdata/xodtemplate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xdata/xodtemplate.c b/xdata/xodtemplate.c index fed7968fa..ed3c9d849 100644 --- a/xdata/xodtemplate.c +++ b/xdata/xodtemplate.c @@ -1062,7 +1062,7 @@ int xodtemplate_begin_object_definition(char *input, int options, int cfgfile, i static const char *xodtemplate_type_name(unsigned int id) { static const char *otype_name[] = { - "NONE", "timeperiod", "commmand", "contact", "contactgroup", + "NONE", "timeperiod", "command", "contact", "contactgroup", "host", "hostgroup", "service", "servicedependency", "serviceescalation", "hostescalation", "hostdependency", "hostextinfo", "serviceextinfo", "servicegroup" From 1dfb09b605fa1ab8f62a037906b30ab55d717a00 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 03:53:33 +0000 Subject: [PATCH 021/100] spelling: compute --- Changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 3526a6306..4ecd645e8 100644 --- a/Changelog +++ b/Changelog @@ -98,7 +98,7 @@ FIXES * Fix permissions for Host Groups reports (status.cgi) (Patrik Halfar) * Service Parents does not appear to be functioning as intended (lev) * Availability report mixes up scheduled and unscheduled warning percentages (Helmut Mikulcik) -* Invalid values for saved_stamp in comput_subject_downtime_times() (John Frickson) +* Invalid values for saved_stamp in compute_subject_downtime_times() (John Frickson) * Remove deprecated "framespacing" (John Frickson) * The nagios tarball contains two identical jquery copies (John Frickson) * extinfo.cgi does not set content-type (most cgi's don't) (John Frickson) From 1781138d9f3c2f2ba17aef50f76b025ce361284a Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 03:55:15 +0000 Subject: [PATCH 022/100] spelling: contain --- docs/workers.dox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/workers.dox b/docs/workers.dox index a1b3ec8ad..82e29de03 100644 --- a/docs/workers.dox +++ b/docs/workers.dox @@ -29,7 +29,7 @@ fairly simple and very easy to debug. The breakdown goes as follows: nul byte ('\0'). @li Each request is separated from the next with a message delimiter sequence made up by a one-byte followed by three nul bytes: "\1\0\0\0". -@li Keys cannot containt equal signs. +@li Keys cannot contain equal signs. underscores and numbers. @li Values cannot contain nul bytes. @li Neither keys nor values can contain the message delimiter. From 9c716b9b32401023d5c1abfe58f4a040b9e461dd Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 03:55:43 +0000 Subject: [PATCH 023/100] spelling: critical --- base/nagiostats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/nagiostats.c b/base/nagiostats.c index b2381f4e7..0617f2d50 100644 --- a/base/nagiostats.c +++ b/base/nagiostats.c @@ -329,7 +329,7 @@ int main(int argc, char **argv) { printf(" NUMSVCWARN number of services WARNING.\n"); printf(" NUMSVCUNKN number of services UNKNOWN.\n"); printf(" NUMSVCCRIT number of services CRITICAL.\n"); - printf(" NUMSVCPROB number of service problems (WARNING, UNKNOWN or CRITIAL).\n"); + printf(" NUMSVCPROB number of service problems (WARNING, UNKNOWN or CRITICAL).\n"); printf(" NUMSVCCHECKED number of services that have been checked since start.\n"); printf(" NUMSVCSCHEDULED number of services that are currently scheduled to be checked.\n"); printf(" NUMSVCFLAPPING number of services that are currently flapping.\n"); From 0bbcfe89e0b9002b8fcc9b14131270f18420d895 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 03:56:31 +0000 Subject: [PATCH 024/100] spelling: current --- html/js/map-directive.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/js/map-directive.js b/html/js/map-directive.js index d19b4c454..25126f59f 100644 --- a/html/js/map-directive.js +++ b/html/js/map-directive.js @@ -1730,7 +1730,7 @@ angular.module("mapApp") }; // Determine how long an object has been in it's - // curret state + // current state var getStateDuration = function(d) { var now = new Date; var duration; From ae21296babcf93da1ea9a2414b9aad39f6a5432e Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 03:58:03 +0000 Subject: [PATCH 025/100] spelling: daemon --- base/nagiostats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/nagiostats.c b/base/nagiostats.c index 0617f2d50..cacf595d0 100644 --- a/base/nagiostats.c +++ b/base/nagiostats.c @@ -318,7 +318,7 @@ int main(int argc, char **argv) { printf(" STATUSFILEAGE string with age of status data file.\n"); printf(" STATUSFILEAGETT string with age of status data file (time_t format).\n"); printf(" NAGIOSVERSION string with Nagios version.\n"); - printf(" NAGIOSPID pid number of Nagios deamon.\n"); + printf(" NAGIOSPID pid number of Nagios daemon.\n"); printf(" NAGIOSVERPID string with Nagios version and PID.\n"); printf(" TOTCMDBUF total number of external command buffer slots available.\n"); printf(" USEDCMDBUF number of external command buffer slots currently in use.\n"); From 608dfacdf713feabab232fc7949956cf5e006204 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 03:58:49 +0000 Subject: [PATCH 026/100] spelling: default --- sample-config/nagios.cfg.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sample-config/nagios.cfg.in b/sample-config/nagios.cfg.in index a497691c6..78ac46f08 100644 --- a/sample-config/nagios.cfg.in +++ b/sample-config/nagios.cfg.in @@ -852,7 +852,7 @@ process_performance_data=0 # performance data files are opened in write ("w") or append ("a") # mode. If you want to use named pipes, you should use the special # pipe ("p") mode which avoid blocking at startup, otherwise you will -# likely want the defult append ("a") mode. +# likely want the default append ("a") mode. #host_perfdata_file_mode=a #service_perfdata_file_mode=a From a82617c6a1432713f765e89369292aaca55e601f Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 03:58:30 +0000 Subject: [PATCH 027/100] spelling: defining --- sample-config/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sample-config/README b/sample-config/README index be16b80c3..eacaa419a 100644 --- a/sample-config/README +++ b/sample-config/README @@ -18,7 +18,7 @@ cgi.cfg - This is a sample CGI config file nagios.cfg - This is a sample main config file -resource.cfg - This is a sample resource config file, used for definining +resource.cfg - This is a sample resource config file, used for defining custom macros, storing sensitive data, etc. httpd.conf - This file contains sample snippets that you'll need to From 721f84b74e723d9384aa6ab68d1fecf1486eaa2b Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 03:58:39 +0000 Subject: [PATCH 028/100] spelling: definitions --- base/nagios.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/nagios.c b/base/nagios.c index ddf0831fb..267870023 100644 --- a/base/nagios.c +++ b/base/nagios.c @@ -463,7 +463,7 @@ int main(int argc, char **argv) { printf("\n***> One or more problems was encountered while processing the config files...\n"); printf("\n"); printf(" Check your configuration file(s) to ensure that they contain valid\n"); - printf(" directives and data defintions. If you are upgrading from a previous\n"); + printf(" directives and data definitions. If you are upgrading from a previous\n"); printf(" version of Nagios, you should be aware that some variables/definitions\n"); printf(" may have been removed or modified in this version. Make sure to read\n"); printf(" the HTML documentation regarding the config files, as well as the\n"); @@ -483,7 +483,7 @@ int main(int argc, char **argv) { printf("\n***> One or more problems was encountered while running the pre-flight check...\n"); printf("\n"); printf(" Check your configuration file(s) to ensure that they contain valid\n"); - printf(" directives and data defintions. If you are upgrading from a previous\n"); + printf(" directives and data definitions. If you are upgrading from a previous\n"); printf(" version of Nagios, you should be aware that some variables/definitions\n"); printf(" may have been removed or modified in this version. Make sure to read\n"); printf(" the HTML documentation regarding the config files, as well as the\n"); From b5ef6d8003afc3fb9b2dc05b131c7770a90a68fc Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 03:58:17 +0000 Subject: [PATCH 029/100] spelling: detection --- cgi/objectjson.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cgi/objectjson.c b/cgi/objectjson.c index b94b61836..944dc0955 100644 --- a/cgi/objectjson.c +++ b/cgi/objectjson.c @@ -3750,11 +3750,11 @@ void json_object_service_details(json_object *json_details, #ifdef JSON_NAGIOS_4X #if 0 if( CORE3_COMPATIBLE) { - json_object_append_boolean(json_details, "flap_dectetion_on_ok", + json_object_append_boolean(json_details, "flap_detection_on_ok", flag_isset(temp_service->flap_detection_options, OPT_OK)); - json_object_append_boolean(json_details, "flap_dectetion_on_warning", + json_object_append_boolean(json_details, "flap_detection_on_warning", flag_isset(temp_service->flap_detection_options, OPT_WARNING)); - json_object_append_boolean(json_details, "flap_dectetion_on_unknown", + json_object_append_boolean(json_details, "flap_detection_on_unknown", flag_isset(temp_service->flap_detection_options, OPT_UNKNOWN)); json_object_append_boolean(json_details, "flap_detection_on_critical", flag_isset(temp_service->flap_detection_options, OPT_CRITICAL)); @@ -3767,11 +3767,11 @@ void json_object_service_details(json_object *json_details, } #endif #else - json_object_append_boolean(json_details, "flap_dectetion_on_ok", + json_object_append_boolean(json_details, "flap_detection_on_ok", temp_service->flap_detection_on_ok); - json_object_append_boolean(json_details, "flap_dectetion_on_warning", + json_object_append_boolean(json_details, "flap_detection_on_warning", temp_service->flap_detection_on_warning); - json_object_append_boolean(json_details, "flap_dectetion_on_unknown", + json_object_append_boolean(json_details, "flap_detection_on_unknown", temp_service->flap_detection_on_unknown); json_object_append_boolean(json_details, "flap_detection_on_critical", temp_service->flap_detection_on_critical); From 57d70ff2c34290681f845391890cd9e081419b58 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:02:22 +0000 Subject: [PATCH 030/100] spelling: determine --- cgi/archivejson.c | 2 +- html/js/map-directive.js | 2 +- html/js/trends-graph.js | 2 +- sample-config/nagios.cfg.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cgi/archivejson.c b/cgi/archivejson.c index 935f62ef6..7956e8469 100644 --- a/cgi/archivejson.c +++ b/cgi/archivejson.c @@ -3525,7 +3525,7 @@ printf( " %lu to %lu (%lus): %s/%s/%s\n", start_time, end_time, state_duration = calculate_window_duration(start_time, end_time, report_timeperiod); - /* Deterime the appropriate state */ + /* Determine the appropriate state */ switch(last_nagios_state) { case AU_STATE_PROGRAM_START: switch(last_downtime_state) { diff --git a/html/js/map-directive.js b/html/js/map-directive.js index 25126f59f..cd223d65a 100644 --- a/html/js/map-directive.js +++ b/html/js/map-directive.js @@ -509,7 +509,7 @@ angular.module("mapApp") } }; - // Deteremine the amount of text padding due to an icon + // Determine the amount of text padding due to an icon var getIconTextPadding = function(d) { var iconHeight = 0, iconWidth = 0; if (d.hostInfo.hasOwnProperty("iconInfo")) { diff --git a/html/js/trends-graph.js b/html/js/trends-graph.js index ad467fc3d..257fa4de4 100644 --- a/html/js/trends-graph.js +++ b/html/js/trends-graph.js @@ -588,7 +588,7 @@ angular.module("trendsApp") // Get the new domain var domain = $scope.xScale.domain(); - // Determin the new start and end times + // Determine the new start and end times var start = Math.round(domain[0].getTime() / 1000); var end = Math.round(domain[1].getTime() / 1000); if(start == end) { diff --git a/sample-config/nagios.cfg.in b/sample-config/nagios.cfg.in index 78ac46f08..c68f6da3b 100644 --- a/sample-config/nagios.cfg.in +++ b/sample-config/nagios.cfg.in @@ -712,7 +712,7 @@ check_for_updates=1 # BARE UPDATE CHECK -# This option deterines what data Nagios will send to api.nagios.org when +# This option determines 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 From e60466ea0c8b2b7fbd0f20be00401e3481dd8990 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:02:50 +0000 Subject: [PATCH 031/100] spelling: discrepancy --- t/900-configparsing.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/900-configparsing.t b/t/900-configparsing.t index 3548b3cdf..c4c1de335 100644 --- a/t/900-configparsing.t +++ b/t/900-configparsing.t @@ -31,7 +31,7 @@ my @output = `$diff`; if ($? == 0) { pass( "Nagios precached objects file matches expected" ); } else { - fail( "Nagios precached objects discrepency!!!\nTest with: $diff\nCopy with: cp $precache.generated $precache.expected" ); + fail( "Nagios precached objects discrepancy!!!\nTest with: $diff\nCopy with: cp $precache.generated $precache.expected" ); print "#$_" foreach @output; } From d81e333a2c4ebba8267920e37502a7528b7e1e09 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:03:14 +0000 Subject: [PATCH 032/100] spelling: documentation --- nagios.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nagios.spec b/nagios.spec index 37c0ca710..b5c96516a 100644 --- a/nagios.spec +++ b/nagios.spec @@ -104,7 +104,7 @@ CFLAGS="%{mycflags} %{myXcflags}" LDFLAGS="$CFLAGS" %configure \ find . -type f -name Makefile -exec /usr/bin/perl -p -i -e "s/-mtune=generic/-march=nocona/g" Makefile {} \; -print %{__make} %{?_smp_mflags} all -### Build our documentaiton +### Build our documentation %{__make} dox ### Apparently contrib does not obey configure ! From 16a4e25e6d54524c2a0d8c0d4dc6d5a3a0970443 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:03:26 +0000 Subject: [PATCH 033/100] spelling: domain --- html/js/nag_funcs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/js/nag_funcs.js b/html/js/nag_funcs.js index e9a9f3879..78f2d18f9 100644 --- a/html/js/nag_funcs.js +++ b/html/js/nag_funcs.js @@ -84,7 +84,7 @@ oreo.prototype.get = function(name) * null -1 or > 0 Sets an empty cookie * unset any Expire / remove it * -* parms.domain and/or parms.path will override domaid and/or +* parms.domain and/or parms.path will override domain and/or * path in the constructor. * * Returns: Nothing From 1e73cef96c1239c91d8c67f4e9ab4294d1f6fc8b Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:03:41 +0000 Subject: [PATCH 034/100] spelling: downtime --- cgi/cmd.c | 8 ++++---- common/downtime.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cgi/cmd.c b/cgi/cmd.c index 0db082232..9eb464e05 100644 --- a/cgi/cmd.c +++ b/cgi/cmd.c @@ -2675,7 +2675,7 @@ void show_command_help(int cmd) { printf("across program shutdowns and restarts. Both the start and end times should be specified in the following format: mm/dd/yyyy hh:mm:ss.\n"); printf("If you select the fixed option, the downtime will be in effect between the start and end times you specify. If you do not select the fixed\n"); printf("option, Nagios will treat this as \"flexible\" downtime. Flexible downtime starts when a host goes down or becomes unreachable (sometime between the\n"); - printf("start and end times you specified) and lasts as long as the duration of time you enter. The duration fields do not apply for fixed dowtime.\n"); + printf("start and end times you specified) and lasts as long as the duration of time you enter. The duration fields do not apply for fixed downtime.\n"); break; case CMD_SCHEDULE_HOSTGROUP_SVC_DOWNTIME: @@ -2684,7 +2684,7 @@ void show_command_help(int cmd) { printf("across program shutdowns and restarts. Both the start and end times should be specified in the following format: mm/dd/yyyy hh:mm:ss.\n"); printf("If you select the fixed option, the downtime will be in effect between the start and end times you specify. If you do not select the fixed\n"); printf("option, Nagios will treat this as \"flexible\" downtime. Flexible downtime starts when a service enters a non-OK state (sometime between the\n"); - printf("start and end times you specified) and lasts as long as the duration of time you enter. The duration fields do not apply for fixed dowtime.\n"); + printf("start and end times you specified) and lasts as long as the duration of time you enter. The duration fields do not apply for fixed downtime.\n"); printf("Note that scheduling downtime for services does not automatically schedule downtime for the hosts those services are associated with. If you want to also schedule downtime for all hosts in the hostgroup, check the 'Schedule downtime for hosts too' option.\n"); break; @@ -2775,7 +2775,7 @@ void show_command_help(int cmd) { printf("across program shutdowns and restarts. Both the start and end times should be specified in the following format: mm/dd/yyyy hh:mm:ss.\n"); printf("If you select the fixed option, the downtime will be in effect between the start and end times you specify. If you do not select the fixed\n"); printf("option, Nagios will treat this as \"flexible\" downtime. Flexible downtime starts when a host goes down or becomes unreachable (sometime between the\n"); - printf("start and end times you specified) and lasts as long as the duration of time you enter. The duration fields do not apply for fixed dowtime.\n"); + printf("start and end times you specified) and lasts as long as the duration of time you enter. The duration fields do not apply for fixed downtime.\n"); break; case CMD_SCHEDULE_SERVICEGROUP_SVC_DOWNTIME: @@ -2784,7 +2784,7 @@ void show_command_help(int cmd) { printf("across program shutdowns and restarts. Both the start and end times should be specified in the following format: mm/dd/yyyy hh:mm:ss.\n"); printf("If you select the fixed option, the downtime will be in effect between the start and end times you specify. If you do not select the fixed\n"); printf("option, Nagios will treat this as \"flexible\" downtime. Flexible downtime starts when a service enters a non-OK state (sometime between the\n"); - printf("start and end times you specified) and lasts as long as the duration of time you enter. The duration fields do not apply for fixed dowtime.\n"); + printf("start and end times you specified) and lasts as long as the duration of time you enter. The duration fields do not apply for fixed downtime.\n"); printf("Note that scheduling downtime for services does not automatically schedule downtime for the hosts those services are associated with. If you want to also schedule downtime for all hosts in the servicegroup, check the 'Schedule downtime for hosts too' option.\n"); break; diff --git a/common/downtime.c b/common/downtime.c index 56f5079b0..c7e3187aa 100644 --- a/common/downtime.c +++ b/common/downtime.c @@ -481,7 +481,7 @@ int register_downtime(int type, unsigned long downtime_id) { Nagios and the downtime was in effect when we last shutdown Nagios, so we should restart the flexible downtime now. This should work even if the downtime has ended because the - handle_scheduled_dowtime() function will immediately schedule + handle_scheduled_downtime() function will immediately schedule another downtime event which will end the downtime. */ if((new_downtime_id = (unsigned long *)malloc(sizeof(unsigned long)))) { *new_downtime_id = downtime_id; From 724c4310ab684fc631733d902e0d90880ad82fbb Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:04:41 +0000 Subject: [PATCH 035/100] spelling: empty --- xdata/xodtemplate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xdata/xodtemplate.c b/xdata/xodtemplate.c index ed3c9d849..265acb7e5 100644 --- a/xdata/xodtemplate.c +++ b/xdata/xodtemplate.c @@ -6630,7 +6630,7 @@ int xodtemplate_recombobulate_servicegroups(void) { continue; /* preprocess the servicegroup list, to change "grp1,grp2,grp3,!grp2" into "grp1,grp3" */ - /* 10/19/07 EG an empry return value means an error occured */ + /* 10/19/07 EG an empty return value means an error occured */ if((servicegroup_names = xodtemplate_process_servicegroup_names(temp_service->service_groups, temp_service->_config_file, temp_service->_start_line)) == NULL) { logit(NSLOG_CONFIG_ERROR, TRUE, "Error: Failed to process servicegroup names for service '%s' on host '%s' (config file '%s', starting at line %d)\n", temp_service->service_description, temp_service->host_name, xodtemplate_config_file_name(temp_service->_config_file), temp_service->_start_line); From 3b2743ee4a1f098d1582e6e7110c4aab18b56301 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:06:40 +0000 Subject: [PATCH 036/100] spelling: exclude --- base/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/utils.c b/base/utils.c index 49a0c3261..6e780fb41 100644 --- a/base/utils.c +++ b/base/utils.c @@ -1214,7 +1214,7 @@ static void _get_next_invalid_time(time_t pref_time, time_t *invalid_time, timep timerange *temp_timerange = _get_matching_timerange(earliest_time, tperiod); for(; temp_timerange != NULL; temp_timerange = temp_timerange->next) { - /* ranges with start/end of zero mean exlude this day */ + /* ranges with start/end of zero mean exclude this day */ if(temp_timerange->range_start == 0 && temp_timerange->range_end == 0) continue; @@ -1293,7 +1293,7 @@ void _get_next_valid_time(time_t pref_time, time_t *valid_time, timeperiod *tper #endif for(; temp_timerange != NULL; temp_timerange = temp_timerange->next) { - /* ranges with start/end of zero mean exlude this day */ + /* ranges with start/end of zero mean exclude this day */ if(temp_timerange->range_start == 0 && temp_timerange->range_end == 0) continue; From da020d550984f787b9d11eab233a30bc45e88004 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:05:38 +0000 Subject: [PATCH 037/100] spelling: executable --- contrib/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/README b/contrib/README index 32afc6667..bd6e2bef6 100644 --- a/contrib/README +++ b/contrib/README @@ -22,7 +22,7 @@ Additional CGIs: ---------------- - traceroute.cgi is (surprise) a CGI that allows you to do a traceroute - to a specific IP address. Simply do a 'chmod +x' to make it executeable + to a specific IP address. Simply do a 'chmod +x' to make it executable and place it in the CGI directory (i.e. /usr/local/nagios/sbin). Requires Perl. From 80262e0fadae477b9b6d202e1277fa9fd8af7211 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:06:16 +0000 Subject: [PATCH 038/100] spelling: executed --- cgi/objectjson.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cgi/objectjson.c b/cgi/objectjson.c index 944dc0955..e5c253cdb 100644 --- a/cgi/objectjson.c +++ b/cgi/objectjson.c @@ -185,7 +185,7 @@ option_help object_json_help[] = { { "all", NULL }, { NULL }, NULL, - "Specifies the type of query to be exeuted.", + "Specifies the type of query to be executed.", valid_queries }, { From f6ed0009097ac37b1202bca2c4abb5a805aa36f8 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:06:27 +0000 Subject: [PATCH 039/100] spelling: existence --- html/js/map-directive.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/js/map-directive.js b/html/js/map-directive.js index cd223d65a..f9bdeacf3 100644 --- a/html/js/map-directive.js +++ b/html/js/map-directive.js @@ -1713,7 +1713,7 @@ angular.module("mapApp") }; // Get an object attribute in a generic way that checks for - // the existance of all attributes in the hierarchy + // the existence of all attributes in the hierarchy var getObjAttr = function(d, attrs, nilval) { if(d.hasOwnProperty("hostInfo")) { From 1fb1f2d5e8c4f7445d5dcbbe4e8a3e21b62cb418 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:07:11 +0000 Subject: [PATCH 040/100] spelling: finesse --- tap/ltmain.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tap/ltmain.sh b/tap/ltmain.sh index c888819dd..8bfc36125 100644 --- a/tap/ltmain.sh +++ b/tap/ltmain.sh @@ -5633,7 +5633,7 @@ relink_command=\"$relink_command\"" relink_command= # To insure that "foo" is sourced, and not "foo.exe", - # finese the cygwin/MSYS system by explicitly sourcing "foo." + # finesse the cygwin/MSYS system by explicitly sourcing "foo." # which disallows the automatic-append-.exe behavior. case $build in *cygwin* | *mingw*) wrapperdot=${wrapper}. ;; @@ -5671,7 +5671,7 @@ relink_command=\"$relink_command\"" relink_command= # To insure that "foo" is sourced, and not "foo.exe", - # finese the cygwin/MSYS system by explicitly sourcing "foo." + # finesse the cygwin/MSYS system by explicitly sourcing "foo." # which disallows the automatic-append-.exe behavior. case $build in *cygwin* | *mingw*) wrapperdot=${wrapper}. ;; From c691a004bc9075f950300df426ab5c5f7aae6268 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:07:38 +0000 Subject: [PATCH 041/100] spelling: found --- html/js/histogram.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/js/histogram.js b/html/js/histogram.js index 91464c085..e110f2d97 100644 --- a/html/js/histogram.js +++ b/html/js/histogram.js @@ -18,7 +18,7 @@ angular.module("histogramApp", ["ui.bootstrap", "ui.utils", .controller("histogramCtrl", function($scope, $location, $modal) { - // Parameters fonud in the URL + // Parameters found in the URL $scope.search = $location.search(); // URL parameters From 1ff9c9fd00f22d506e05cb6a5bbef20e05fac101 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:08:22 +0000 Subject: [PATCH 042/100] spelling: functions --- include/nagios.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/nagios.h b/include/nagios.h index c63552132..7a6823b53 100644 --- a/include/nagios.h +++ b/include/nagios.h @@ -567,7 +567,7 @@ int handle_async_service_check_result(service *, check_result *); int handle_host_state(host *); /* top level host state handler */ -/**** Common Check Fucntions *****/ +/**** Common Check Functions *****/ int reap_check_results(void); From b43d7c594a4c3a27349a7c2ef1f28afb3e0b33a9 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:08:46 +0000 Subject: [PATCH 043/100] spelling: generated --- contrib/traceroute.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/traceroute.cgi b/contrib/traceroute.cgi index 2f098cc90..abea7f192 100644 --- a/contrib/traceroute.cgi +++ b/contrib/traceroute.cgi @@ -66,7 +66,7 @@ print "\n\n"; print "
Host Health:%2.1f%% Health
"; print "\n"); printf("\n"); printf("\n"); - printf("\n"); + printf("\n"); printf("\n"); printf("\n"); printf("\n"); From fa3818e00d0fa6eca432fa2d8c193b7da9adaaaf Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:30:32 +0000 Subject: [PATCH 049/100] spelling: justify --- lib/snprintf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/snprintf.c b/lib/snprintf.c index e89709041..1ddf29caf 100644 --- a/lib/snprintf.c +++ b/lib/snprintf.c @@ -857,7 +857,7 @@ static void fmtint(char *buffer, size_t *currlen, size_t maxlen, spadlen = 0; } if(flags & DP_F_MINUS) - spadlen = -spadlen; /* Left Justifty */ + spadlen = -spadlen; /* Left Justify */ #ifdef DEBUG_SNPRINTF printf("zpad: %d, spad: %d, min: %d, max: %d, place: %d\n", @@ -1063,7 +1063,7 @@ static void fmtfp(char *buffer, size_t *currlen, size_t maxlen, if(padlen < 0) padlen = 0; if(flags & DP_F_MINUS) - padlen = -padlen; /* Left Justifty */ + padlen = -padlen; /* Left Justify */ if((flags & DP_F_ZERO) && (padlen > 0)) { if(signvalue) { From 099f93f1c4cb42ddc059a861ec7b7550135797c9 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:31:47 +0000 Subject: [PATCH 050/100] spelling: links --- Changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 4ecd645e8..440d4da1b 100644 --- a/Changelog +++ b/Changelog @@ -235,7 +235,7 @@ FIXES * Fixed map now resets zoom when form apply()'d (Eric Stanley) * Fixed so close box on dialogs actually closes dialog (Eric Stanley) * Corrected directive in trends display (Eric Stanley) -* Fixed minor issue with link in trends linkes (Eric Stanley) +* Fixed minor issue with link in trends links (Eric Stanley) * Fixed issue with map displaying on Firefox (Eric Stanley) * Added exclusions for ctags generation (Eric Stanley) * Update map-popup.html (Scott Wilkerson) From 99a27edbffed7cc7098518b1b59fc56314676438 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:34:27 +0000 Subject: [PATCH 051/100] spelling: nagios --- .../eventhandlers/distributed-monitoring/obsessive_svc_handler | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler b/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler index ece9e992b..84b3d419d 100755 --- a/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler +++ b/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler @@ -1,7 +1,7 @@ #!/bin/sh # OBSESSIVE_SVC_HANDLER -# Written by Ethan Galstad (nagios@nagils.org) +# Written by Ethan Galstad (nagios@nagios.org) # Last Modified: 07-19-2001 # # This script is intended to run as the OCSP command From 07ac0489cd703259fe1c7056d9fbee65354b86a6 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:35:32 +0000 Subject: [PATCH 052/100] spelling: nonexistent --- base/config.c | 2 +- t/615cgierror.t | 8 ++++---- t/920-nocontactgroup.t | 2 +- t/etc/no-contactgroup-error.cfg | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/base/config.c b/base/config.c index af6a47307..a2ad4872a 100644 --- a/base/config.c +++ b/base/config.c @@ -2222,7 +2222,7 @@ int pre_flight_circular_check(int *w, int *e) { dep_type = temp_sd->dependency_type; /* * this shouldn't happen, but it can in case dependencies are - * added to services on hosts in empty hostgroups (ie, nonexistant) + * added to services on hosts in empty hostgroups (ie, nonexistent) */ if(dep_type < 1 || dep_type > ARRAY_SIZE(ary)) continue; diff --git a/t/615cgierror.t b/t/615cgierror.t index ea6ee750b..b7340c116 100644 --- a/t/615cgierror.t +++ b/t/615cgierror.t @@ -23,14 +23,14 @@ TODO: { local $TODO = "Output is different for these CGIs"; foreach my $cgi (@todos) { delete $cgis{$cgi}; -# my $output = `NAGIOS_CGI_CONFIG=etc/cgi.nonexistant REQUEST_METHOD=GET $cgi_dir/$cgi`; -# like( $output, "/Error: Could not open CGI config file 'etc/cgi.nonexistant' for reading/", "Found error for $cgi" ); +# my $output = `NAGIOS_CGI_CONFIG=etc/cgi.nonexistent REQUEST_METHOD=GET $cgi_dir/$cgi`; +# like( $output, "/Error: Could not open CGI config file 'etc/cgi.nonexistent' for reading/", "Found error for $cgi" ); } } plan tests => scalar keys %cgis; foreach my $cgi (sort keys %cgis) { - my $output = `NAGIOS_CGI_CONFIG=etc/cgi.nonexistant REQUEST_METHOD=GET $cgi_dir/$cgi`; - like( $output, "/Error: Could not open CGI config file 'etc/cgi.nonexistant' for reading/", "Found error for $cgi" ); + my $output = `NAGIOS_CGI_CONFIG=etc/cgi.nonexistent REQUEST_METHOD=GET $cgi_dir/$cgi`; + like( $output, "/Error: Could not open CGI config file 'etc/cgi.nonexistent' for reading/", "Found error for $cgi" ); } diff --git a/t/920-nocontactgroup.t b/t/920-nocontactgroup.t index c7005a63c..9cd70588a 100644 --- a/t/920-nocontactgroup.t +++ b/t/920-nocontactgroup.t @@ -16,5 +16,5 @@ my $precache = "$Bin/var/objects.precache"; my $output = `$nagios -v "$etc/nagios-no-contactgroup.cfg"`; -like( $output, "/Error: Could not find any contactgroup matching 'nonexistantone'/", "Correct error for no contactgroup" ); +like( $output, "/Error: Could not find any contactgroup matching 'nonexistentone'/", "Correct error for no contactgroup" ); isnt($?, 0, "And get return code error" ); diff --git a/t/etc/no-contactgroup-error.cfg b/t/etc/no-contactgroup-error.cfg index 7ec324694..e4fe00913 100644 --- a/t/etc/no-contactgroup-error.cfg +++ b/t/etc/no-contactgroup-error.cfg @@ -81,7 +81,7 @@ define contact { service_notification_options w,u,c,r,f,s host_notification_commands notify-none service_notification_commands notify-none - contact_groups nonexistantone + contact_groups nonexistentone } define command { command_name notify-none From 42b170fb7d359430b40e3e0e026baabd91869d96 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:37:08 +0000 Subject: [PATCH 053/100] spelling: occasionally --- base/events.c | 2 +- sample-config/template-object/printer.cfg.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/base/events.c b/base/events.c index 5e95e61b0..85cda8f3d 100644 --- a/base/events.c +++ b/base/events.c @@ -1051,7 +1051,7 @@ int event_execution_loop(void) { /* keep track of the last time */ last_time = current_time; - /* update status information occassionally - NagVis watches the NDOUtils DB to see if Nagios is alive */ + /* update status information occasionally - NagVis watches the NDOUtils DB to see if Nagios is alive */ if((unsigned long)(current_time - last_status_update) > 5) { last_status_update = current_time; update_program_status(FALSE); diff --git a/sample-config/template-object/printer.cfg.in b/sample-config/template-object/printer.cfg.in index ad17eaffa..125d1d6c6 100644 --- a/sample-config/template-object/printer.cfg.in +++ b/sample-config/template-object/printer.cfg.in @@ -72,7 +72,7 @@ define service{ } -# Create a service for "pinging" the printer occassionally. Useful for monitoring RTA, packet loss, etc. +# Create a service for "pinging" the printer occasionally. Useful for monitoring RTA, packet loss, etc. define service{ use generic-service From f5025701271051475e0d4b05602b3140ad8b289a Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:37:20 +0000 Subject: [PATCH 054/100] spelling: occurrence --- cgi/cgiutils.c | 4 ++-- xdata/xodtemplate.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cgi/cgiutils.c b/cgi/cgiutils.c index ac790e1be..2ee15e559 100644 --- a/cgi/cgiutils.c +++ b/cgi/cgiutils.c @@ -1354,7 +1354,7 @@ void strip_html_brackets(char *buffer) { if(buffer == NULL || buffer[0] == '\x0') return; - /* remove all occurances in string */ + /* remove all occurrences in string */ z = (int)strlen(buffer); for(x = 0, y = 0; x < z; x++) { if(buffer[x] == '<' || buffer[x] == '>') @@ -2117,7 +2117,7 @@ void strip_splunk_query_terms(char *buffer) { if(buffer == NULL || buffer[0] == '\x0') return; - /* remove all occurances in string */ + /* remove all occurrences in string */ z = (int)strlen(buffer); for(x = 0, y = 0; x < z; x++) { if(buffer[x] == '\'' || buffer[x] == '\"' || buffer[x] == ';' || buffer[x] == ':' || buffer[x] == ',' || buffer[x] == '-' || buffer[x] == '=') diff --git a/xdata/xodtemplate.c b/xdata/xodtemplate.c index 2c11ed9bf..9a61bdd3c 100644 --- a/xdata/xodtemplate.c +++ b/xdata/xodtemplate.c @@ -1178,7 +1178,7 @@ int xodtemplate_add_object_property(char *input, int options) { /* get variable name */ variable = input; lth = strlen(variable); - /* trim at first whitespace occurance */ + /* trim at first whitespace occurrence */ for(x = 0; variable[x] != '\x0'; x++) { if(variable[x] == ' ' || variable[x] == '\t') { variable[x] = 0; From 19fd31c31587b3261e913e7da5e12e39e4998614 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:37:29 +0000 Subject: [PATCH 055/100] spelling: occurring --- base/nagiostats.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/base/nagiostats.c b/base/nagiostats.c index cacf595d0..14c5740d1 100644 --- a/base/nagiostats.c +++ b/base/nagiostats.c @@ -358,18 +358,18 @@ int main(int argc, char **argv) { printf(" xxxPSVHSTLAT MIN/MAX/AVG passive host check latency (ms).\n"); printf(" xxxPSVHSTPSC MIN/MAX/AVG passive host check %% state change.\n"); printf(" xxxHSTPSC MIN/MAX/AVG host check %% state change.\n"); - printf(" NUMACTHSTCHECKSxM number of total active host checks occuring in last 1/5/15 minutes.\n"); - printf(" NUMOACTHSTCHECKSxM number of on-demand active host checks occuring in last 1/5/15 minutes.\n"); - printf(" NUMCACHEDHSTCHECKSxM number of cached host checks occuring in last 1/5/15 minutes.\n"); - printf(" NUMSACTHSTCHECKSxM number of scheduled active host checks occuring in last 1/5/15 minutes.\n"); - printf(" NUMPARHSTCHECKSxM number of parallel host checks occuring in last 1/5/15 minutes.\n"); - printf(" NUMSERHSTCHECKSxM number of serial host checks occuring in last 1/5/15 minutes.\n"); - printf(" NUMPSVHSTCHECKSxM number of passive host checks occuring in last 1/5/15 minutes.\n"); - printf(" NUMACTSVCCHECKSxM number of total active service checks occuring in last 1/5/15 minutes.\n"); - printf(" NUMOACTSVCCHECKSxM number of on-demand active service checks occuring in last 1/5/15 minutes.\n"); - printf(" NUMCACHEDSVCCHECKSxM number of cached service checks occuring in last 1/5/15 minutes.\n"); - printf(" NUMSACTSVCCHECKSxM number of scheduled active service checks occuring in last 1/5/15 minutes.\n"); - printf(" NUMPSVSVCCHECKSxM number of passive service checks occuring in last 1/5/15 minutes.\n"); + printf(" NUMACTHSTCHECKSxM number of total active host checks occurring in last 1/5/15 minutes.\n"); + printf(" NUMOACTHSTCHECKSxM number of on-demand active host checks occurring in last 1/5/15 minutes.\n"); + printf(" NUMCACHEDHSTCHECKSxM number of cached host checks occurring in last 1/5/15 minutes.\n"); + printf(" NUMSACTHSTCHECKSxM number of scheduled active host checks occurring in last 1/5/15 minutes.\n"); + printf(" NUMPARHSTCHECKSxM number of parallel host checks occurring in last 1/5/15 minutes.\n"); + printf(" NUMSERHSTCHECKSxM number of serial host checks occurring in last 1/5/15 minutes.\n"); + printf(" NUMPSVHSTCHECKSxM number of passive host checks occurring in last 1/5/15 minutes.\n"); + printf(" NUMACTSVCCHECKSxM number of total active service checks occurring in last 1/5/15 minutes.\n"); + printf(" NUMOACTSVCCHECKSxM number of on-demand active service checks occurring in last 1/5/15 minutes.\n"); + printf(" NUMCACHEDSVCCHECKSxM number of cached service checks occurring in last 1/5/15 minutes.\n"); + printf(" NUMSACTSVCCHECKSxM number of scheduled active service checks occurring in last 1/5/15 minutes.\n"); + printf(" NUMPSVSVCCHECKSxM number of passive service checks occurring in last 1/5/15 minutes.\n"); printf(" NUMEXTCMDSxM number of external commands processed in last 1/5/15 minutes.\n"); printf("\n"); From 54da1f1822f45e05dad6eea3109a627d050d0ca1 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:37:51 +0000 Subject: [PATCH 056/100] spelling: omitted --- tap/src/tap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tap/src/tap.h b/tap/src/tap.h index e64f9d5f9..ca6aab229 100644 --- a/tap/src/tap.h +++ b/tap/src/tap.h @@ -25,7 +25,7 @@ */ /* '## __VA_ARGS__' is a gcc'ism. C99 doesn't allow the token pasting - and requires the caller to add the final comma if they've ommitted + and requires the caller to add the final comma if they've omitted the optional arguments */ #ifdef __GNUC__ # define ok(e, test, ...) ((e) ? \ From e2c2eb9e12ee57b0398b6e14d3e74974127add48 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:38:14 +0000 Subject: [PATCH 057/100] spelling: orphan --- cgi/jsonutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cgi/jsonutils.c b/cgi/jsonutils.c index 9298dee17..b4d073334 100644 --- a/cgi/jsonutils.c +++ b/cgi/jsonutils.c @@ -128,7 +128,7 @@ const string_value_mapping svm_service_states[] = { const string_value_mapping svm_check_options[] = { { "force_execution", CHECK_OPTION_FORCE_EXECUTION, "FORCE_EXECUTION" }, { "freshness_check", CHECK_OPTION_FRESHNESS_CHECK, "FRESHNESS_CHECK" }, - { "ophan_check", CHECK_OPTION_ORPHAN_CHECK, "ORPHAN_CHECK" }, + { "orphan_check", CHECK_OPTION_ORPHAN_CHECK, "ORPHAN_CHECK" }, { NULL, -1, NULL }, }; From 8430bd531b2a423ea63658e0f388d2e67b616985 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:38:51 +0000 Subject: [PATCH 058/100] spelling: output --- cgi/jsonutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cgi/jsonutils.c b/cgi/jsonutils.c index b4d073334..0a7717616 100644 --- a/cgi/jsonutils.c +++ b/cgi/jsonutils.c @@ -1415,7 +1415,7 @@ char *json_escape_string(const char *src, const json_escape *escapes) { wchar_t *fromp; /* pointer to a found "from" string */ long offset; /* offset from beginning of wdest to a "from" string */ size_t wchars; /* number of wide characters to move */ - size_t dest_len; /* length of ouput string "dest" */ + size_t dest_len; /* length of output string "dest" */ char *dest; /* buffer containing the escaped version of src */ /* Make sure we're passed valid parameters */ From 8a4aee8fed646a78619022965b7dd43610438658 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:39:16 +0000 Subject: [PATCH 059/100] spelling: outputting --- tap/depcomp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tap/depcomp b/tap/depcomp index 11e2d3bfe..b369e8b7b 100755 --- a/tap/depcomp +++ b/tap/depcomp @@ -45,7 +45,7 @@ Environment variables: object Object file output by `PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. + tmpdepfile Temporary file to use when outputting dependencies. libtool Whether libtool is used (yes/no). Report bugs to . From 207aaba9c3e5b11b4150d35e5e283552551868a4 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:39:43 +0000 Subject: [PATCH 060/100] spelling: parallelism --- docs/queryhandlers.dox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/queryhandlers.dox b/docs/queryhandlers.dox index b1ee41b6d..8c17e4306 100644 --- a/docs/queryhandlers.dox +++ b/docs/queryhandlers.dox @@ -12,7 +12,7 @@ external apps a way to help out with various Nagios tasks. @section caveats Caveats The query handlers run in the main thread. Nagios doesn't provide any -parallellism here and main Nagios will be blocked while a query is +parallelism here and main Nagios will be blocked while a query is running. As such, it's a very good idea to make ones queryhandlers complete in as little time as possible. From adf0b15515496c118317cfcbf7bbf7fc465dd906 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:40:03 +0000 Subject: [PATCH 061/100] spelling: parameter --- base/utils.c | 2 +- test/test-downtime.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/base/utils.c b/base/utils.c index 6e780fb41..001a45d3f 100644 --- a/base/utils.c +++ b/base/utils.c @@ -1699,7 +1699,7 @@ void my_system_sighandler(int sig) { /* Handle the SIGXFSZ signal. A SIGXFSZ signal is received when a file exceeds - the maximum allowable size either as dictated by the fzise paramater in + the maximum allowable size either as dictated by the fzise parameter in /etc/security/limits.conf (ulimit -f) or by the maximum size allowed by the filesystem */ void handle_sigxfsz(int sig) { diff --git a/test/test-downtime.pl b/test/test-downtime.pl index 1be59a410..e4ca90548 100755 --- a/test/test-downtime.pl +++ b/test/test-downtime.pl @@ -152,7 +152,7 @@ sub readCfgFile { push( @{ $cfg{ $key}}, $value); } else { - die "Paramater $key already exists" if( exists( $cfg{ $key})); + die "Parameter $key already exists" if( exists( $cfg{ $key})); $cfg{ $key} = $value; } } From c65a8bf5132276ec55d76bfdeea02ae8f3fda950 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:40:21 +0000 Subject: [PATCH 062/100] spelling: partition --- html/js/map-directive.js | 2 +- html/stylesheets/map-directive.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/html/js/map-directive.js b/html/js/map-directive.js index f9bdeacf3..005c4b48b 100644 --- a/html/js/map-directive.js +++ b/html/js/map-directive.js @@ -2077,7 +2077,7 @@ angular.module("mapApp") } }; - // Update the map for partion displays + // Update the map for partition displays var updatePartitionMap = function(source, reparent) { // The svg element that holds it all diff --git a/html/stylesheets/map-directive.css b/html/stylesheets/map-directive.css index 17345ae19..d942ca119 100644 --- a/html/stylesheets/map-directive.css +++ b/html/stylesheets/map-directive.css @@ -88,7 +88,7 @@ div#popup .popup-value { color: #ccc; } -/* Styles for labels in partion displays */ +/* Styles for labels in partition displays */ g.label { pointer-events: none; } From 4b03120cd87c0d6aa3c36b7d55afb1640497f2bf Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:04:55 +0000 Subject: [PATCH 063/100] spelling: preemptively --- tap/aclocal.m4 | 2 +- tap/configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tap/aclocal.m4 b/tap/aclocal.m4 index c7c523e45..915feb7b5 100644 --- a/tap/aclocal.m4 +++ b/tap/aclocal.m4 @@ -1662,7 +1662,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl cygwin* | mingw*) # On Win9x/ME, this test blows up -- it succeeds, but takes # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, + # Worse, since 9x/ME are not preemptively multitasking, # you end up with a "frozen" computer, even though with patience # the test eventually succeeds (with a max line length of 256k). # Instead, let's just punt: use the minimum linelength reported by diff --git a/tap/configure b/tap/configure index ab9c0215f..cc62c5fab 100755 --- a/tap/configure +++ b/tap/configure @@ -5409,7 +5409,7 @@ else cygwin* | mingw*) # On Win9x/ME, this test blows up -- it succeeds, but takes # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, + # Worse, since 9x/ME are not preemptively multitasking, # you end up with a "frozen" computer, even though with patience # the test eventually succeeds (with a max line length of 256k). # Instead, let's just punt: use the minimum linelength reported by From 832a72528d5c11ba8e854753968d853b1b7830cc Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:41:15 +0000 Subject: [PATCH 064/100] spelling: preferably --- lib/fanout.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fanout.h b/lib/fanout.h index 003537e7e..d1164dde4 100644 --- a/lib/fanout.h +++ b/lib/fanout.h @@ -22,7 +22,7 @@ typedef struct fanout_table fanout_table; /** * Create a fanout table - * @param[in] size The size of the table. Preferrably a power of 2 + * @param[in] size The size of the table. Preferably a power of 2 * @return Pointer to a newly created table */ extern fanout_table *fanout_create(unsigned long size); From a8a5f9b136783b504eafb451b0c3a6622f7fbd3a Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:41:35 +0000 Subject: [PATCH 065/100] spelling: privileges --- worker/ping/worker-ping.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/worker/ping/worker-ping.c b/worker/ping/worker-ping.c index 849662b46..cbef2f49a 100644 --- a/worker/ping/worker-ping.c +++ b/worker/ping/worker-ping.c @@ -191,8 +191,8 @@ void print_usage( char *program_name) { printf( " -d, --daemon Starts the ping worker in daemon mode,\n"); printf( " instead of as a foreground process\n"); printf( " -W, --worker /path/to/socket Act as a worker for an already running daemon\n"); - printf( " -u, --user user Drop priviliges to the specified user\n"); - printf( " -g, --group group Drop priviliges to the specified user\n"); + printf( " -u, --user user Drop privileges to the specified user\n"); + printf( " -g, --group group Drop privileges to the specified user\n"); printf( "\n"); printf( "Visit the Nagios website at https://www.nagios.org/ for bug fixes, new\n"); printf( "releases, online documentation, FAQs, information on subscribing to\n"); From d3ac1bdce21180b257781877a690c8f5de3433c5 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:34:53 +0000 Subject: [PATCH 066/100] spelling: really --- base/workers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/workers.c b/base/workers.c index 79121733c..1e78fd045 100644 --- a/base/workers.c +++ b/base/workers.c @@ -707,7 +707,7 @@ static int handle_worker_result(int sd, int events, void *arg) wpjob_type_name(job->type), job->id, wp->name, error_reason); #ifdef DEBUG /* The log below could leak sensitive information, such as - passwords, so only enable it if you neally need it */ + passwords, so only enable it if you really need it */ logit(NSLOG_RUNTIME_ERROR, TRUE, "wproc: command: %s\n", job->command); #endif if (job->type != WPJOB_CHECK && oj) { From e092b1026dc14621b5e1e5c1c1922eea0b2cdb00 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:43:04 +0000 Subject: [PATCH 067/100] spelling: resource --- base/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/utils.c b/base/utils.c index 001a45d3f..965fb0bb7 100644 --- a/base/utils.c +++ b/base/utils.c @@ -1737,7 +1737,7 @@ void handle_sigxfsz(int sig) { /* Attempt to log the error, realizing that the logging may fail if it is the log file that is over the size limit. */ logit(NSLOG_RUNTIME_ERROR, TRUE, - "Unable to determine current resoure limits: %s\n", + "Unable to determine current resource limits: %s\n", strerror(errno)); } From a01948686f7e64203c6f68db479e6caf25f9006b Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:43:16 +0000 Subject: [PATCH 068/100] spelling: retention --- html/includes/utils.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/includes/utils.inc.php b/html/includes/utils.inc.php index 07dfa024f..3e499c9b9 100644 --- a/html/includes/utils.inc.php +++ b/html/includes/utils.inc.php @@ -86,7 +86,7 @@ function get_update_information(){ // Nagios might be shutdown (ie, no status file), so try and read data from the retention file - // read retentiion file (just first few lines) + // read retention file (just first few lines) $rfc=read_retention_file($rf,50); //print_r($rfc); //exit(); From e4b8776b6e76e24d4daabf86a3400fb0979f82ef Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:43:28 +0000 Subject: [PATCH 069/100] spelling: retrieve --- lib/snprintf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/snprintf.c b/lib/snprintf.c index 1ddf29caf..d327903df 100644 --- a/lib/snprintf.c +++ b/lib/snprintf.c @@ -551,7 +551,7 @@ static size_t dopr(char *buffer, size_t maxlen, const char *format, va_list args } } - /* retieve the format arguments */ + /* retrieve the format arguments */ for(pnum = 0; pnum < max_pos; pnum++) { int i; From cb139ef920e12141973e57b2e5e4c89c5bbf1332 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:43:41 +0000 Subject: [PATCH 070/100] spelling: rotation --- base/logging.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/logging.c b/base/logging.c index e32d37696..1c4e5da66 100644 --- a/base/logging.c +++ b/base/logging.c @@ -410,7 +410,7 @@ int rotate_log_file(time_t rotation_time) { /* HACK: If the archive exists, don't overwrite it. This is a hack because the real problem is that some log rotations are executed - early and as a result the next log rotatation is scheduled for + early and as a result the next log rotation is scheduled for the same time as the one that ran early */ archive_stat_result = stat(log_archive, &archive_stat); if((0 == archive_stat_result) || From c599d4bc065361fe3d85915021e608050249f3f2 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:48:28 +0000 Subject: [PATCH 071/100] spelling: scheduling --- base/events.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/events.c b/base/events.c index 85cda8f3d..301e2c8a2 100644 --- a/base/events.c +++ b/base/events.c @@ -1337,7 +1337,7 @@ int handle_timed_event(timed_event *event) { /* The squeue internal event type, declared again here so we can manipulate the * scheduling queue without a malloc/free for each add/remove. * @todo: Refactor this to not depend so heavily on the event queue - * implementation, doing so efficiently may require a different sheduling queue + * implementation, doing so efficiently may require a different scheduling queue * data structure. */ struct squeue_event { unsigned int pos; From 7601b637ad48b01ca1d2a6ce8f1930ae7ec55343 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:44:39 +0000 Subject: [PATCH 072/100] spelling: separate --- base/nagiostats.c | 2 +- sample-config/nagios.cfg.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/base/nagiostats.c b/base/nagiostats.c index 14c5740d1..a5ea994ad 100644 --- a/base/nagiostats.c +++ b/base/nagiostats.c @@ -306,7 +306,7 @@ int main(int argc, char **argv) { printf("\n"); printf("Output:\n"); printf(" -m, --mrtg display output in MRTG compatible format.\n"); - printf(" -d, --data=VARS comma-seperated list of variables to output in MRTG\n"); + printf(" -d, --data=VARS comma-separated list of variables to output in MRTG\n"); printf(" (or compatible) format. See possible values below.\n"); printf(" Percentages are rounded, times are in milliseconds.\n"); printf(" -D, --delimiter=C character to use as delimiter in MRTG output mode.\n"); diff --git a/sample-config/nagios.cfg.in b/sample-config/nagios.cfg.in index c68f6da3b..d394c4af9 100644 --- a/sample-config/nagios.cfg.in +++ b/sample-config/nagios.cfg.in @@ -202,7 +202,7 @@ event_broker_options=-1 # This directive is used to specify an event broker module that should # by loaded by Nagios at startup. Use multiple directives if you want # to load more than one module. Arguments that should be passed to -# the module at startup are seperated from the module path by a space. +# the module at startup are separated from the module path by a space. # #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # WARNING !!! WARNING !!! WARNING !!! WARNING !!! WARNING !!! WARNING From ef0706517ff58785a7676da88c19b09c2dfee34b Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:45:59 +0000 Subject: [PATCH 073/100] spelling: service --- base/commands.c | 2 +- cgi/archivejson.c | 4 ++-- cgi/objectjson.c | 8 ++++---- cgi/statusjson.c | 8 ++++---- html/js/map-directive.js | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/base/commands.c b/base/commands.c index 268112cd0..138131792 100644 --- a/base/commands.c +++ b/base/commands.c @@ -5234,7 +5234,7 @@ void clear_service_flapping_state(service *svc) { if (svc->is_flapping) { log_debug_info(DEBUGL_FLAPPING, 1, "Service '%s' on host '%s' flapping state cleared.\n", svc->description, svc->host_name); /* log a notice - this one is parsed by the history CGI */ - logit(NSLOG_INFO_MESSAGE, FALSE, "SERVICE FLAPPING ALERT: %s;%s;STOPPED; Flapping state cleared for servicee. (%2.1f%% change < %2.1f%% threshold)\n", svc->host_name, svc->description, svc->percent_state_change, low_threshold); + logit(NSLOG_INFO_MESSAGE, FALSE, "SERVICE FLAPPING ALERT: %s;%s;STOPPED; Flapping state cleared for service. (%2.1f%% change < %2.1f%% threshold)\n", svc->host_name, svc->description, svc->percent_state_change, low_threshold); #ifdef USE_EVENT_BROKER /* send data to event broker */ diff --git a/cgi/archivejson.c b/cgi/archivejson.c index 662e8adf3..ccf486cc3 100644 --- a/cgi/archivejson.c +++ b/cgi/archivejson.c @@ -344,7 +344,7 @@ option_help archive_json_help[] = { { "alertcount", "alertlist", "notificationcount", "notificationlist", NULL }, NULL, - "Limits the hosts or serivces returned to those whose host parent is specified. A value of 'none' returns all hosts or services reachable directly by the Nagios core host.", + "Limits the hosts or services returned to those whose host parent is specified. A value of 'none' returns all hosts or services reachable directly by the Nagios core host.", parent_host_extras }, { @@ -355,7 +355,7 @@ option_help archive_json_help[] = { { "alertcount", "alertlist", "notificationcount", "notificationlist", NULL }, NULL, - "Limits the hosts or serivces returned to those whose having the host specified as a child host. A value of 'none' returns all hosts or services with no child hosts.", + "Limits the hosts or services returned to those whose having the host specified as a child host. A value of 'none' returns all hosts or services with no child hosts.", child_host_extras }, { diff --git a/cgi/objectjson.c b/cgi/objectjson.c index e5c253cdb..86ead5dc2 100644 --- a/cgi/objectjson.c +++ b/cgi/objectjson.c @@ -235,7 +235,7 @@ option_help object_json_help[] = { { NULL }, { "hostcount", "hostlist", "servicecount", "servicelist", NULL }, NULL, - "Limits the hosts or serivces returned to those whose host parent is specified. A value of 'none' returns all hosts or services reachable directly by the Nagios core host.", + "Limits the hosts or services returned to those whose host parent is specified. A value of 'none' returns all hosts or services reachable directly by the Nagios core host.", parent_host_extras }, { @@ -245,7 +245,7 @@ option_help object_json_help[] = { { NULL }, { "hostcount", "hostlist", "servicecount", "servicelist", NULL }, NULL, - "Limits the hosts or serivces returned to those whose having the host specified as a child host. A value of 'none' returns all hosts or services with no child hosts.", + "Limits the hosts or services returned to those whose having the host specified as a child host. A value of 'none' returns all hosts or services with no child hosts.", child_host_extras }, { @@ -305,7 +305,7 @@ option_help object_json_help[] = { { NULL }, { "servicecount", "servicelist", NULL }, NULL, - "Limits the serivces returned to those whose service parent has the name specified. A value of 'none' returns all services with no service parent.", + "Limits the services returned to those whose service parent has the name specified. A value of 'none' returns all services with no service parent.", parent_service_extras }, { @@ -315,7 +315,7 @@ option_help object_json_help[] = { { NULL }, { "servicecount", "servicelist", NULL }, NULL, - "Limits the serivces returned to those whose having the named service as a child service. A value of 'none' returns all services with no child services.", + "Limits the services returned to those whose having the named service as a child service. A value of 'none' returns all services with no child services.", child_service_extras }, { diff --git a/cgi/statusjson.c b/cgi/statusjson.c index 7881bc744..e01fb5424 100644 --- a/cgi/statusjson.c +++ b/cgi/statusjson.c @@ -329,7 +329,7 @@ option_help status_json_help[] = { { NULL }, { "hostcount", "hostlist", "servicecount", "servicelist", NULL }, NULL, - "Limits the hosts or serivces returned to those whose host parent is specified. A value of 'none' returns all hosts or services reachable directly by the Nagios core host.", + "Limits the hosts or services returned to those whose host parent is specified. A value of 'none' returns all hosts or services reachable directly by the Nagios core host.", parent_host_extras }, { @@ -339,7 +339,7 @@ option_help status_json_help[] = { { NULL }, { "hostcount", "hostlist", "servicecount", "servicelist", NULL }, NULL, - "Limits the hosts or serivces returned to those whose having the host specified as a child host. A value of 'none' returns all hosts or services with no child hosts.", + "Limits the hosts or services returned to those whose having the host specified as a child host. A value of 'none' returns all hosts or services with no child hosts.", child_host_extras }, { @@ -419,7 +419,7 @@ option_help status_json_help[] = { { NULL }, { "servicecount", "servicelist", NULL }, NULL, - "Limits the serivces returned to those whose service parent has the name specified. A value of 'none' returns all services with no service parent.", + "Limits the services returned to those whose service parent has the name specified. A value of 'none' returns all services with no service parent.", parent_service_extras }, { @@ -429,7 +429,7 @@ option_help status_json_help[] = { { NULL }, { "servicecount", "servicelist", NULL }, NULL, - "Limits the serivces returned to those whose having the named service as a child service. A value of 'none' returns all services with no child services.", + "Limits the services returned to those whose having the named service as a child service. A value of 'none' returns all services with no child services.", child_service_extras }, { diff --git a/html/js/map-directive.js b/html/js/map-directive.js index 005c4b48b..9100e63bd 100644 --- a/html/js/map-directive.js +++ b/html/js/map-directive.js @@ -280,7 +280,7 @@ angular.module("mapApp") } }); - // Get the serivces of the children of a specific node + // Get the services of the children of a specific node var getServiceList = function() { var parameters = { From f496813e86572fae689a1ae5124618fefa09726a Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:49:22 +0000 Subject: [PATCH 074/100] spelling: somewhere --- UPGRADING | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UPGRADING b/UPGRADING index 4ca573c97..921e153ab 100644 --- a/UPGRADING +++ b/UPGRADING @@ -5,7 +5,7 @@ nagios-4.3.0 - 2017-02-21 ------------------------- If you use "corewindow", as in - http://localhost/nagios?corewindow=www.somewere.com + http://localhost/nagios?corewindow=www.somewhere.com note that this functionality has been disabled by default in this release. If you still want to use it, run ./configure with the parameter --enable-corewindow From 75f769e2009febaa681df83af4c576c1501b4abd Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:49:51 +0000 Subject: [PATCH 075/100] spelling: squeue --- docs/api-incompat3to4.dox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-incompat3to4.dox b/docs/api-incompat3to4.dox index 555208c63..73938d64f 100644 --- a/docs/api-incompat3to4.dox +++ b/docs/api-incompat3to4.dox @@ -6,7 +6,7 @@ A list of API incompatibilities between Nagios 3 and 4. @section globalvars Global Variables @li event_list_{high,low} and event_list_{high,low}_tail are no more. -Instead there is "squeue_t *nagios_sqeueue", which is a single queue +Instead there is "squeue_t *nagios_squeue", which is a single queue to handle all timed events. @li last_command_check, command_check_interval, external_command_buffer and external_command_buffer_slots are no more. From 9449860c3aa4976554879feba2cd74cca8d2c5ba Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:50:44 +0000 Subject: [PATCH 076/100] spelling: successful --- cgi/cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cgi/cmd.c b/cgi/cmd.c index 9eb464e05..f577efe43 100644 --- a/cgi/cmd.c +++ b/cgi/cmd.c @@ -1918,7 +1918,7 @@ void commit_command_data(int cmd) { if(result == OK) { if(content_type == WML_CONTENT) - printf("

Your command was submitted sucessfully...

\n"); + printf("

Your command was submitted successfully...

\n"); else { printf("

Your command request was successfully submitted to Nagios for processing.

\n"); printf("Note: It may take a while before the command is actually processed.

\n"); From c4b1103ddb2b99a1f176aafdd524e2357fd9fdb8 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:51:07 +0000 Subject: [PATCH 077/100] spelling: suppress --- html/js/map-directive.js | 4 ++-- html/trends-form.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/html/js/map-directive.js b/html/js/map-directive.js index 9100e63bd..1d13b374b 100644 --- a/html/js/map-directive.js +++ b/html/js/map-directive.js @@ -2426,7 +2426,7 @@ angular.module("mapApp") var selection = d3.select(node); // Display the circle if the node has no icon or - // icons are supressed + // icons are suppressed if(!$scope.showIcons || d.hostInfo.objectJSON.icon_image == "") { selection.append("circle") @@ -2754,7 +2754,7 @@ angular.module("mapApp") var selection = d3.select(node); // Display the circle if the node has no icon or - // icons are supressed + // icons are suppressed if(!$scope.showIcons || d.hostInfo.objectJSON.icon_image == "") { selection.append("circle") diff --git a/html/trends-form.html b/html/trends-form.html index b2425e3fa..f1722a7e9 100644 --- a/html/trends-form.html +++ b/html/trends-form.html @@ -120,13 +120,13 @@
"; print "
traceroute
"; -print "Genereated by $self
"; +print "Generated by $self
"; print "Last Updated: $mdate
"; print "Updated every $refresh seconds
"; print "Nagios® - www.nagios.org
"; From 0b1dc7a19a3151176c0b3c488e8eb3be2f00da93 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:15:05 +0000 Subject: [PATCH 044/100] spelling: histogram --- cgi/trends.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cgi/trends.c b/cgi/trends.c index b520864dd..75fdf6094 100644 --- a/cgi/trends.c +++ b/cgi/trends.c @@ -449,7 +449,7 @@ int main(int argc, char **argv) { if(display_type == DISPLAY_HOST_TRENDS) { printf("View Availability Report For This Host
\n", AVAIL_CGI, url_encode(host_name), t1, t2, (include_soft_states == TRUE) ? "yes" : "no", (assume_state_retention == TRUE) ? "yes" : "no", (assume_initial_states == TRUE) ? "yes" : "no", (assume_states_during_notrunning == TRUE) ? "yes" : "no", initial_assumed_host_state, backtrack_archives); -#ifdef USE_HISTROGRAM +#ifdef USE_HISTOGRAM printf("View Alert Histogram For This Host
\n", HISTOGRAM_CGI, url_encode(host_name), t1, t2, (assume_state_retention == TRUE) ? "yes" : "no"); #endif printf("View Status Detail For This Host
\n", STATUS_CGI, url_encode(host_name)); From 00c87c37e76c2105e6b47dda2c89dab24ebc4e9c Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:15:38 +0000 Subject: [PATCH 045/100] spelling: hostgroup --- xdata/xodtemplate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xdata/xodtemplate.c b/xdata/xodtemplate.c index 265acb7e5..2c11ed9bf 100644 --- a/xdata/xodtemplate.c +++ b/xdata/xodtemplate.c @@ -6987,7 +6987,7 @@ static int xodtemplate_register_hostgroup_members(xodtemplate_hostgroup *this_ho for(list = this_hostgroup->member_list; list; list = list->next) { xodtemplate_host *h = (xodtemplate_host *)list->object_ptr; if (!add_host_to_hostgroup(hg, h->host_name)) { - logit(NSLOG_CONFIG_ERROR, TRUE, "Error: Bad member of hostgrop '%s' (config file '%s', starting on line %d)\n", hg->group_name, xodtemplate_config_file_name(this_hostgroup->_config_file), this_hostgroup->_start_line); + logit(NSLOG_CONFIG_ERROR, TRUE, "Error: Bad member of hostgroup '%s' (config file '%s', starting on line %d)\n", hg->group_name, xodtemplate_config_file_name(this_hostgroup->_config_file), this_hostgroup->_start_line); return -1; } num_regs++; From 34e7b4b054f3107d61c916d70416fa3bd076b56e Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:15:50 +0000 Subject: [PATCH 046/100] spelling: hostgroupescalations --- contrib/convertcfg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/convertcfg.c b/contrib/convertcfg.c index d78c952fe..9f93a3f13 100644 --- a/contrib/convertcfg.c +++ b/contrib/convertcfg.c @@ -61,7 +61,7 @@ int main(int argc, char **argv) { printf("\tcontactgroups\n"); printf("\thosts\n"); printf("\thostgroups\n"); - printf("\thostgroupescalationss\n"); + printf("\thostgroupescalations\n"); printf("\tservices\n"); printf("\tservicedependencies\n"); printf("\tserviceescalations\n"); From 08a4efe0592be00c074f7c709c9e576290e7c92b Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:30:07 +0000 Subject: [PATCH 047/100] spelling: initial --- cgi/archivejson.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cgi/archivejson.c b/cgi/archivejson.c index 7956e8469..662e8adf3 100644 --- a/cgi/archivejson.c +++ b/cgi/archivejson.c @@ -3227,7 +3227,7 @@ int get_initial_nagios_state(au_linked_list *log_entries, time_t start_time, else { if(AU_STATE_NO_DATA != initial_state) { /* Once we cross the threshold of the start time, if we have - an intial state, that is THE initial state */ + an initial state, that is THE initial state */ return initial_state; } else { From 7087c1efb6ada12d649f449e98d54a257f3dfc20 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 22 Mar 2017 04:29:58 +0000 Subject: [PATCH 048/100] spelling: interval --- cgi/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cgi/config.c b/cgi/config.c index ffde16706..8db78cc9c 100644 --- a/cgi/config.c +++ b/cgi/config.c @@ -1185,7 +1185,7 @@ void display_services(void) { printf("		ImportanceMax. Check AttemptsNormal Check IntervalRetry Check InteralRetry Check IntervalCheck CommandCheck PeriodParallelize"); printf(""); printf(""); printf(""); printf(""); printf(""); printf(""); printf(""); printf(""); printf(""); printf(""); printf(""); printf(""); printf("Host Status Totals\n"); From d986fcb9f3ca3a544b535d8b104a304431e4bde2 Mon Sep 17 00:00:00 2001 From: "John C. Frickson" Date: Mon, 24 Apr 2017 10:58:29 -0500 Subject: [PATCH 097/100] Setting a service as its own parent is not caught by the sanity checker (-v) and causes a segfault Fix for issue #363 --- Changelog | 1 + common/objects.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/Changelog b/Changelog index 178779832..e19d1e9d0 100644 --- a/Changelog +++ b/Changelog @@ -18,6 +18,7 @@ FIXED * xdata/xodtemplate.c bug in option-deprecation code (John Frickson) * Wildcard searching causes service status links to not work properly (John Frickson) * Quick search with no hits shows a permission denied error (John Frickson) +# Setting a service as its own parent is not caught by the sanity checker (-v) and causes a segfault (John Frickson) 4.3.1 - 2017-02-23 diff --git a/common/objects.c b/common/objects.c index db7293bcf..468ed0f58 100644 --- a/common/objects.c +++ b/common/objects.c @@ -785,6 +785,13 @@ servicesmember *add_parent_service_to_service(service *svc, char *host_name, cha if((sm = calloc(1, sizeof(*sm))) == NULL) return NULL; + if (strcmp(svc->host_name, host_name) == 0 && strcmp(svc->description, description) == 0) { + logit(NSLOG_CONFIG_ERROR, TRUE, + "Error: Host '%s' Service '%s' cannot be a child/parent of itself\n", + svc->host_name, svc->description); + return NULL; + } + if ((sm->host_name = strdup(host_name)) == NULL || (sm->service_description = strdup(description)) == NULL) { /* there was an error copying (description is NULL now) */ my_free(sm->host_name); From 0ffd15a4d486e7711ac414fafeb6812955bde492 Mon Sep 17 00:00:00 2001 From: "John C. Frickson" Date: Mon, 24 Apr 2017 15:35:25 -0500 Subject: [PATCH 098/100] Prep for release 4.3.2-rc1 --- Changelog | 4 ++-- configure | 4 ++-- configure.ac | 4 ++-- doxy.conf | 2 +- html/main.php | 4 ++-- html/side.php | 2 +- include/common.h | 4 ++-- nagios.spec | 2 +- update-version | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Changelog b/Changelog index e19d1e9d0..8794e165c 100644 --- a/Changelog +++ b/Changelog @@ -2,7 +2,7 @@ Nagios Core 4 Change Log ######################## -x.x.x - xxxx-xx-xx +4.3.2 - xxxx-xx-xx ------------------ FIXED * Every 15sec /var/log/messages is flooded with "nagios: set_environment_var" (John Frickson) @@ -18,7 +18,7 @@ FIXED * xdata/xodtemplate.c bug in option-deprecation code (John Frickson) * Wildcard searching causes service status links to not work properly (John Frickson) * Quick search with no hits shows a permission denied error (John Frickson) -# Setting a service as its own parent is not caught by the sanity checker (-v) and causes a segfault (John Frickson) +* Setting a service as its own parent is not caught by the sanity checker (-v) and causes a segfault (John Frickson) 4.3.1 - 2017-02-23 diff --git a/configure b/configure index 0e2cbb547..ca2d218c2 100755 --- a/configure +++ b/configure @@ -2353,9 +2353,9 @@ ac_config_headers="$ac_config_headers include/config.h lib/snprintf.h lib/iobrok PKG_NAME=nagios -PKG_VERSION="4.3.1" +PKG_VERSION="4.3.2-rc1" PKG_HOME_URL="https://www.nagios.org/" -PKG_REL_DATE="02-23-2017" +PKG_REL_DATE="2017-04-24" ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do diff --git a/configure.ac b/configure.ac index 06f87ab2d..92c59a4ec 100644 --- a/configure.ac +++ b/configure.ac @@ -10,9 +10,9 @@ AC_PREFIX_DEFAULT(/usr/local/nagios) PKG_NAME=nagios -PKG_VERSION="4.3.1" +PKG_VERSION="4.3.2-rc1" PKG_HOME_URL="https://www.nagios.org/" -PKG_REL_DATE="02-23-2017" +PKG_REL_DATE="2017-04-24" dnl Figure out how to invoke "install" and what install options to use. AC_PROG_INSTALL diff --git a/doxy.conf b/doxy.conf index ae72687fe..e081caa1d 100644 --- a/doxy.conf +++ b/doxy.conf @@ -1,5 +1,5 @@ PROJECT_NAME = Nagios -PROJECT_NUMBER = 4.3.1 +PROJECT_NUMBER = 4.3.2-rc1 PROJECT_BRIEF = "Dev docs for Nagios core and neb-module hackers" INPUT = lib/ docs/ diff --git a/html/main.php b/html/main.php index 9a3268d5b..db8966541 100644 --- a/html/main.php +++ b/html/main.php @@ -1,7 +1,7 @@ @@ -140,7 +140,7 @@ function setCoreStatusHTML(image, text) { diff --git a/html/side.php b/html/side.php index 4a2fb63e3..28d0328a7 100644 --- a/html/side.php +++ b/html/side.php @@ -1,7 +1,7 @@ diff --git a/include/common.h b/include/common.h index fca867e06..4b6159888 100644 --- a/include/common.h +++ b/include/common.h @@ -24,8 +24,8 @@ #include "shared.h" -#define PROGRAM_VERSION "4.3.1" -#define PROGRAM_MODIFICATION_DATE "02-23-2017" +#define PROGRAM_VERSION "4.3.2-rc1" +#define PROGRAM_MODIFICATION_DATE "2017-04-24" NAGIOS_BEGIN_DECL diff --git a/nagios.spec b/nagios.spec index b5c96516a..c3939ca3c 100644 --- a/nagios.spec +++ b/nagios.spec @@ -21,7 +21,7 @@ Summary: Open Source host, service and network monitoring program Name: nagios -Version: 4.3.1 +Version: 4.3.2-rc1 Release: 2%{?dist} License: GPL Group: Applications/System diff --git a/update-version b/update-version index b61517911..0ca391fde 100755 --- a/update-version +++ b/update-version @@ -12,10 +12,10 @@ else fi # Current version number -CURRENTVERSION=4.3.1 +CURRENTVERSION=4.3.2-rc1 # Last date -LASTDATE=2017-02-23 +LASTDATE=2017-04-24 if [ "x$1" = "x" ] then From 36770a986d7ac8ed940cffba420b1ae25a3b5956 Mon Sep 17 00:00:00 2001 From: "John C. Frickson" Date: Tue, 9 May 2017 12:02:58 -0500 Subject: [PATCH 099/100] Update --- update-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update-version b/update-version index 0ca391fde..cd6647ebf 100755 --- a/update-version +++ b/update-version @@ -44,7 +44,7 @@ then fi # Update version number and release date in main PHP page -perl -i -p -e "s/this_year = '.*';/this_year = '$YEAR';/;" html/index.php +perl -i -p -e "s/this_year = '.*';/this_year = '$YEAR';/;" html/index.php.in perl -i -p -e "s/this_year = '.*';/this_year = '$YEAR';/;" html/main.php perl -i -p -e "s/releasedate\">.*<\//releasedate\">$LONGDATE<\//;" html/main.php perl -i -p -e "s/this_version = '.*';/this_version = '$newversion';/;" html/main.php From b865e05ae0f2b1d181639b948d5deb640fc65c0b Mon Sep 17 00:00:00 2001 From: "John C. Frickson" Date: Tue, 9 May 2017 12:03:28 -0500 Subject: [PATCH 100/100] Prep for release 4.3.2 --- configure | 4 ++-- configure.ac | 4 ++-- doxy.conf | 2 +- html/main.php | 4 ++-- html/side.php | 2 +- include/common.h | 4 ++-- nagios.spec | 2 +- update-version | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/configure b/configure index ca2d218c2..6fd5a4b04 100755 --- a/configure +++ b/configure @@ -2353,9 +2353,9 @@ ac_config_headers="$ac_config_headers include/config.h lib/snprintf.h lib/iobrok PKG_NAME=nagios -PKG_VERSION="4.3.2-rc1" +PKG_VERSION="4.3.2" PKG_HOME_URL="https://www.nagios.org/" -PKG_REL_DATE="2017-04-24" +PKG_REL_DATE="2017-05-09" ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do diff --git a/configure.ac b/configure.ac index 92c59a4ec..d3a4c7f35 100644 --- a/configure.ac +++ b/configure.ac @@ -10,9 +10,9 @@ AC_PREFIX_DEFAULT(/usr/local/nagios) PKG_NAME=nagios -PKG_VERSION="4.3.2-rc1" +PKG_VERSION="4.3.2" PKG_HOME_URL="https://www.nagios.org/" -PKG_REL_DATE="2017-04-24" +PKG_REL_DATE="2017-05-09" dnl Figure out how to invoke "install" and what install options to use. AC_PROG_INSTALL diff --git a/doxy.conf b/doxy.conf index e081caa1d..36b99bc2a 100644 --- a/doxy.conf +++ b/doxy.conf @@ -1,5 +1,5 @@ PROJECT_NAME = Nagios -PROJECT_NUMBER = 4.3.2-rc1 +PROJECT_NUMBER = 4.3.2 PROJECT_BRIEF = "Dev docs for Nagios core and neb-module hackers" INPUT = lib/ docs/ diff --git a/html/main.php b/html/main.php index db8966541..f29d86f77 100644 --- a/html/main.php +++ b/html/main.php @@ -1,7 +1,7 @@ @@ -140,7 +140,7 @@ function setCoreStatusHTML(image, text) {
Nagios® Core™
Version
-
April 24, 2017
+
May 09, 2017
Check for updates
diff --git a/html/side.php b/html/side.php index 28d0328a7..97893b4d5 100644 --- a/html/side.php +++ b/html/side.php @@ -1,7 +1,7 @@ diff --git a/include/common.h b/include/common.h index 4b6159888..c113b6586 100644 --- a/include/common.h +++ b/include/common.h @@ -24,8 +24,8 @@ #include "shared.h" -#define PROGRAM_VERSION "4.3.2-rc1" -#define PROGRAM_MODIFICATION_DATE "2017-04-24" +#define PROGRAM_VERSION "4.3.2" +#define PROGRAM_MODIFICATION_DATE "2017-05-09" NAGIOS_BEGIN_DECL diff --git a/nagios.spec b/nagios.spec index c3939ca3c..0ed76dd1f 100644 --- a/nagios.spec +++ b/nagios.spec @@ -21,7 +21,7 @@ Summary: Open Source host, service and network monitoring program Name: nagios -Version: 4.3.2-rc1 +Version: 4.3.2 Release: 2%{?dist} License: GPL Group: Applications/System diff --git a/update-version b/update-version index cd6647ebf..7b6c3793f 100755 --- a/update-version +++ b/update-version @@ -12,10 +12,10 @@ else fi # Current version number -CURRENTVERSION=4.3.2-rc1 +CURRENTVERSION=4.3.2 # Last date -LASTDATE=2017-04-24 +LASTDATE=2017-05-09 if [ "x$1" = "x" ] then