Checkmk git commits March 2013

checkmk-commits@lists.checkmk.com

3 participants
209 discussions

Check_MK Git: check_mk: FIX: speedup for single host tables joined by hostname

by Mathias Kettner

Module: check_mk Branch: master Commit: 6e1c25443e26021de1580a0e436ed8e9cdb24ab6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e1c25443e2602… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 14 14:49:03 2013 +0100 FIX: speedup for single host tables joined by hostname Conflicts: ChangeLog --- ChangeLog | 5 +++++ web/htdocs/bi.py | 44 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bb510cd..b383c3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -94,6 +94,11 @@ * Quicksearch: allow searching for complete IP addresses and IP address prefixes + BI: + * FIX: fix exception with expansion level being 'None' + * FIX: speedup for single host tables joined by hostname (BI-Boxes) + + 1.2.2b4: Core: * FIX: Fix output of cmk -D: datasource programs were missing diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 74fc22d..a1c9ae2 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1421,7 +1421,7 @@ def render_tree_foldable(row, boxes, omit_root, expansion_level, only_problems, omit = omit_root and len(path) == 1 if not omit: h += '<span id="%d:%s" %s class="bibox_box %s %s state state%s%s">' % ( - expansion_level, path_id, mc, leaf, is_open and "open" or "closed", effective_state["state"], addclass) + expansion_level or 0, path_id, mc, leaf, is_open and "open" or "closed", effective_state["state"], addclass) if is_leaf: h += aggr_render_leaf(tree, show_host, bare = True) # .replace(" ", " ") else: @@ -1705,7 +1705,10 @@ def host_table(columns, add_headers, only_sites, limit, filters): return singlehost_table(columns, add_headers, only_sites, limit, filters, False) def singlehost_table(columns, add_headers, only_sites, limit, filters, joinbyname): + log("--------------------------------------------------------------------\n") + log("* Starting to compute singlehost_table (joinbyname = %s)\n" % joinbyname) load_assumptions() # user specific, always loaded + log("* Assumptions are loaded.\n") # Create livestatus filter for filtering out hosts. We can # simply use all those filters since we have a 1:n mapping between @@ -1716,8 +1719,10 @@ def singlehost_table(columns, add_headers, only_sites, limit, filters, joinbynam if not header.startswith("Sites:"): filter_code += header + log("* Getting status information about hosts...\n") host_columns = filter(lambda c: c.startswith("host_"), columns) hostrows = get_status_info_filtered(filter_code, only_sites, limit, host_columns, config.bi_precompile_on_demand) + log("* Got %d host rows\n" % len(hostrows)) # if limit: # views.check_limit(hostrows, limit) @@ -1733,9 +1738,11 @@ def singlehost_table(columns, add_headers, only_sites, limit, filters, joinbynam only_groups = [ filt.selected_group() ] if config.bi_precompile_on_demand: + log("* Compiling forest on demand...\n") compile_forest(config.user_id, only_groups = only_groups, only_hosts = [ (h['site'], h['name']) for h in hostrows ]) else: + log("* Compiling forest...\n") compile_forest(config.user_id) # rows by site/host - needed for later cluster state gathering @@ -1744,12 +1751,44 @@ def singlehost_table(columns, add_headers, only_sites, limit, filters, joinbynam rows = [] # Now compute aggregations of these hosts + log("* Assembling host rows...\n") + + # Special optimization for joinbyname + if joinbyname: + rows_by_host = {} + for hostrow in hostrows: + site = hostrow["site"] + host = hostrow["name"] + rows_by_host[(site, host)] = hostrow + for hostrow in hostrows: site = hostrow["site"] host = hostrow["name"] + # In case of joinbyname we deal with aggregations that bare the + # name of one host, but might contain states of multiple hosts. + # status_info cannot be filled from one row in that case. We + # try to optimize by assuming that all data that we need is being + # displayed in the same view and the information thus being present + # in some of the other hostrows. if joinbyname: + status_info = {} aggrs = g_user_cache["aggregations_by_hostname"].get(host, []) - status_info = None + # collect all the required host of all matching aggregations + for a in aggrs: + reqhosts = a[1]["reqhosts"] + for sitehost in reqhosts: + if sitehost not in rows_by_host: + # This one is missing. Darn. Cancel it. + status_info = None + break + else: + row = rows_by_host[sitehost] + status_info[sitehost] = [ + row["state"], + row["plugin_output"], + row["services_with_info"] ] + if status_info == None: + break else: aggrs = g_user_cache["host_aggregations"].get((site, host), []) status_info = { (site, host) : [ @@ -1781,6 +1820,7 @@ def singlehost_table(columns, add_headers, only_sites, limit, filters, joinbynam return rows + log("* Assembled %d rows.\n" % len(rows)) return rows

