Imported Upstream version 1.6.1

Changelog

@@ -4,6 +4,14 @@ Icinga 1.6.x Change Log
 
 Thanks to all contributers, testers and developers. Please read AUTHORS and THANKS for a detailed list :-)
 
+1.6.1 - 02/12/2011
+
+FIXES
+* core: fix freshness checks are generating stale alerts, even if result was received in time #2136
+
+CHANGES
+
+
 1.6.0 - 30/11/2011
 
 ENHANCEMENTS

Makefile.in

@@ -77,7 +77,7 @@ MKDIR=/bin/mkdir
 ###############################
 # Global
 ###############################
-ICINGA_VERSION=1.6.0
+ICINGA_VERSION=1.6.1
 
 CP=@CP@
 

base/checks.c

@@ -2286,23 +2286,6 @@ int is_service_result_fresh(service *temp_service, time_t current_time, int log_
 	else
 		expiration_time = (time_t)(temp_service->last_check + freshness_threshold);
 
-	/*
-	 * ADDED 22-10-2011 MF, Patch by Andreas Ericsson
-	 * If the check was last done passively, we assume it's going
-	 * to continue that way and we need to handle the fact that
-	 * Icinga might have been shut off for quite a long time. If so,
-	 * we mustn't spam freshness notifications but use program_start_time
-	 * instead of last_check to determine freshness expiration time.
-	 * The threshold for "long time" is determined as 61.8% of the normal
-	 * freshness threshold based on vast heuristical research (ie, "some
-	 * guy once told me the golden ratio is good for loads of stuff").
-	 */
-	if (temp_service->check_type == SERVICE_CHECK_PASSIVE) {
-		if (event_start < program_start + 60 &&	event_start - last_program_stop < (freshness_threshold * 0.618)) {
-			expiration_time = event_start + freshness_threshold;
-		}
-	}
-
 	log_debug_info(DEBUGL_CHECKS, 2, "HBC: %d, PS: %lu, ES: %lu, LC: %lu, CT: %lu, ET: %lu\n", temp_service->has_been_checked, (unsigned long)program_start, (unsigned long)event_start, (unsigned long)temp_service->last_check, (unsigned long)current_time, (unsigned long)expiration_time);
 
 	/* the results for the last check of this service are stale */
@@ -2706,25 +2689,6 @@ int is_host_result_fresh(host *temp_host, time_t current_time, int log_this) {
 	else
 		expiration_time = (time_t)(temp_host->last_check + freshness_threshold);
 
-        /*
-         * ADDED 22-10-2011 MF, Patch by Andreas Ericsson
-         * If the check was last done passively, we assume it's going
-         * to continue that way and we need to handle the fact that
-         * Icinga might have been shut off for quite a long time. If so,
-         * we mustn't spam freshness notifications but use program_start_time
-         * instead of last_check to determine freshness expiration time.
-         * The threshold for "long time" is determined as 61.8% of the normal
-         * freshness threshold based on vast heuristical research (ie, "some
-         * guy once told me the golden ratio is good for loads of stuff").
-         */
-	if (temp_host->check_type == HOST_CHECK_PASSIVE) {
-		if (event_start < program_start + 60 &&
-			event_start - last_program_stop < (freshness_threshold * 0.618))
-		{
-			expiration_time = event_start + freshness_threshold;
-		}
-	}
-
 	log_debug_info(DEBUGL_CHECKS, 2, "HBC: %d, PS: %lu, ES: %lu, LC: %lu, CT: %lu, ET: %lu\n", temp_host->has_been_checked, (unsigned long)program_start, (unsigned long)event_start, (unsigned long)temp_host->last_check, (unsigned long)current_time, (unsigned long)expiration_time);
 
 	/* the results for the last check of this host are stale */

configure

@@ -2421,9 +2421,9 @@ ac_config_headers="$ac_config_headers include/config.h include/snprintf.h"
 
 
 PKG_NAME=icinga-core
-PKG_VERSION="1.6.0"
+PKG_VERSION="1.6.1"
 PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="11-30-2011"
+PKG_REL_DATE="12-02-2011"
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do

configure.in

@@ -9,9 +9,9 @@ AC_CONFIG_HEADER(include/config.h include/snprintf.h)
 AC_PREFIX_DEFAULT(/usr/local/icinga)
 
 PKG_NAME=icinga-core
-PKG_VERSION="1.6.0"
+PKG_VERSION="1.6.1"
 PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="11-30-2011"
+PKG_REL_DATE="12-02-2011"
 
 dnl Figure out how to invoke "install" and what install options to use.
 AC_PROG_INSTALL

html/main.html

@@ -18,9 +18,9 @@
 </div>
 
 <div id="currentversioninfo">
-<div class="version">Version 1.6.0</div>
-<div class="releasedate">November 30, 2011</div>
-<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.6.0</a></div>
+<div class="version">Version 1.6.1</div>
+<div class="releasedate">Dezember 02, 2011</div>
+<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.6.1</a></div>
 </div>
 
 <div id="developer">

icinga.spec

@@ -14,7 +14,7 @@
 
 Summary: Open Source host, service and network monitoring program
 Name: icinga
-Version: 1.6.0
+Version: 1.6.1
 Release: 1%{?dist}
 License: GPLv2
 Group: Applications/System
@@ -247,6 +247,9 @@ fi
 %{_bindir}/idomod.o
 
 %changelog
+* Fri Dec 02 2011 Michael Friedrich <michael.friedrich@univie.ac.at> - 1.6.1-1
+- bump to 1.6.1
+
 * Sun Nov 27 2011 Michael Friedrich <michael.friedrich@univie.ac.at> - 1.6.0-1
 - set to 1.6.0 target
 - add --with-web-user/group

include/common.h

@@ -27,8 +27,8 @@
 #define PROGRAM_NAME "Icinga"
 #define PROGRAM_NAME_UC "ICINGA"
 #define PROGRAM_NAME_LC "icinga"
-#define PROGRAM_VERSION "1.6.0"
-#define PROGRAM_MODIFICATION_DATE "11-30-2011"
+#define PROGRAM_VERSION "1.6.1"
+#define PROGRAM_MODIFICATION_DATE "12-02-2011"
 
 /*#define DEBUG_CHECK_IPC 1 */
 /*#define DEBUG_CHECK_IPC2 1*/

module/idoutils/include/common.h

@@ -22,8 +22,8 @@
 #define LOG2IDO_NAME 		"LOG2IDO"
 
 /* only one space for update-version matching */
-#define IDO_DATE "11-30-2011"
-#define IDO_VERSION "1.6.0"
+#define IDO_DATE "12-02-2011"
+#define IDO_VERSION "1.6.1"
 
 #define IDO_SCHEMA_VERSION "1.6.0"
 

update-version

@@ -10,10 +10,10 @@ else
 fi
 
 # Current version number
-CURRENTVERSION=1.6.0
+CURRENTVERSION=1.6.1
 
 # Last date
-LASTDATE=11-30-2011
+LASTDATE=12-02-2011
 
 if [ "x$1" = "x" ]
 then