Module: check_mk
Branch: master
Commit: 9c0c89a67bb77c86f1c44f83329e54f64ff24724
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c0c89a67bb77c…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Dec 6 15:42:14 2011 +0100
WATO: fix three tag-dependency problems
---
web/htdocs/wato.py | 9 ++++++---
web/plugins/wato/check_parameters.py | 3 ++-
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index ecc3987..e479174 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -9093,7 +9093,8 @@ def construct_rule(ruleset, value, tag_specs, host_list,
item_list):
def tag_alias(tag):
- for id, title, tags in config.wato_host_tags:
+ for entry in config.wato_host_tags:
+ id, title, tags = entry[:3]
for t in tags:
if t[0] == tag:
return t[1]
@@ -9187,7 +9188,8 @@ def ruleeditor_hover_code(varname, rulenr, mode, boolval,
folder=None):
def get_rule_conditions(ruleset):
# Tag list
tag_list = []
- for id, title, tags in config.wato_host_tags:
+ for entry in config.wato_host_tags:
+ id, title, tags = entry[:3]
mode = html.var("tag_" + id)
tagvalue = html.var("tagvalue_" + id)
if mode == "is":
@@ -9345,7 +9347,8 @@ def mode_edit_rule(phase):
"to your <tt>multisite.mk</tt>. You will find an
example there."))
else:
html.write("<table>")
- for id, title, tags in config.wato_host_tags:
+ for entry in config.wato_host_tags:
+ id, title, tags = entry[:3]
html.write("<tr><td>%s: </td>" %
title)
default_tag = None
ignore = True
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index b14c81e..06ec33c 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -73,7 +73,8 @@ register_rule(group,
"of how many packets have been received yet."),
minvalue = 1,
)),
- ]))
+ ]),
+ match="dict")
checkgroups = []
checkgroups.append((