Module: check_mk
Branch: master
Commit: be082dc1f13612b0e3562cddd60d32de42641503
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be082dc1f13612…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Apr 15 15:30:29 2011 +0200
BI: better error message, when rules are missing
---
web/htdocs/bi.py | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py
index 3fb867b..0f8b294 100644
--- a/web/htdocs/bi.py
+++ b/web/htdocs/bi.py
@@ -258,7 +258,12 @@ def compile_aggregation(rule, args, lvl = 0):
if node[1] == config.HOST_STATE or type(node[1]) == str: # leaf node
new_elements = compile_leaf_node(arginfo, node[0], node[1])
else:
- rule = config.aggregation_rules[node[0]]
+ rule = config.aggregation_rules.get(node[0])
+ if not rule:
+ raise MKConfigError("<h1>Missing rule</h1>"
+ "The rule '%s' calls the rule <tt>%s</tt>, but
that is not defined." %
+ (description, node[0]))
+
instargs = compile_args([ instantiate(arg, arginfo)[0] for arg in node[1] ])
new_elements = compile_aggregation(rule, instargs, lvl + 1)