Checkmk git commits April 2011

checkmk-commits@lists.checkmk.com

2 participants
103 discussions

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

Check_MK Git: check_mk: BI: new aggregation function "running_on"

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cba3ad40dba5d99316c2569efba33bc88eea96e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cba3ad40dba5d9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 20 18:30:31 2011 +0200 BI: new aggregation function "running_on" --- web/htdocs/bi.py | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index c26725d..1f615e8 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -717,6 +717,30 @@ def aggr_best(nodes, n = 1, worst_state = CRIT): config.aggregation_functions["worst"] = aggr_worst config.aggregation_functions["best"] = aggr_best +import re + +def aggr_running_on(nodes, regex): + first_check = nodes[0] + + # extract hostname we run on + mo = re.match(regex, first_check[3]) + + # 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" + + 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) + + # host we run on not found. Strange... + return 3, "running on unknown host '%s'" % running_on + +config.aggregation_functions['running_on'] = aggr_running_on + + # ____ # | _ \ __ _ __ _ ___ ___ # | |_) / _` |/ _` |/ _ \/ __|

13 years, 5 months

Check_MK Git: check_mk: FIX: cisco_temp_perf: handle sensors without names correctly

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d30b24d248fab154b1decd2be3f5d47d84bcfbdc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d30b24d248fab1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 20 11:01:57 2011 +0200 FIX: cisco_temp_perf: handle sensors without names correctly --- ChangeLog | 1 + checks/cisco_temp_perf | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0994c75..4833744 100644 --- a/ChangeLog +++ b/ChangeLog @@ -53,6 +53,7 @@ * FIX: fc_brocade_port_detailed: fix PNP template in MULTIPLE mode * FIX: ad_replication.bat only generates output on domain controllers now. This is useful to prevent checks on non DC hosts (Thanks to Alex Greenwood) + * FIX: cisco_temp_perf: handle sensors without names correctly * printer_supply: Changed order of tests. When a printer reports -3 this is used before the check if maxlevel is -2. * printer_supply: Skipping inventory of supplies which have current value diff --git a/checks/cisco_temp_perf b/checks/cisco_temp_perf index aa042ae..e441a1d 100644 --- a/checks/cisco_temp_perf +++ b/checks/cisco_temp_perf @@ -56,11 +56,17 @@ cisco_temp_perf_envmon_states = { } def inventory_cisco_temp_perf(checkname, info): - return [ (line[0], None) for line in info if len(line) == 4 ] + inventory = [] + for line in info: + name = line[0] + if name == "": + name = line[4] + inventory.append((name, None)) + return inventory def check_cisco_temp_perf(item, params, info): for line in info: - if line[0] == item: + if line[0] == item or line[4] == item: temp = saveint(line[1]) if temp != 0: perfdata = [("temp", temp)] @@ -81,8 +87,8 @@ def check_cisco_temp_perf(item, params, info): return (2, "CRIT - state is %s%s" % (statename, temptext), perfdata) return (3, "UNKNOWN - Item %s not found in SNMP data" % item) -check_info['cisco_temp_perf'] = (check_cisco_temp_perf, "%s", 1, inventory_cisco_temp_perf) -snmp_info['cisco_temp_perf'] = ( ".1.3.6.1.4.1.9.9.13.1.3.1", [ 2, 3, 4, 6 ] ) # CISCO-SMI +check_info['cisco_temp_perf'] = (check_cisco_temp_perf, "Temperature %s", 1, inventory_cisco_temp_perf) +snmp_info['cisco_temp_perf'] = ( ".1.3.6.1.4.1.9.9.13.1.3.1", [ 2, 3, 4, 6, OID_END ] ) # CISCO-SMI snmp_scan_functions['cisco_temp_perf'] = \ lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() and \ oid(".1.3.6.1.4.1.9.9.13.1.3.1.3.*") != None

13 years, 5 months

Check_MK Git: check_mk: Reserved 20 bug IDS

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e642efa051cf5d4b48374976d39231984244f168 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e642efa051cf5d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 20 10:48:20 2011 +0200 Reserved 20 bug IDS --- .bugs/first_free | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.bugs/first_free b/.bugs/first_free index 4fc233b..1473a88 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -261 +281

13 years, 5 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6ca02ff362e83ac761986904794e9917e467b8f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ca02ff362e83a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 20 11:01:18 2011 +0200 Updated bug entries --- .bugs/261 | 13 +++++++++++++ .bugs/262 | 10 ++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/.bugs/261 b/.bugs/261 new file mode 100644 index 0000000..21fb7e5 --- /dev/null +++ b/.bugs/261 @@ -0,0 +1,13 @@ +Title: unifiy all temperature checks +Component: checks +Benefit: 2 +State: open +Cost: 2 +Date: 2011-04-20 10:48:22 +Class: cleanup + +There are already a lot of temperature checks. *Each* of them +uses a different scheme for the service description. Make +all checks use "Temperature %s". Also use a common PNP-template +that handles a missing WARN/CRIT. Maybe use a common code base, +if this makes sense. diff --git a/.bugs/262 b/.bugs/262 new file mode 100644 index 0000000..0921779 --- /dev/null +++ b/.bugs/262 @@ -0,0 +1,10 @@ +Title: Speed up use of stored snmpwalks +Component: core +Benefit: 1 +State: open +Cost: 1 +Date: 2011-04-20 10:50:15 +Class: feature + +For large walks it takes almost for ever to make an inventory. +Use an in-memory cache.

13 years, 5 months

← Newer
1
2
3
4
5
6
7
...
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2011