11 years, 3 months

Check_MK Git: check_mk: FIX: avoid closing BI subtree while tree is being loaded

by Mathias Kettner

Module: check_mk Branch: master Commit: f04c78af0f0605353678689c1527ef6885ba6ea0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f04c78af0f0605… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 14 15:55:50 2013 +0100 FIX: avoid closing BI subtree while tree is being loaded --- ChangeLog | 1 + web/htdocs/bi.py | 4 +++- web/htdocs/js/bi.js | 6 ++++++ 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index b383c3b..4fa25d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -97,6 +97,7 @@ BI: * FIX: fix exception with expansion level being 'None' * FIX: speedup for single host tables joined by hostname (BI-Boxes) + * FIX: avoid closing BI subtree while tree is being loaded 1.2.2b4: diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index a1c9ae2..d8a0809 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1343,6 +1343,7 @@ def ajax_save_treestate(): def ajax_render_tree(): aggr_group = html.var("group") + reqhosts = [ tuple(sitehost.split('#')) for sitehost in html.var("reqhosts").split(',') ] aggr_title = html.var("title") omit_root = not not html.var("omit_root") boxes = not not html.var("boxes") @@ -1350,7 +1351,7 @@ def ajax_render_tree(): # Make sure that BI aggregates are available if config.bi_precompile_on_demand: - compile_forest(config.user_id, only_groups = [ aggr_group ]) + compile_forest(config.user_id, only_hosts = reqhosts, only_groups = [ aggr_group ]) else: compile_forest(config.user_id) @@ -1480,6 +1481,7 @@ def render_tree_foldable(row, boxes, omit_root, expansion_level, only_problems, ( "omit_root", omit_root and "yes" or ""), ( "boxes", boxes and "yes" or ""), ( "only_problems", only_problems and "yes" or ""), + ( "reqhosts", ",".join('%s#%s' % sitehost for sitehost in affected_hosts) ), ]) htmlcode = '<div id="%s" class=bi_tree_container>' % htmllib.attrencode(url_id) + \ diff --git a/web/htdocs/js/bi.js b/web/htdocs/js/bi.js index 5427f69..00f3a16 100644 --- a/web/htdocs/js/bi.js +++ b/web/htdocs/js/bi.js @@ -53,6 +53,10 @@ function bi_toggle_subtree(oImg, lazy) function bi_update_tree(oImg, code) { + // Deactivate clicking - the update can last a couple + // of seconds. In that time we must inhibit further clicking. + oImg.onclick = null; + // First find enclosding <div class=bi_tree_container> var oDiv = oImg; while (oDiv.className != "bi_tree_container") { @@ -73,6 +77,8 @@ function bi_toggle_box(oDiv, lazy) var do_open; if (oDiv.className.indexOf("open") >= 0) { + if (lazy) + return; // do not close in lazy mode oDiv.className = oDiv.className.replace(/open/, "closed"); url += "&state=closed"; do_open = false;

11 years, 3 months

