Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64139 discussions

Check_MK Git: check_mk: Small facelifting of Perf-O-Meters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 24d43ee07e3523216d63090ed0229992c2386806 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24d43ee07e3523… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Apr 24 13:21:30 2011 +0200 Small facelifting of Perf-O-Meters --- web/htdocs/check_mk.css | 39 ++++++++++++++++++++++++++++------ web/htdocs/images/perfometer-bg.png | Bin 0 -> 184 bytes web/plugins/views/perfometer.py | 6 ++++- 3 files changed, 37 insertions(+), 8 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index b79d6f7..da4e328 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -692,7 +692,7 @@ tr.even3 { background-color: #fea; } /* HACK */ table.services tr.data td { border: 1px solid #bbb; - padding: 3px 6px; + padding: 2px 4px; } table.services td.host { @@ -802,22 +802,47 @@ td.count { /* Performeter styling */ -td.perfometer { - padding: 1px 2px; - width: 120px; - height: 22px; - vertical-align: middle; + +table.services tr.data td.perfometer { + padding: 1px 1px 1px 0px; + width: 120px; + height: 22px; + vertical-align: middle; } -td.perfometer div.title { + +td.perfometer div.content { + position: relative; + top: 0px; + left: 1px; + width: 119px; height: 0px; + float: left; + z-index: 20; +} + +td.perfometer div.title { position: relative; top: 3px; left: 0px; width: 120px; + height: 0px; text-align: center; white-space: nowrap; + float: left; + z-index: 40; +} + +td.perfometer img.glass { + position: relative; + top: 1px; + left: 2px; + width: 118px; + height: 22px; + margin-bottom: 1px; + z-index: 30; } + td.perfometer table { width: 120px; height: 22px; diff --git a/web/htdocs/images/perfometer-bg.png b/web/htdocs/images/perfometer-bg.png new file mode 100644 index 0000000..340fe7c Binary files /dev/null and b/web/htdocs/images/perfometer-bg.png differ diff --git a/web/plugins/views/perfometer.py b/web/plugins/views/perfometer.py index f05040f..b839ea2 100644 --- a/web/plugins/views/perfometer.py +++ b/web/plugins/views/perfometer.py @@ -160,12 +160,16 @@ def paint_perfometer(row): try: title, h = perf_painter(row, check_command, perf_data) - content = "<div class=title>%s</div>%s" % (title, h) + content = '<div class=content>%s</div>' % h + content += '<div class=title>%s</div>' % title + content += '<img class=glass src="images/perfometer-bg.png">' + if 'X' in html.display_options: return "perfometer", ('<a href="%s">%s</a>' % (pnp_url(row, "service"), content)) else: return "perfometer", content + except Exception, e: if config.debug: raise

13 years, 4 months

Check_MK Git: check_mk: Fix merging of dictionary default levels

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 28298eb47d889689b93e96fd998d78b215713832 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28298eb47d8896… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Apr 24 13:07:10 2011 +0200 Fix merging of dictionary default levels Handle the case, where the default levels are not a dictionary (e.g. possible for filesystem_default_levels) --- modules/check_mk.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 847a6c1..ec53c54 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3910,7 +3910,9 @@ def compute_check_parameters(host, checktype, item, params): # Merge user's default settings onto it if def_levels_varname in globals(): - new_params.update(eval(def_levels_varname)) + def_levels = eval(def_levels_varname) + if type(def_levels) == dict: + new_params.update(eval(def_levels_varname)) # Merge params from inventory onto it new_params.update(params)

13 years, 4 months

Check_MK Git: check_mk: Updated examples

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c94604e8f7e4b4add0ab5069c448765dee17f3f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c94604e8f7e4b4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Apr 24 11:46:46 2011 +0200 Updated examples --- doc/bi-example-oracle.mk | 4 ++-- doc/bi-example.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/bi-example-oracle.mk b/doc/bi-example-oracle.mk index 424ce7d..436cb61 100644 --- a/doc/bi-example-oracle.mk +++ b/doc/bi-example-oracle.mk @@ -79,7 +79,7 @@ aggregation_rules["cluster_db"] = ( ) aggregations += [ - ( "ORACLE", FOREACH, "([^:]*)", "DB_(.*)", "noncluster_db", ["$1$", "$2$" ] ), - ( "ORACLE", FOREACH, "(.*):(.*)", "DB_(.*)", "cluster_db", ["$1$", "$2$", "$3$" ] ), + ( "ORACLE", FOREACH_SERVICE, "([^:]*)", "DB_(.*)", "noncluster_db", ["$1$", "$2$" ] ), + ( "ORACLE", FOREACH_SERVICE, "(.*):(.*)", "DB_(.*)", "cluster_db", ["$1$", "$2$", "$3$" ] ), ] diff --git a/doc/bi-example.mk b/doc/bi-example.mk index 4ac9d6e..82bed60 100644 --- a/doc/bi-example.mk +++ b/doc/bi-example.mk @@ -23,7 +23,7 @@ aggregation_rules["filesystems"] = ( [ "HOST" ], "worst", [ - ( "$HOST$", "fs_" ), + ( HIDDEN, "$HOST$", "fs_" ), ( "$HOST$", "Mount|Disk" ), ( "multipathing", [ "$HOST$" ]), ] @@ -62,7 +62,7 @@ aggregation_rules["networking"] = ( "worst", [ ( "$HOST$", "NFS" ), - ( FOREACH, "$HOST$", "NIC ([a-z]*).* counters", "nic", [ "$HOST$", "$1$" ] ), + ( FOREACH_SERVICE, "$HOST$", "NIC ([a-z]*).* counters", "nic", [ "$HOST$", "$1$" ] ), ] ) @@ -111,6 +111,6 @@ aggregation_rules["other"] = ( ) aggregations += [ - ( "Hosts", FOREACH, "(.*)", "Check_MK$", "host", ["$1$"] ), + ( "Hosts", FOREACH_HOST, ALL_HOSTS, "host", ["$1$"] ), ]

13 years, 4 months

Check_MK Git: check_mk: BI: make running_on work again

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 059e9f56100c9b17b85bdbce93637591352b6f0e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=059e9f56100c9b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 21 16:31:25 2011 +0200 BI: make running_on work again --- web/htdocs/bi.py | 22 +++++++++++++--------- web/plugins/views/bi.py | 6 +++++- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index fae5fba..ceb010c 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -44,7 +44,7 @@ UNKNOWN = 3 UNAVAIL = 4 service_state_names = { OK:"OK", WARN:"WARN", CRIT:"CRIT", UNKNOWN:"UNKNOWN", PENDING:"PENDING", UNAVAIL:"UNAVAILABLE"} -host_state_names = { OK:"UP", CRIT:"DOWN", UNKNOWN:"UNREACHABLE" } +host_state_names = { 0:"UP", 1:"DOWN", 2:"UNREACHABLE" } # character that separates sites and hosts @@ -669,7 +669,8 @@ def execute_leaf_node(node, status_info): aggr_state = {0:OK, 1:CRIT, 2:UNKNOWN}[host_state] state = {"state":aggr_state, "output" : host_output} if state_assumption != None: - assumed_state = {"state":assumed_state, "output" : "Assumed to be %s" % host_state_names[state_assumption]} + assumed_state = {"state": state_assumption, + "output" : "Assumed to be %s" % host_state_names[state_assumption]} else: assumed_state = None return (state, assumed_state, node) @@ -826,20 +827,23 @@ def aggr_running_on(nodes, regex): first_check = nodes[0] # extract hostname we run on - mo = re.match(regex, first_check[3]) + mo = re.match(regex, first_check[0]["output"]) # if not found, then do normal aggregation with 'worst' if not mo or len(mo.groups()) == 0: - state, text = aggregation_functions['worst'](nodes[1:]) - return state, text + ", running nowhere" + state = aggregation_functions['worst'](nodes[1:]) + state["output"] += ", running nowhere" + return state running_on = mo.groups()[0] - for host_node in nodes[1:]: - if host_node[2] == running_on: - return host_node[0], (host_node[3] + ", running on %s" % running_on) + for state, node in nodes[1:]: + for site, host in node["reqhosts"]: + if host == running_on: + state["output"] += ", running on %s" % running_on + return state # host we run on not found. Strange... - return 3, "running on unknown host '%s'" % running_on + return {"state": UNKNOWN, "output": "running on unknown host '%s'" % running_on } config.aggregation_functions['running_on'] = aggr_running_on diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index 35b0a63..819a75e 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -498,7 +498,11 @@ class BIStatusFilter(Filter): allowed_states.append(s) newrows = [] for row in rows: - if row[self.column]["state"] in allowed_states: + if row[self.column] != None: + s = row[self.column]["state"] + else: + s = None + if s in allowed_states: newrows.append(row) return newrows

13 years, 5 months

Check_MK Git: check_mk: BI: repaired state filters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 25e08e01f3d799aa3c92f7e67b3b010a527ef3e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25e08e01f3d799… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 21 15:13:44 2011 +0200 BI: repaired state filters --- web/plugins/views/bi.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index 868f7ad..35b0a63 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -498,7 +498,7 @@ class BIStatusFilter(Filter): allowed_states.append(s) newrows = [] for row in rows: - if row[self.column] in allowed_states: + if row[self.column]["state"] in allowed_states: newrows.append(row) return newrows

13 years, 5 months

Check_MK Git: check_mk: BI: handle new flag HIDDEN

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e797583e48b624691fd5322057150044466e4ce6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e797583e48b624… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 21 15:06:30 2011 +0200 BI: handle new flag HIDDEN --- web/htdocs/bi.py | 8 +++++--- web/plugins/views/bi.py | 12 ++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 61b1445..fae5fba 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -65,7 +65,7 @@ SITE_SEP = '#' # "host" : host spec for leaf node, # "service" : service name for leaf node, missing if HOST_STATE # "title" : title in case of rule nodes -# "hide" : True if hidden +# "hidden" : True if hidden # "func" : Name of aggregation function for rule nodes # "nodes" : List of subnodes for rule nodes # } @@ -311,11 +311,13 @@ def render_forest(): def render_tree(node, indent = ""): h = "" if node["type"] == NT_LEAF: # leaf node - h += indent + "S/H/S: %s/%s/%s\n" % (node["host"][0], node["host"][1], node.get("service")) + h += indent + "S/H/S: %s/%s/%s%s\n" % (node["host"][0], node["host"][1], node.get("service"), + node.get("hidden") == True and " (hidden)" or "") else: h += indent + "Aggregation:\n" indent += " " h += indent + "Description: %s\n" % node["title"] + h += indent + "Hidden: %s\n" % (node.get("hidden") == True and "yes" or "no") h += indent + "Needed Hosts: %s\n" % " ".join([("%s/%s" % h_s) for h_s in node["reqhosts"]]) h += indent + "Aggregation: %s\n" % node["func"] h += indent + "Nodes:\n" @@ -450,7 +452,7 @@ def compile_aggregation_rule(rule, args, lvl = 0): new_elements = compile_rule_node(rule_parts + (rule_args,), lvl + 1) if hidden: - for element in elements: + for element in new_elements: element["hidden"] = True elements += new_elements diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index a16edd0..868f7ad 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -219,6 +219,7 @@ def filter_tree_only_problems(tree): return state, assumed_state, node, new_subtrees + def paint_aggr_tree_foldable(row): saved_expansion_level, treestate = bi.load_treestate() expansion_level = int(get_painter_option("aggr_expand")) @@ -261,11 +262,9 @@ def paint_aggr_tree_foldable(row): for node in tree[3]: estate = node[1] != None and node[1] or node[0] - if "title" not in node[2]: - html.write("%r"%(node,)) - - new_path = path + [node[2]["title"]] - h += '<li>' + render_subtree(node, new_path, show_host) + '</li>\n' + if not node[2].get("hidden"): + new_path = path + [node[2]["title"]] + h += '<li>' + render_subtree(node, new_path, show_host) + '</li>\n' h += '</ul>' return h + '</span>\n' @@ -298,7 +297,8 @@ def paint_aggr_tree_ltr(row, mirror): def gen_node(tree, height, show_host): leaves = [] for node in tree[3]: - leaves += gen_table(node, height - 1, show_host) + if not node[2].get("hidden"): + leaves += gen_table(node, height - 1, show_host) h = '<div class="aggr tree">' + aggr_render_node(tree, tree[2]["title"], '', show_host) + "</div>" if leaves: leaves[0][2].append((len(leaves), h))

13 years, 5 months

Check_MK Git: check_mk: BI: reorganized internal tree structure

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: dd8b810d36ca995d4fd1d10a5b62aa020898159c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd8b810d36ca99… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 21 11:51:29 2011 +0200 BI: reorganized internal tree structure --- web/.f12 | 4 +- web/htdocs/bi.py | 132 +++++++++++++++++++++++++++++++++++--------------- web/htdocs/config.py | 3 +- 3 files changed, 97 insertions(+), 42 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=dd8b810d36…

13 years, 5 months

Check_MK Git: check_mk: BI: restructured internal tree representation

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 18b730719a577a019563631e16a2724e898575d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18b730719a577a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 21 14:36:39 2011 +0200 BI: restructured internal tree representation --- web/.f12 | 6 +- web/htdocs/bi.py | 276 +++++++++++++++++++++++++++------------------- web/htdocs/index.py | 1 - web/htdocs/views.py | 8 ++- web/plugins/views/bi.py | 100 ++++++++--------- 5 files changed, 220 insertions(+), 171 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=18b730719a…

13 years, 5 months

Check_MK Git: check_mk: BI: fix caching bug, cache was never used

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c459d7324a5df1fb56c26bce502648c54c4be614 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c459d7324a5df1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 20 15:39:33 2011 +0200 BI: fix caching bug, cache was never used --- web/htdocs/bi.py | 33 +++++++++++++++++++-------------- web/plugins/views/bi.py | 2 +- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 8c99898..c26725d 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -103,18 +103,25 @@ def reused_compilation(): # aggregation functions are still left as names. That way the forest # printable (and storable in Python syntax to a file). def compile_forest(user): + global g_cache global g_user_cache new_config_information = cache_needs_update() - if not new_config_information: - cache = g_cache.get(user) - if cache: - # make sure, BI permissions have not changed since last time - if cache["see_all"] == config.may("bi.see_all"): - g_user_cache = cache - global used_cache - used_cache = True - return cache["forest"] + if new_config_information: # config changed are Nagios restarted, clear cache + global g_cache + g_cache = {} + global g_config_information + g_config_information = new_config_information + + # Try to get data from per-user cache: + cache = g_cache.get(user) + if cache: + # make sure, BI permissions have not changed since last time + if cache["see_all"] == config.may("bi.see_all"): + g_user_cache = cache + global used_cache + used_cache = True + return cache["forest"] global did_compilation did_compilation = True @@ -171,10 +178,8 @@ def compile_forest(user): entries.append((group, aggr)) cache["affected_services"][s] = entries - # Remember successful compile in cache - global g_config_information - g_config_information = new_config_information - g_cache[user] = cache + # Remember successful compile in cache + g_cache[user] = cache # Execute an aggregation rule, but prepare arguments @@ -930,7 +935,7 @@ def status_tree_depth(tree): def is_part_of_aggregation(h, what, site, host, service): global html html = h - compile_forest(html) + compile_forest(html.req.user) if what == "host": return (site, host) in g_user_cache["affected_hosts"] else: diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index 8d82f60..056f079 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -369,7 +369,7 @@ class BIGroupFilter(Filter): def display(self): bi.html = html - bi.compile_forest() + bi.compile_forest(html.req.user) htmlvar = self.htmlvars[0] html.select(htmlvar, [(g,g) for g in bi.g_user_cache["forest"].keys()])

13 years, 5 months

Check_MK Git: check_mk: FIX: webservice: suppress livestatus errors in multi-site setups

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8c919e9b7fa190e45f24d894f9615110b2513eb6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c919e9b7fa190… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 20 16:10:32 2011 +0200 FIX: webservice: suppress livestatus errors in multi-site setups --- ChangeLog | 1 + web/htdocs/views.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6dbf430..b765fdd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ * --debug now implies -v Multisite: + * FIX: webservice: suppress livestatus errors in multi-site setups * FIX: install missing example icons in web/htdocs/images/icons * FIX: Nagios-Snapin: avoid duplicate slash in URL * FIX: custom_style_sheet now also honored by sidebar diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 53458fd..27dbd14 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1189,8 +1189,9 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru play_alarm_sounds() # In multi site setups error messages of single sites do not block the - # output and raise now exception. We simply print error messages here: - if config.show_livestatus_errors: + # output and raise now exception. We simply print error messages here. + # In case of the web service we show errors only on single site installations. + if config.show_livestatus_errors and (html.output_format == "html" or not config.is_multisite()): for sitename, info in html.live.deadsites.items(): html.show_error("<b>%s - Livestatus error</b><br>%s" % (info["site"]["alias"], info["exception"]))

13 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits