Module: check_mk
Branch: master
Commit: c3702f776df8dc87b8495b864ece66bdbd26f2db
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3702f776df8dc…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Sep 17 15:17:18 2014 +0200
#1402 FIX Fixed cased where counting events did not reach required count
This bug was found and fixed by Andreas Döhler!
---
.werks/1402 | 9 +++++++++
ChangeLog | 1 +
mkeventd/bin/mkeventd | 2 +-
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/.werks/1402 b/.werks/1402
new file mode 100644
index 0000000..9f7dc27
--- /dev/null
+++ b/.werks/1402
@@ -0,0 +1,9 @@
+Title: Fixed cased where counting events did not reach required count
+Level: 2
+Component: ec
+Compatible: compat
+Version: 1.2.5i6
+Date: 1410959775
+Class: fix
+
+This bug was found and fixed by Andreas Döhler!
diff --git a/ChangeLog b/ChangeLog
index c73328e..49e2596 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -133,6 +133,7 @@
* 1395 Event Console can now create notifications via Check_MK RBN...
* 1007 FIX: check_mkevents: fix case where events contain binary zeroes
* 1399 FIX: Fix left-over tac processes when showing Event Console history...
+ * 1402 FIX: Fixed cased where counting events did not reach required count...
HW/SW-Inventory:
* 0643 windows inventory: OS now contains the install date, reg_uninstall now
contains the path...
diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd
index ee18dc5..9a59be8 100755
--- a/mkeventd/bin/mkeventd
+++ b/mkeventd/bin/mkeventd
@@ -1206,7 +1206,7 @@ class EventServer:
if event["first"] + count["period"] <=
now: # End of period reached
log("Rule %s: reached only %d out of %d events within %d
seconds. "
"Resetting to zero." % (rule["id"],
event["count"], count["count"], count["period"]))
- event["phase"] = closed
+ event["phase"] = "closed"
log_event_history(event, "COUNTFAILED")
events_to_delete.append(nr)