22 Jul
2014
22 Jul
'14
2:31 p.m.
Module: check_mk
Branch: master
Commit: 472e57edbda5ab1edcf05d38adab0302041138bc
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=472e57edbda5ab…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Jul 22 14:30:58 2014 +0200
Virtual Host Tree: Allow to use topic as tree level
The <i>Virtual Host Tree</i> snapin now allows not only to use tag groups but
also <b>topics</b>
as tree levels. A topic can only be used if:
<ul>
<li>It contains just <i>Checkbox</i>-tags (tags with only once
choicee)</li>
<li>It contains at least two entries.</li>
</ul>
The idea is to make the typical <i>Applications</i> topic usable as a tree
level. The
tree then shows all the different applications. Note: this usually leads to hosts being
contained in several branches of the tree (if they have several applications) and other
hosts not being contained at all (if the do not have at least one application).
---
.werks/1047 | 19 ++++++
ChangeLog | 1 +
web/plugins/sidebar/shipped.py | 100 +++++++++++++++++++++-------
web/plugins/wato/check_mk_configuration.py | 18 +++++
4 files changed, 113 insertions(+), 25 deletions(-)
diff --git a/.werks/1047 b/.werks/1047
new file mode 100644
index 0000000..9c382e4
--- /dev/null
+++ b/.werks/1047
@@ -0,0 +1,19 @@
+Title: Virtual Host Tree: Allow to use topic as tree level
+Level: 2
+Component: multisite
+Version: 1.2.5i5
+Date: 1406032104
+Class: feature
+
+The <i>Virtual Host Tree</i> snapin now allows not only to use tag groups but
also <b>topics</b>
+as tree levels. A topic can only be used if:
+
+<ul>
+<li>It contains just <i>Checkbox</i>-tags (tags with only once
choicee)</li>
+<li>It contains at least two entries.</li>
+</ul>
+
+The idea is to make the typical <i>Applications</i> topic usable as a tree
level. The
+tree then shows all the different applications. Note: this usually leads to hosts being
+contained in several branches of the tree (if they have several applications) and other
+hosts not being contained at all (if the do not have at least one application).
diff --git a/ChangeLog b/ChangeLog
index 5b6b80c..a8a4bbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -70,6 +70,7 @@
* 0949 quicksearch: now able to search for multiple hosts at once...
* 1052 SEC: index start URL can not be used to redirect to absolute URLs anymore...
* 1085 quicksearch: multiple hostname matches now lead to the searchhost view instead
of the hosts view...
+ * 1047 Virtual Host Tree: Allow to use topic as tree level...
* 0945 FIX: Sidebar snapin "Problem hosts": Now excludes hosts and services
in downtime
* 1036 FIX: doc/treasures/downtime: fix --url option, better error output
* 1074 FIX: Fix Virtual Host Tree snapin...
diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py
index d98a9fc..05f3eeb 100644
--- a/web/plugins/sidebar/shipped.py
+++ b/web/plugins/sidebar/shipped.py
@@ -1214,6 +1214,11 @@ if defaults.omd_root:
# | |
# '----------------------------------------------------------------------'
+def parse_hosttag_title(title):
+ if '/' in title:
+ return title.split('/', 1)
+ else:
+ return None, title
def compute_tag_tree(taglist):
html.live.set_prepend_site(True)
@@ -1235,11 +1240,17 @@ def compute_tag_tree(taglist):
# No empty entry found -> get default (i.e. first entry)
return groupentries[0][:2]
+ # Prepare list of host tag groups and topics
taggroups = {}
+ topics = {}
for entry in config.wato_host_tags:
- groupname = entry[0]
- grouptitle = entry[1]
- group = entry[2]
+ grouptitle = entry[1]
+ if '/' in grouptitle:
+ topic, grouptitle = grouptitle.split("/", 1)
+ topics.setdefault(topic, []).append(entry)
+
+ groupname = entry[0]
+ group = entry[2]
taggroups[groupname] = group
tree = {}
@@ -1261,24 +1272,53 @@ def compute_tag_tree(taglist):
have_svc_problems = True
tags = custom_variables.get("TAGS", []).split()
- tree_entry = tree
+
+ tree_entry = tree # Start at top node
+
+ # Now go through the levels of the tree. Each level may either be
+ # - a tag group id, or
+ # - "topic:" plus the name of a tag topic. That topic should only
contain
+ # checkbox tags.
+ # The problem with the "topic" entries is, that a host may appear
several
+ # times!
+
+ current_branches = [ tree ]
+
for tag in taglist:
- if tag not in taggroups:
- continue # Configuration error. User deleted tag group after configuring
his tree
- tag_value, tag_title = get_tag_group_value(taggroups[tag], tags)
- tree_entry = tree_entry.setdefault((tag_title, tag_value), {})
-
- if not tree_entry:
- tree_entry.update({
- "_num_hosts" : 0,
- "_state" : 0,
- })
- tree_entry["_num_hosts"] += 1
- tree_entry["_svc_problems"] = tree_entry.get("_svc_problems",
False) or have_svc_problems
- if state == 2 or tree_entry["_state"] == 2:
- tree_entry["_state"] = 2
- else:
- tree_entry["_state"] = max(state, tree_entry["_state"])
+ new_current_branches = []
+ for tree_entry in current_branches:
+ if tag.startswith("topic:"):
+ topic = tag[6:]
+ if topic in topics: # Could have vanished
+ # Iterate over all host tag groups with that topic
+ for entry in topics[topic]:
+ grouptitle = entry[1].split("/", 1)[1]
+ group = entry[2]
+ for tagentry in group:
+ tag_value, tag_title = tagentry[:2]
+ if tag_value in tags:
+
new_current_branches.append(tree_entry.setdefault((tag_title, tag_value), {}))
+
+ else:
+ if tag not in taggroups:
+ continue # Configuration error. User deleted tag group after
configuring his tree
+ tag_value, tag_title = get_tag_group_value(taggroups[tag], tags)
+ new_current_branches.append(tree_entry.setdefault((tag_title,
tag_value), {}))
+
+ current_branches = new_current_branches
+
+ for tree_entry in new_current_branches:
+ if not tree_entry:
+ tree_entry.update({
+ "_num_hosts" : 0,
+ "_state" : 0,
+ })
+ tree_entry["_num_hosts"] += 1
+ tree_entry["_svc_problems"] =
tree_entry.get("_svc_problems", False) or have_svc_problems
+ if state == 2 or tree_entry["_state"] == 2:
+ tree_entry["_state"] = 2
+ else:
+ tree_entry["_state"] = max(state,
tree_entry["_state"])
return tree
@@ -1305,10 +1345,22 @@ def tag_tree_url(taggroups, taglist, viewname):
urlvars = [("view_name", viewname), ("filled_in",
"filter")]
if viewname == "svcproblems":
urlvars += [ ("st1", "on"), ("st2",
"on"), ("st3", "on") ]
+
for nr, (group, tag) in enumerate(zip(taggroups, taglist)):
- urlvars.append(("host_tag_%d_grp" % nr, group))
- urlvars.append(("host_tag_%d_op" % nr, "is"))
- urlvars.append(("host_tag_%d_val" % nr, tag or ""))
+ if group.startswith("topic:"):
+ # Find correct tag group for this tag
+ for entry in config.wato_host_tags:
+ for tagentry in entry[2]:
+ if tagentry[0] == tag: # Found our tag
+ taggroup = entry[0]
+ urlvars.append(("host_tag_%d_grp" % nr, taggroup))
+ urlvars.append(("host_tag_%d_op" % nr,
"is"))
+ urlvars.append(("host_tag_%d_val" % nr, tag))
+ break
+ else:
+ urlvars.append(("host_tag_%d_grp" % nr, group))
+ urlvars.append(("host_tag_%d_op" % nr, "is"))
+ urlvars.append(("host_tag_%d_val" % nr, tag or ""))
return html.makeuri_contextless(urlvars, "view.py")
def tag_tree_bullet(state, path, leaf):
@@ -1419,8 +1471,6 @@ def render_tag_tree():
title, taggroups = config.virtual_host_trees[tree_conf["tree"]]
tree = compute_tag_tree(taggroups)
-
-
render_tag_tree_level(taggroups, [], cwd, _("Virtual Host Tree"), tree)
sidebar_snapins["tag_tree"] = {
diff --git a/web/plugins/wato/check_mk_configuration.py
b/web/plugins/wato/check_mk_configuration.py
index a550b26..654504b 100644
--- a/web/plugins/wato/check_mk_configuration.py
+++ b/web/plugins/wato/check_mk_configuration.py
@@ -245,11 +245,29 @@ register_configvar(group,
def wato_host_tag_group_choices():
+ # We add to the choices:
+ # 1. All host tag groups with their id
+ # 2. All *topics* that:
+ # - consist only of checkbox tags
+ # - contain at least two entries
choices = []
+ by_topic = {}
for entry in config.wato_host_tags:
tgid = entry[0]
topic, tit = parse_hosttag_title(entry[1])
choices.append((tgid, tit))
+ by_topic.setdefault(topic, []).append(entry)
+
+ # Now search for checkbox-only-topics
+ for topic, entries in by_topic.items():
+ for entry in entries:
+ tgid, title, tags = entry
+ if len(tags) != 1:
+ break
+ else:
+ if len(entries) > 1:
+ choices.append(("topic:" + topic, _("Topic") +
": " + topic))
+
return choices