[Pkg-nagios-changes] [pkg-icinga2] 01/02: Imported Upstream version 2.5.1

[Alexander Wirt]

This is an automated email from the git hooks/post-receive script.

formorer pushed a commit to branch master
in repository pkg-icinga2.

commit 792b520c8800b96642cd894dddfd409bc8ec8410
Author: Alexander Wirt <alexander.wirt at credativ.de>
Date:   Tue Aug 23 16:55:38 2016 +0200

    Imported Upstream version 2.5.1
---
 ChangeLog                        | 6 ++++++
 doc/1-about.md                   | 6 ++++++
 etc/icinga2/win32/constants.conf | 6 +++++-
 icinga2.nuspec                   | 2 +-
 icinga2.spec                     | 4 ++--
 lib/icinga/checkable-check.cpp   | 2 +-
 tools/chocolateyInstall.ps1      | 4 ++--
 7 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8cadc7b..61d1791 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,12 @@ Please check [doc/1-about.md].
 
 ## What's New
 
+### What's New in Version 2.5.1
+
+#### Bugfixes
+
+* Bug 12517 (Notifications): Icinga 2 sends recovery notifications for SOFT NOT-OK states
+
 ### What's New in Version 2.5.0
 
 #### Changes
diff --git a/doc/1-about.md b/doc/1-about.md
index f5fdb36..77ab0bb 100644
--- a/doc/1-about.md
+++ b/doc/1-about.md
@@ -54,6 +54,12 @@ More details in the [Icinga FAQ](https://www.icinga.org/icinga/faq/).
 
 ## <a id="whats-new"></a> What's New
 
+### What's New in Version 2.5.1
+
+#### Bugfixes
+
+* Bug [12517](https://dev.icinga.org/issues/12517 "Bug 12517") (Notifications): Icinga 2 sends recovery notifications for SOFT NOT-OK states
+
 ### What's New in Version 2.5.0
 
 #### Changes
diff --git a/etc/icinga2/win32/constants.conf b/etc/icinga2/win32/constants.conf
index fa4c774..f793d1d 100644
--- a/etc/icinga2/win32/constants.conf
+++ b/etc/icinga2/win32/constants.conf
@@ -6,12 +6,16 @@
 /* The directory which contains the plugins from the Monitoring Plugins project. */
 const PluginDir = PrefixDir + "/sbin"
 
-
 /* The directory which contains the Manubulon plugins.
  * Check the documentation, chapter "SNMP Manubulon Plugin Check Commands", for details.
  */
 const ManubulonPluginDir = PrefixDir + "/sbin"
 
+/* The directory which you use to store additional plugins which ITL provides user contributed command definitions for.
+ * Check the documentation, chapter "Plugins Contribution", for details.
+ */
+const PluginContribDir = PrefixDir + "/sbin"
+
 /* Our local instance name. By default this is the server's hostname as returned by `hostname --fqdn`.
  * This should be the common name from the API certificate.
  */
diff --git a/icinga2.nuspec b/icinga2.nuspec
index 168f4cf..1624c17 100755
--- a/icinga2.nuspec
+++ b/icinga2.nuspec
@@ -6,7 +6,7 @@
     <!-- Read this before publishing packages to chocolatey.org: https://github.com/chocolatey/chocolatey/wiki/CreatePackages -->
     <id>icinga2</id>
     <title>Icinga2</title>
-    <version>2.5.0</version>
+    <version>2.5.1</version>
     <authors>2016 - The Icinga Project</authors>
     <owners>Icinga Development Team</owners>
     <summary>icinga2 - Monitoring Agent for Windows</summary>
diff --git a/icinga2.spec b/icinga2.spec
index f075f0e..6726d78 100644
--- a/icinga2.spec
+++ b/icinga2.spec
@@ -17,7 +17,7 @@
 # * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
 # ******************************************************************************/
 
-%define revision 3
+%define revision 1
 
 # make sure that _rundir is working on older systems
 %if ! %{defined _rundir}
@@ -66,7 +66,7 @@
 
 Summary: Network monitoring application
 Name: icinga2
-Version: 2.5.0
+Version: 2.5.1
 Release: %{revision}%{?dist}
 License: GPL-2.0+
 Group: Applications/System
diff --git a/lib/icinga/checkable-check.cpp b/lib/icinga/checkable-check.cpp
index 9080d67..a064a80 100644
--- a/lib/icinga/checkable-check.cpp
+++ b/lib/icinga/checkable-check.cpp
@@ -183,7 +183,7 @@ void Checkable::ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrig
 	if (IsStateOK(cr->GetState())) {
 		SetStateType(StateTypeHard); // NOT-OK -> HARD OK
 
-		if (!IsStateOK(old_state))
+		if (old_stateType == StateTypeHard && !IsStateOK(old_state))
 			recovery = true;
 
 		ResetNotificationNumbers();
diff --git a/tools/chocolateyInstall.ps1 b/tools/chocolateyInstall.ps1
index 260f380..d5afe5e 100755
--- a/tools/chocolateyInstall.ps1
+++ b/tools/chocolateyInstall.ps1
@@ -1,7 +1,7 @@
 $packageName = 'icinga2'
 $installerType = 'msi'
-$url32 = 'http://packages.icinga.org/windows/Icinga2-v2.5.0-x86.msi'
-$url64 = 'http://packages.icinga.org/windows/Icinga2-v2.5.0-x86_64.msi'
+$url32 = 'http://packages.icinga.org/windows/Icinga2-v2.5.1-x86.msi'
+$url64 = 'http://packages.icinga.org/windows/Icinga2-v2.5.1-x86_64.msi'
 $silentArgs = '/qn /norestart'
 $validExitCodes = @(0)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icinga2.git