Module: check_mk
Branch: master
Commit: 4acd89ee724954ef5bf7d235e5c978754d34cb90
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4acd89ee724954…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Jul 12 15:37:27 2012 +0200
Fixed problem after latest BI improvement
---
web/htdocs/bi.py | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py
index 14689d3..d293ab3 100644
--- a/web/htdocs/bi.py
+++ b/web/htdocs/bi.py
@@ -121,7 +121,7 @@ def load_services():
tags = vars.get("TAGS", "").split(" ")
entry = (tags, svcs, childs, parents)
services[(site, host)] = entry
- services_by_hostname.setdefault(host, []).append(entry)
+ services_by_hostname.setdefault(host, []).append((site, entry))
return services, services_by_hostname
@@ -288,10 +288,10 @@ def find_matching_services(what, calllist):
if host_re.startswith("^(") and host_re.endswith(")$"):
middle = host_re[2:-2]
if middle in g_user_cache["services_by_hostname"]:
- entries = [ (("", host_re), entry) for entry in
g_user_cache["services_by_hostname"][middle] ]
+ entries = [ ((e[0], host_re), e[1]) for e in
g_user_cache["services_by_hostname"][middle] ]
host_re = "(.*)"
elif not honor_site and not '*' in host_re and not '$' in host_re and
not '|' in host_re:
- entries = [ (("", host_re), entry) for entry in
g_user_cache["services_by_hostname"][host_re] ]
+ entries = [ ((e[0], host_re), e[1]) for e in
g_user_cache["services_by_hostname"][host_re] ]
else:
entries = g_user_cache["services"].items()
@@ -621,7 +621,7 @@ def compile_leaf_node(host_re, service_re = config.HOST_STATE):
found = []
honor_site = SITE_SEP in host_re
if not honor_site and not '*' in host_re and not '$' in host_re and
not '|' in host_re:
- entries = [ (("", host_re), entry) for entry in
g_user_cache["services_by_hostname"][host_re] ]
+ entries = [ ((e[0], host_re), e[1]) for e in
g_user_cache["services_by_hostname"][host_re] ]
else:
entries = g_user_cache["services"].items()