Module: check_mk
Branch: master
Commit: ae43066386f90e912f387e904cffeffeec922c90
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae43066386f90e…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Aug 28 16:19:32 2013 +0200
FIX: Fixed exception when enabling sounds for log based views
Conflicts:
ChangeLog
---
ChangeLog | 3 +++
web/htdocs/views.py | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d4382f9..40bb853 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -314,6 +314,9 @@
* FIX: Fixed missing roles in auth.php (in some cases) which resulted in
non visible pnp graphs and missing nagvis permissions
* FIX: Fixed label color of black toner perfometers when fuel is low
+ * FIX: Fixed wrong default settings of view filters in localized multisite
+ * FIX: Fixed exception when enabling sounds for views relying on
+ e.g. alert statistics source
WATO:
* FIX: fix layout of Auxiliary tags table
diff --git a/web/htdocs/views.py b/web/htdocs/views.py
index 9b7e035..afa9c64 100644
--- a/web/htdocs/views.py
+++ b/web/htdocs/views.py
@@ -2582,10 +2582,10 @@ def register_events(row):
if config.sounds != []:
host_state = row.get("host_hard_state",
row.get("host_state"))
if host_state != None:
- html.register_event({0:"up", 1:"down",
2:"unreachable"}[host_state])
+ html.register_event({0:"up", 1:"down",
2:"unreachable"}[saveint(host_state)])
svc_state = row.get("service_last_hard_state",
row.get("service_state"))
if svc_state != None:
- html.register_event({0:"up", 1:"warning",
2:"critical", 3:"unknown"}[svc_state])
+ html.register_event({0:"up", 1:"warning",
2:"critical", 3:"unknown"}[saveint(svc_state)])
# The Group-value of a row is used for deciding wether
# two rows are in the same group or not