Check_MK Git: check_mk: jolokia_metrics: fixed compatibility with python 2. 4

by Andreas Boesl

Module: check_mk Branch: master Commit: f2f45ff2587ee59cc3bfddeefa45026473b9712a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2f45ff2587ee5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Mar 14 15:39:39 2013 +0100 jolokia_metrics: fixed compatibility with python 2.4 --- checks/jolokia_metrics | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index 8a15000..ce2cd0e 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -206,8 +206,8 @@ def check_jolokia_metrics_mem(item, params, info): if params.get(what): if type(params[what][0]) == int: if what != "total": - warn_level = value_max - params[what][0] if value_max != "" else "" - crit_level = value_max - params[what][1] if value_max != "" else "" + warn_level = ("", value_max - params[what][0])[value_max != ""] + crit_level = ("", value_max - params[what][1])[value_max != ""] perfdata.append((what, value, warn_level, crit_level, "", value_max)) if not value_max: param_state = 0 @@ -219,8 +219,8 @@ def check_jolokia_metrics_mem(item, params, info): level_info = "%s(warn at %sMB free)" % (state_sign[1], params[what][0]) else: if what != "total": - warn_level = value_max * params[what][0] / 100.0 if value_max != "" else "" - crit_level = value_max * params[what][1] / 100.0 if value_max != "" else "" + warn_level = ("", value_max * params[what][0] / 100.0)[value_max != ""] + crit_level = ("", value_max * params[what][1] / 100.0)[value_max != ""] perfdata.append((what, value, warn_level, crit_level, "", value_max)) if not value_max: param_state = 0 @@ -235,7 +235,7 @@ def check_jolokia_metrics_mem(item, params, info): perfdata.append((what, value, "", "", "", value_max)) - used_info = "/%.1f%% used" % (value / value_max * 100) if value_max != "" else "" + used_info = ("", "/%.1f%% used" % (value / value_max * 100))[value_max != ""] info_list.append("%s: %0.fMB%s%s" % (what.title(), value, used_info, level_info)) worst_state = max(param_state, worst_state)

11 years, 3 months

Check_MK Git: check_mk: get_piggyback_info: fixed crash when no hostname was given

by Andreas Boesl

Module: check_mk Branch: master Commit: 18670c8d17822378c60d11e9dd0ff76aefb5fb6e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18670c8d178223… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Mar 14 14:52:07 2013 +0100 get_piggyback_info: fixed crash when no hostname was given --- modules/check_mk_base.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index fe87abb..2af97bc 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -411,6 +411,8 @@ def get_realhost_info(hostname, ipaddress, check_type, max_cache_age): def get_piggyback_info(hostname): output = "" + if not hostname: + return output dir = tmp_dir + "/piggyback/" + hostname if os.path.exists(dir): for sourcehost in os.listdir(dir):

11 years, 3 months

Check_MK Git: check_mk: FIX: fixed crash on host notification when contact had explicit services set

by Andreas Boesl

Module: check_mk Branch: master Commit: f05905cf5717139f05704574f480a4bc7573867c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f05905cf571713… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Mar 14 12:15:14 2013 +0100 FIX: fixed crash on host notification when contact had explicit services set --- ChangeLog | 3 +++ modules/notify.py | 15 ++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 163230d..ded6142 100644 --- a/ChangeLog +++ b/ChangeLog @@ -80,6 +80,9 @@ * ADD: wmic_processs: cpucores now being considered when calculating user/kernel percentages. (thanks to William Baum) + Notifications: + * FIX: fixed crash on host notification when contact had explicit services set + Livestatus: * FIX: possible crash with VERY long downtime comments diff --git a/modules/notify.py b/modules/notify.py index b0e5ab3..28c100c 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -432,14 +432,15 @@ def should_notify(context, entry): if entry.get("only_services"): servicedesc = context.get("SERVICEDESC") if not servicedesc: - notify_log(" - Skipping: limited to certain services, but this is a host notification") - for s in entry["only_services"]: - if re.match(s, servicedesc): - break + notify_log(" - Proceed: limited to certain services, but this is a host notification") else: - notify_log(" - Skipping: service '%s' matches non of %s" % ( - servicedesc, ", ".join(entry["only_services"]))) - return False + for s in entry["only_services"]: + if re.match(s, servicedesc): + break + else: + notify_log(" - Skipping: service '%s' matches non of %s" % ( + servicedesc, ", ".join(entry["only_services"]))) + return False # Check notification type event, allowed_events = check_notification_type(context, entry["host_events"], entry["service_events"])

