[omd-commits] OMD Git: omd: icinga: update to icinga-1.6.1

git version control git at mathias-kettner.de
Fri Dec 2 18:44:53 CET 2011


Module:   omd
Branch:   master
Commit:   30385e798e40378ede61bd4d7e340208cdf3f540
URL:      http://omdistro.org/projects/omd/repository/revisions/30385e798e40378ede61bd4d7e340208cdf3f540

Author:   Joerg Linge <pitchfork at pnp4nagios.org>
Date:     Fri Dec  2 18:44:17 2011 +0100
Commiter: Joerg Linge <pitchfork at pnp4nagios.org>
Date:     Fri Dec  2 18:44:17 2011 +0100

icinga: update to icinga-1.6.1

---

 Changelog                                          |    2 +-
 packages/icinga/.gitignore                         |    2 +-
 packages/icinga/Makefile                           |   10 ++--
 .../{icinga-1.6.0.tar.gz => icinga-1.6.1.tar.gz}   |  Bin 12879051 -> 12880538 bytes
 packages/icinga/patches/0001-fix-freshness.dif     |   47 --------------------
 5 files changed, 7 insertions(+), 54 deletions(-)

diff --git a/Changelog b/Changelog
index dca2376..250ac52 100644
--- a/Changelog
+++ b/Changelog
@@ -45,7 +45,7 @@ This file documents the revision history for the Open Monitoring Distribution
           - updated to Mod-Gearman 1.1.1
           - updated to Thruk 1.1.4
           - updated to pnp4nagios 0.6.16
-          - updated to Icinga 1.6.0
+          - updated to Icinga 1.6.1
           - Support Ubuntu 11.10 (Oneiric)
           - Cleanup up startscript of nagios
           - New handler for Apache error messages (shows end of logfile)
diff --git a/packages/icinga/.gitignore b/packages/icinga/.gitignore
index 30f65d7..f7c9b24 100644
--- a/packages/icinga/.gitignore
+++ b/packages/icinga/.gitignore
@@ -1 +1 @@
-icinga-1.5.?
+icinga-1.6.?
diff --git a/packages/icinga/Makefile b/packages/icinga/Makefile
index 5221181..1563cf8 100644
--- a/packages/icinga/Makefile
+++ b/packages/icinga/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.omd
 
 NAME = icinga
-VERSION = 1.6.0
+VERSION = 1.6.1
 DIR = $(NAME)-$(VERSION)
 
 # Configure options for Icinga. Since we want to compile
@@ -23,10 +23,10 @@ CONFIGUREOPTS = \
 build:
 	tar xzf $(DIR).tar.gz
 
-	set -e ; for p in patches/*.dif ; do \
-	        echo "applying $$p..." ; \
-		( cd $(DIR) ; patch -p1 -b ) < $$p ; \
-        done
+#	set -e ; for p in patches/*.dif ; do \
+#	        echo "applying $$p..." ; \
+#		( cd $(DIR) ; patch -p1 -b ) < $$p ; \
+#       done
 
 	cd $(DIR) ; ./configure $(CONFIGUREOPTS)
 	$(MAKE) -C $(DIR) all
diff --git a/packages/icinga/icinga-1.6.0.tar.gz b/packages/icinga/icinga-1.6.1.tar.gz
similarity index 60%
rename from packages/icinga/icinga-1.6.0.tar.gz
rename to packages/icinga/icinga-1.6.1.tar.gz
index ec4a18a..ead2168 100644
Binary files a/packages/icinga/icinga-1.6.0.tar.gz and b/packages/icinga/icinga-1.6.1.tar.gz differ
diff --git a/packages/icinga/patches/.gitignore b/packages/icinga/patches/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/packages/icinga/patches/0001-fix-freshness.dif b/packages/icinga/patches/0001-fix-freshness.dif
deleted file mode 100644
index 272d5e1..0000000
--- a/packages/icinga/patches/0001-fix-freshness.dif
+++ /dev/null
@@ -1,47 +0,0 @@
-From fd639042ab3192b8b5abc12f759b4d96bbc0d2fc Mon Sep 17 00:00:00 2001
-From: Michael Friedrich <michael.friedrich at univie.ac.at>
-Date: Thu, 1 Dec 2011 18:27:19 +0100
-Subject: [PATCH] fix-freshness
-
----
- base/checks.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/base/checks.c b/base/checks.c
-index 4d0552c..772f927 100644
---- a/base/checks.c
-+++ b/base/checks.c
-@@ -2297,11 +2297,13 @@ int is_service_result_fresh(service *temp_service, time_t current_time, int log_
- 	 * 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);
- 
-@@ -2717,6 +2719,7 @@ int is_host_result_fresh(host *temp_host, time_t current_time, int log_this) {
-          * 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))
-@@ -2724,6 +2727,7 @@ int is_host_result_fresh(host *temp_host, time_t current_time, int log_this) {
- 			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);
- 
--- 
-1.7.7.3
-
-



More information about the omd-commits mailing list