[icinga-checkins] icinga.org: icinga-core/dev/ido: core: fix wrong escalation notification due to state based escalation range behaviour changes

git at icinga.org git at icinga.org
Wed Nov 28 15:58:05 CET 2012


Module: icinga-core
Branch: dev/ido
Commit: a881643f0422dd39bbabb6c39a549f439f077e13
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=a881643f0422dd39bbabb6c39a549f439f077e13

Author: Michael Friedrich <michael.friedrich at gmail.com>
Date:   Mon Nov 26 00:04:18 2012 +0100

core: fix wrong escalation notification due to state based escalation range behaviour changes

re-enabling the state based escalation ranges lead into a weird
behavorial change, as the general "is the escalation valid for a
notification" condition was met, but another filter was added (the state
checks and their counters).
Since the default users do not use state based escalation ranges, there
is no other way revoking that behaviour change than making this fully
optional, and reverting to the old known default behaviour by
introducing a new config option, which remains disabled by default.

enable_state_based_escalation_ranges=0

this may not be the best idea within a bugfix release either, but still
it allows those actually wanting to use the state based escalation
ranges to use it without recompiling as we had the request to change
within #2878 already.

reverting to the old known behaviour will probably fix #3441 as well, as
it turns out to be the possible root cause for the faulty condition
checks when an escalation is valid for a notification.

refs #2878
refs #3441

---

 Changelog                                          |    3 +
 base/config.c                                      |   11 +
 base/icinga.c                                      |    2 +
 base/notifications.c                               |  176 ++++++++++--------
 sample-config/icinga.cfg.in                        |   14 ++
 .../updates/icinga.cfg_added_1.7_to_1.8.cfg        |   13 ++
 t-tap/test_icinga_config.c                         |    1 +
 t-tap/test_timeperiods.c                           |    1 +
 tests/etc/3441.cfg                                 |  196 ++++++++++++++++++++
 9 files changed, 335 insertions(+), 82 deletions(-)

Diff:   https://git.icinga.org/?p=icinga-core.git;a=commitdiff;h=a881643f0422dd39bbabb6c39a549f439f077e13




More information about the icinga-checkins mailing list