11 years, 3 months

Check_MK Git: check_mk: Fixed ChangeLog

by Mathias Kettner

Module: check_mk Branch: master Commit: 2190bf3583763f19840cca91cc66fae1c8fdd2fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2190bf3583763f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 13 14:56:50 2013 +0100 Fixed ChangeLog --- ChangeLog | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d2a2432..163230d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,9 +20,6 @@ * Added PNP tempate for check_disk_smb * Dashboards can now be configured to be reloaded on resizing (automatically adds width/height url parameters) - * New filter for IP address of a host - * Quicksearch: allow searching for complete IP addresses and IP - address prefixes Event Console: * New rule feature: automatically delete event after actions @@ -91,6 +88,9 @@ Multisite: * FIX: Avoid duplicate "Services" button in host detail views + * New filter for IP address of a host + * Quicksearch: allow searching for complete IP addresses and IP + address prefixes 1.2.2b4: Core:

11 years, 3 months

Check_MK Git: check_mk: FIX: Avoid duplicate "Services" button in host detail views

by Mathias Kettner

Module: check_mk Branch: master Commit: 034b2a9eef15271b715999fa84313308f1576d42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=034b2a9eef1527… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 13 14:43:25 2013 +0100 FIX: Avoid duplicate "Services" button in host detail views --- ChangeLog | 3 +++ web/plugins/views/builtin.py | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 983a24a..d2a2432 100644 --- a/ChangeLog +++ b/ChangeLog @@ -89,6 +89,9 @@ WATO: * FIX: Fix hiliting of errors in Nagios output + Multisite: + * FIX: Avoid duplicate "Services" button in host detail views + 1.2.2b4: Core: * FIX: Fix output of cmk -D: datasource programs were missing diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 6843ee2..1812b20 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -373,6 +373,7 @@ multisite_builtin_views.update({ ('st3', 'on'), ('stp', 'on')], 'hidden': True, + 'hidebutton' : True, 'hide_filters': ['site', 'host'], 'icon': 'services', 'layout': 'boxed',

11 years, 3 months

Check_MK Git: check_mk: Quicksearch: search for IP addresses

by Mathias Kettner

Module: check_mk Branch: master Commit: c2a6dd72d01cedd5b0503ff5ddc7512483782af7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2a6dd72d01ced… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 13 14:39:52 2013 +0100 Quicksearch: search for IP addresses --- ChangeLog | 2 ++ web/htdocs/js/search.js | 11 +++++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6b270bc..983a24a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,8 @@ * Dashboards can now be configured to be reloaded on resizing (automatically adds width/height url parameters) * New filter for IP address of a host + * Quicksearch: allow searching for complete IP addresses and IP + address prefixes Event Console: * New rule feature: automatically delete event after actions diff --git a/web/htdocs/js/search.js b/web/htdocs/js/search.js index 88c35a1..06f1273 100644 --- a/web/htdocs/js/search.js +++ b/web/htdocs/js/search.js @@ -274,6 +274,13 @@ function mkSearchGetSearchObjects(objType) { return []; } +function is_ipaddress(add, prefix) { + if (prefix) + return add.match(/^[0-9]{1,3}(\.[0-9]{1,3}){0,2}\.?$/); + else + return add.match(/^([1-9][0-9]{0,2}\.){3}[1-9][0-9]{0,2}$/); +} + function mkSearchGetUrl(objType, objName, objSite, numMatches) { objName = objName.replace(/\*/g,"\.\*"); if (numMatches == null) @@ -284,6 +291,10 @@ function mkSearchGetUrl(objType, objName, objSite, numMatches) { return 'view.py?view_name=host&host=' + objName + '&site=' + objSite; else if(numMatches > 1) return 'view.py?view_name=hosts&host=' + objName; + else if (is_ipaddress(objName, true)) + return 'view.py?view_name=searchsvc&search=Search&filled_in=filter&host_address_prefix=yes&host_address=' + objName; + else if (is_ipaddress(objName, false)) + return 'view.py?view_name=searchsvc&search=Search&filled_in=filter&host_address_prefix=no&host_address=' + objName; else return 'view.py?view_name=searchsvc&search=Search&filled_in=filter&service=' + objName; else if(objType == 'hg')

11 years, 3 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: 8df0e2fa57f8fe0752e123e81753d29dfd77b44d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8df0e2fa57f8fe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 13 14:24:07 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 3 months

Check_MK Git: check_mk: New filter for IP address of a host

by Mathias Kettner

Module: check_mk Branch: master Commit: 63136ad96807febd8a4f0f9e4e2154fb382fb0ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63136ad96807fe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 13 14:24:01 2013 +0100 New filter for IP address of a host --- ChangeLog | 3 ++- web/plugins/views/builtin.py | 2 ++ web/plugins/views/filters.py | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4f9c7aa..3aafa27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,9 +17,10 @@ possible for addons like mkeventd - reset to default values works now correctly even for multisite related settings * perfometer: Bit values now using base of 1000 - * ADD: check_disk_smb pnp-template + * Added PNP tempate for check_disk_smb * Dashboards can now be configured to be reloaded on resizing (automatically adds width/height url parameters) + * New filter for IP address of a host Event Console: * New rule feature: automatically delete event after actions diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index a6fec08..6843ee2 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -990,6 +990,7 @@ multisite_builtin_views.update({ 'opthostgroup', 'opthost_contactgroup', 'host_check_command', + 'host_address', ], 'sorters': [], 'title': _('Host search'), @@ -1050,6 +1051,7 @@ multisite_builtin_views.update({ 'service_scheduled_downtime_depth', 'service_acknowledged', 'hostregex', + 'host_address', 'service_active_checks_enabled', 'summary_host', 'serviceregex', diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 3f6e0de..0e734a2 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -76,6 +76,40 @@ declare_filter(202, FilterText("output", _("Status detail"), "service", "servic +class FilterIPAddress(Filter): + def __init__(self): + Filter.__init__(self, "host_address", _("Host IP Address"), "host", ["host_address", "host_address_prefix"], ["host_address"]) + + def display(self): + html.text_input("host_address") + html.write("<br><br>") + html.begin_radio_group() + html.radiobutton("host_address_prefix", "yes", True, _("Prefix match")) + html.radiobutton("host_address_prefix", "no", False, _("Exact match")) + html.end_radio_group() + + def double_height(self): + return True + + def filter(self, infoname): + address = html.var("host_address") + if address: + if html.var("host_address_prefix") == "yes": + return "Filter: host_address ~ ^%s\n" % address + else: + return "Filter: host_address = %s\n" % address + else: + return "" + + def variable_settings(self, row): + return [ ("host_address", row["host_address"]) ] + + def heading_info(self, infoname): + return html.var("host_address") + +declare_filter(102, FilterIPAddress()) + + # Helper that retrieves the list of host/service/contactgroups via Livestatus def all_groups(what): groups = dict(html.live.query("GET %sgroups\nColumns: name alias\n" % what))

11 years, 3 months

← Newer
1
...
5
6
7
8
9
10
11
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2013