Checkmk git commits February 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: Hiding host/service type icons from default views; re-added icons columns to host list views

by Lars Michelsen

Module: check_mk Branch: master Commit: 98325ce9233d5a3875fe221439d9254a61324dd7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=98325ce9233d5a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 6 08:29:04 2015 +0100 Hiding host/service type icons from default views; re-added icons columns to host list views --- web/plugins/views/builtin.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 66cecc2..a424916 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -27,7 +27,7 @@ # Painters used in list of services views service_view_painters = [ ('service_state', None), - ('service_type_icon', None), +# ('service_type_icon', None), ('service_description', 'service'), ('service_icons', None), ('svc_plugin_output', None), @@ -42,9 +42,9 @@ host_service_view_painters.insert(1, ('host', 'host')) host_view_painters = [ ('host_state', None), - ('host_type_icon', None), +# ('host_type_icon', None), ('host', 'host'), -# ('host_icons', None), + ('host_icons', None), ('num_services_ok', 'host_ok'), ('num_services_warn', 'host_warn'), ('num_services_unknown', 'host_unknown'),

9 years, 4 months

Check_MK Git: check_mk: Prepared icon painter for new icon plugin api

by Lars Michelsen

Module: check_mk Branch: master Commit: b142028db7aedebc1ec5f398e24f61d281538405 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b142028db7aede… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 6 08:29:38 2015 +0100 Prepared icon painter for new icon plugin api --- web/htdocs/htmllib.py | 2 +- web/plugins/icons/builtin.py | 3 +- web/plugins/views/painters.py | 69 +++++++++++++++++++++++++++++++---------- 3 files changed, 54 insertions(+), 20 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 5748609..f92cf9d 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -356,7 +356,7 @@ class html: def render_icon(self, icon, help="", middle=True): align = middle and ' align=absmiddle' or '' title = help and ' title="%s"' % self.attrencode(help) or "" - if "/" in icon: + if "/" in icon or "." in icon: src = "images/" + icon else: src = "images/icon_%s.png" % icon diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 5f5eeea..0b6c8c8 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -110,8 +110,7 @@ def paint_rule_editor(what, row, tags, custom_vars): else: title = _("View and edit parameters for this host") - url = html.makeuri_contextless(urlvars, "wato.py") - return '<a href="%s">%s</a>' % (url, html.render_icon('rulesets', title)) + return 'rulesets', html.makeuri_contextless(urlvars, "wato.py"), title multisite_icons.append({ 'service_columns': [ 'description', 'check_command', "host_name" ], diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 3b9cc21..94eb8e8 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -141,12 +141,60 @@ def paint_icons(what, row): tags = [] output = "" + icon_rename_regex = regex('<img src="([^"]*)"[^>]*>') for icon in multisite_icons: if icon.get('type', 'icon') == 'icon': try: - icon_output = icon['paint'](what, row, tags, custom_vars) - if icon_output is not None: - output += icon_output + title = None + link = None + + # In old versions, the icons produced html code directly. The new API + # is that the icon functions need to return: + # a) None - nothing to be rendered + # b) single string - the icon name (without .png) + # c) tuple - icon, link + # d) triple - icon, link, title + result = icon['paint'](what, row, tags, custom_vars)a + + if result == None: + continue + + elif type(result) in [str,unicode]: + if result[0] == '<': + # seems like an old format icon (html code). In regular rendering + # case (html), it can simply be appended to the output. Otherwise + # extract the icon name from icon images + if html.output_format == "html": + output += result + else: + # Strip icon names out of HTML code that is generated by htmllib.render_icon() + for n in icon_rename_regex.findall(result): + if n.startswith("images/"): + n = n[7:] + if n.startswith("icon_"): + n = n[5:] + if n.endswith(".png"): + n = n[:-4] + elif n.endswith(".gif"): + n = n[:-4] + output += ' '+n.encode('utf-8') + continue + else: + icon_name = result + else: + if len(result) == 2: + icon_name, link = result + elif len(result) == 3: + icon_name, link, title = result + + if html.output_format == "html": + if link: + output += '<a href="%s">' % link + output += html.render_icon(icon_name, title) + if link: + output += '</a>' + else: + output = ' '+icon_name except Exception, e: import traceback output += 'Exception in icon plugin! ' + traceback.format_exc() @@ -154,20 +202,7 @@ def paint_icons(what, row): if html.output_format == "html": return "icons", output else: - # Strip icon names out of HTML code that is generated by htmllib.render_icon() - icon_rename_regex = regex('<img src="([^"]*)"[^>]*>') - icons = [] - for n in icon_rename_regex.findall(output): - if n.startswith("images/"): - n = n[7:] - if n.startswith("icon_"): - n = n[5:] - if n.endswith(".png"): - n = n[:-4] - elif n.endswith(".gif"): - n = n[:-4] - icons.append(n.encode('utf-8')) - return "icons", " ".join(icons) + return "icons", output.strip() def iconpainter_columns(what): cols = set(['site',

9 years, 4 months

Check_MK Git: check_mk: #1979 Relative timestamps display warnings when they should be in future but are in past

by Lars Michelsen

Module: check_mk Branch: master Commit: a93209e993ed224351a45d6370bed82fecfc8255 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a93209e993ed22… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 6 09:34:49 2015 +0100 #1979 Relative timestamps display warnings when they should be in future but are in past --- .werks/1979 | 10 ++++++++++ ChangeLog | 1 + web/plugins/views/painters.py | 23 +++++++++++++++-------- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/.werks/1979 b/.werks/1979 new file mode 100644 index 0000000..ded13ef --- /dev/null +++ b/.werks/1979 @@ -0,0 +1,10 @@ +Title: Relative timestamps display warnings when they should be in future but are in past +Level: 1 +Component: multisite +Class: feature +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1423211681 + + diff --git a/ChangeLog b/ChangeLog index 2b75bcf..e19afe6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -158,6 +158,7 @@ * 1667 Sidebar snapin 'Tree of Folders' and 'WATO folder' filter now available on slave sites... * 1815 Dashboard: Sidebar snapins can now be added as dashlets to dashboards... * 1973 Added intelligent host and service type icons to default views... + * 1979 Relative timestamps display warnings when they should be in future but are in past * 1781 FIX: Fix broken grouping by host/service group in availability * 1783 FIX: Finish the view "History of Scheduled Downtimes"... * 1206 FIX: Hostname not longer shown as column in host views diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 94eb8e8..5165a2d 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -314,7 +314,7 @@ def paint_nagios_link(row): return "singleicon", "<a href=\"%s\">%s</a>" % \ (url, html.render_icon('nagios', _('Show this %s in Nagios') % what)) -def paint_age(timestamp, has_been_checked, bold_if_younger_than, mode=None): +def paint_age(timestamp, has_been_checked, bold_if_younger_than, mode=None, what='past'): if not has_been_checked: return "age", "-" @@ -325,8 +325,8 @@ def paint_age(timestamp, has_been_checked, bold_if_younger_than, mode=None): return "", str(int(timestamp)) if mode == "both": - css, h1 = paint_age(timestamp, has_been_checked, bold_if_younger_than, "abs") - css, h2 = paint_age(timestamp, has_been_checked, bold_if_younger_than, "rel") + css, h1 = paint_age(timestamp, has_been_checked, bold_if_younger_than, "abs", what=what) + css, h2 = paint_age(timestamp, has_been_checked, bold_if_younger_than, "rel", what=what) return css, "%s - %s" % (h1, h2) dateformat = get_painter_option("ts_date") @@ -345,14 +345,21 @@ def paint_age(timestamp, has_been_checked, bold_if_younger_than, mode=None): age_class = "age recent" else: age_class = "age" - return age_class, prefix + html.age_text(age) + + warn_txt = '' + if what == 'future' and age > 0: + warn_txt = ' %s' % _('in the past!') + elif what == 'past' and age < 0: + warn_txt = ' %s' % _('in the future!') + + return age_class, prefix + html.age_text(age) + warn_txt def paint_future_time(timestamp): if timestamp <= 0: return "", "-" else: - return paint_age(timestamp, True, 0) + return paint_age(timestamp, True, 0, what='future') def paint_day(timestamp): return "", time.strftime("%A, %Y-%m-%d", time.localtime(timestamp)) @@ -1672,7 +1679,7 @@ multisite_painters["comment_expires"] = { "short" : _("Expires"), "columns" : ["comment_expire_time"], "options" : [ "ts_format", "ts_date" ], - "paint" : lambda row: paint_age(row["comment_expire_time"], row["comment_expire_time"] != 0, 3600), + "paint" : lambda row: paint_age(row["comment_expire_time"], row["comment_expire_time"] != 0, 3600, what='future'), } def paint_comment_entry_type(row): @@ -1772,7 +1779,7 @@ multisite_painters["downtime_start_time"] = { "short" : _("Start"), "columns" : ["downtime_start_time"], "options" : [ "ts_format", "ts_date" ], - "paint" : lambda row: paint_age(row["downtime_start_time"], True, 3600), + "paint" : lambda row: paint_age(row["downtime_start_time"], True, 3600, what=None), } multisite_painters["downtime_end_time"] = { @@ -1780,7 +1787,7 @@ multisite_painters["downtime_end_time"] = { "short" : _("End"), "columns" : ["downtime_end_time"], "options" : [ "ts_format", "ts_date" ], - "paint" : lambda row: paint_age(row["downtime_end_time"], True, 3600), + "paint" : lambda row: paint_age(row["downtime_end_time"], True, 3600, what=None), } def paint_downtime_duration(row):

9 years, 4 months

Check_MK Git: check_mk: Logical code cleanup of Perf-O-Meters

by Mathias Kettner

Module: check_mk Branch: master Commit: b1563bf87729bd8294609511af4d15fc488809fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1563bf87729bd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 5 18:02:44 2015 +0100 Logical code cleanup of Perf-O-Meters --- web/htdocs/lib.py | 4 +- web/htdocs/metrics.py | 70 +++++++++++++++++++++++ web/plugins/metrics/check_mk.py | 4 +- web/plugins/perfometer/check_mk.py | 5 +- web/plugins/views/perfometer.py | 110 ++++++++++++++++-------------------- 5 files changed, 128 insertions(+), 65 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b1563bf877…

9 years, 4 months

Check_MK Git: check_mk: Fixed missing fix in last commit

by Lars Michelsen

Module: check_mk Branch: master Commit: 785799f933e0b833be449e04eee7f6a604a9a7e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=785799f933e0b8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 5 16:18:14 2015 +0100 Fixed missing fix in last commit --- web/htdocs/views.py | 13 +++++++------ web/plugins/views/webservice.py | 9 ++++++--- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 76c7eff..cb93aee 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2026,18 +2026,19 @@ def paint_painter(painter, row): else: return painter["paint"](row) -def get_join_key(p): - return len(p) >= 4 and p[3] or None +def join_row(row, p): + join_key = len(p) >= 4 and p[3] or None + if join_key != None: + return row.get("JOIN", {}).get(join_key) + else: + return row def prepare_paint(p, row): painter = p[0] linkview = p[1] tooltip = len(p) > 2 and p[2] or None - join_key = get_join_key(p) - if join_key != None: - row = row.get("JOIN", {}).get(join_key) - + row = join_row(row, p) tdclass, content = paint_painter(painter, row) if tdclass == "" and content == "": return tdclass, content diff --git a/web/plugins/views/webservice.py b/web/plugins/views/webservice.py index f7e49a7..6ca0251 100644 --- a/web/plugins/views/webservice.py +++ b/web/plugins/views/webservice.py @@ -41,7 +41,8 @@ def render_python(rows, view, group_painters, painters, num_columns, show_checkb for row in rows: html.write("[") for p in painters: - tdclass, content = paint_painter(p[0], row, join_key=get_join_key(p)) + row = join_row(row, p) + tdclass, content = paint_painter(p[0], row) html.write(repr(html.strip_tags(content))) html.write(",") html.write("],") @@ -94,7 +95,8 @@ def render_json(rows, view, group_painters, painters, num_columns, show_checkbox first = False else: html.write(",") - tdclass, content = paint_painter(p[0], row, join_key=get_join_key(p)) + row = join_row(row, p) + tdclass, content = paint_painter(p[0], row) if type(content) == unicode: content = content.encode("utf-8") else: @@ -161,7 +163,8 @@ def render_csv(rows, view, group_painters, painters, num_columns, show_checkboxe first = False else: html.write(csv_separator) - tdclass, content = paint_painter(p[0], row, join_key=get_join_key(p)) + row = join_row(row, p) + tdclass, content = paint_painter(p[0], row) content = type(content) in [ int, float ] and str(content) or content stripped = html.strip_tags(content).replace('\n', '').replace('"', '""') html.write('"%s"' % stripped.encode("utf-8"))

9 years, 4 months

Check_MK Git: check_mk: #1978 FIX Fixed linking to other views using " joined columns"

by Lars Michelsen

Module: check_mk Branch: master Commit: dc911b2ef640d8744a673cf12abf246b3d9e8b18 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc911b2ef640d8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 5 16:13:12 2015 +0100 #1978 FIX Fixed linking to other views using "joined columns" Creating views with a joined columns which links to another view resulted in an exception when displaying the view. --- .werks/1978 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/views.py | 14 ++++++++------ 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/.werks/1978 b/.werks/1978 new file mode 100644 index 0000000..d0844e4 --- /dev/null +++ b/.werks/1978 @@ -0,0 +1,11 @@ +Title: Fixed linking to other views using "joined columns" +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1423149130 + +Creating views with a joined columns which links to another view +resulted in an exception when displaying the view. diff --git a/ChangeLog b/ChangeLog index 26cbd65..2b75bcf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -182,6 +182,7 @@ * 1972 FIX: Prevent erasing of quicksearch field when sidebar is reloaded (e.g. during activate changes)... * 1221 FIX: veeam_client: Multisite perfometer is now more robust * 1989 FIX: Fix sorting of services in availability views + * 1978 FIX: Fixed linking to other views using "joined columns"... WATO: * 1760 Added search form to manual checks page diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 0d0d2bc..76c7eff 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2017,11 +2017,9 @@ def paint(p, row, tdattrs=""): html.write("<td %s>%s</td>" % (tdattrs, content)) return content != "" -def paint_painter(painter, row, join_key=None): - if join_key != None: - row = row.get("JOIN", {}).get(join_key) - if not row: - return "", "" # no join information available for that column +def paint_painter(painter, row): + if not row: + return "", "" # no join information available for that column if "args" in painter: return painter["paint"](row, *painter["args"]) @@ -2036,7 +2034,11 @@ def prepare_paint(p, row): linkview = p[1] tooltip = len(p) > 2 and p[2] or None - tdclass, content = paint_painter(painter, row, join_key=get_join_key(p)) + join_key = get_join_key(p) + if join_key != None: + row = row.get("JOIN", {}).get(join_key) + + tdclass, content = paint_painter(painter, row) if tdclass == "" and content == "": return tdclass, content

9 years, 4 months

Check_MK Git: check_mk: Internal code cleanup in new metrics module

by Mathias Kettner

Module: check_mk Branch: master Commit: 7f5a4051b59171c1ebedc4d9f3bebdc0b8e64629 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f5a4051b59171… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 5 15:58:29 2015 +0100 Internal code cleanup in new metrics module --- web/htdocs/metrics.py | 6 +++--- web/plugins/views/perfometer.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 8b5ace4..eb156ca 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -97,7 +97,7 @@ def parse_perf_data(perf_data_string, check_command=None): # Simple example for perf_data: [(u'temp', u'48', u'', u'70', u'80', u'', u'')] # Result for this example: # { "temp" : "value" : 48.0, "warn" : 70.0, "crit" : 80.0, "unit" : { ... } } -def translate_metrics(check_command, perf_data): +def translate_metrics(perf_data, check_command): if check_command not in check_metrics: return None @@ -152,7 +152,7 @@ def translate_metrics(check_command, perf_data): # TODO: warn, crit, min, max # if entry[2]: # # TODO: lower and upper levels - # translate_metrics[metric_name]["warn"] = float(entry[2]) + # translated_metrics[metric_name]["warn"] = float(entry[2]) return translated_metrics @@ -311,7 +311,7 @@ def page_pnp_template(): if not perf_data or not check_command: return - translated_metrics = translate_metrics(check_command, perf_data) + translated_metrics = translate_metrics(perf_data, check_command) if not translated_metrics: return # check not supported diff --git a/web/plugins/views/perfometer.py b/web/plugins/views/perfometer.py index 64dbf10..7a24122 100644 --- a/web/plugins/views/perfometer.py +++ b/web/plugins/views/perfometer.py @@ -134,7 +134,7 @@ def paint_perfometer(row): try: # Try new metrics module - translated_metrics = metrics.translate_metrics(check_command, perf_data) + translated_metrics = metrics.translate_metrics(perf_data, check_command) if translated_metrics: # definition for this check type exists perfometer_definitions = list(metrics.get_perfometers(translated_metrics)) if perfometer_definitions: @@ -231,7 +231,7 @@ multisite_painters["perfometer"] = { "service_check_command", "service_pnpgraph_present", "service_plugin_output" ], "paint" : paint_perfometer, "sorter" : "svc_perf_val01", - "printable" : False, # No printable on PDF, only in HTML + "printable" : "perfometer", # Special rendering in PDFs } load_web_plugins("perfometer", globals())

9 years, 4 months

Check_MK Git: check_mk: Optimized the memory footprint of the Check_MK check helper processes

by Lars Michelsen

Module: check_mk Branch: master Commit: 3b15ced4b1155d67e0051b3f0be23e1b9d617a81 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b15ced4b1155d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 5 14:24:15 2015 +0100 Optimized the memory footprint of the Check_MK check helper processes which are used when using the CMC. Conflicts: ChangeLog modules/check_mk_base.py --- .werks/1977 | 11 +++++++ ChangeLog | 1 + modules/check_mk.py | 75 ++++++++++++++++++++++++++-------------------- modules/check_mk_base.py | 2 ++ 4 files changed, 57 insertions(+), 32 deletions(-) diff --git a/.werks/1977 b/.werks/1977 new file mode 100644 index 0000000..aa29d5e --- /dev/null +++ b/.werks/1977 @@ -0,0 +1,11 @@ +Title: Dramatically reduced size of Check_MK check helper processes +Level: 2 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1423142432 + +Optimized the memory footprint of the Check_MK check helper processes +which are used when using the CMC. diff --git a/ChangeLog b/ChangeLog index c17c21e..26cbd65 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ * 1919 FIX: cmk --snmpwalk: continue if one of the OIDs to walk fails * 1880 FIX: inventory_processes rules can now be configured without setting levels... * 1882 FIX: Fixed exception "filesystem_levels" not defined when compiling config for nagios + * 1977 FIX: Dramatically reduced size of Check_MK check helper processes... Checks & Agents: * 1665 agent_netapp: New special agent for NetApp monitoring via Web-API... diff --git a/modules/check_mk.py b/modules/check_mk.py index 9743053..578129a 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1572,6 +1572,7 @@ def in_binary_hostlist(hostname, conf): return False + # Pick out the last element of an entry if it is a dictionary. # This is a new feature (1.2.0p3) that allows to add options # to rules. Currently only the option "disabled" is being @@ -1595,6 +1596,7 @@ def all_matching_hosts(tags, hostlist): matching.add(hostname) return matching +g_converted_rulesets_cache = {} def convert_service_ruleset(ruleset): new_rules = [] @@ -1616,18 +1618,11 @@ def convert_service_ruleset(ruleset): hosts = all_matching_hosts(tags, hostlist) new_rules.append((item, hosts, servlist)) - # Replace rules inplace. This finally modifies it, so we - # need this conversion only once - ruleset[:] = new_rules - -def serviceruleset_is_converted(ruleset): - if not ruleset: - return True # empty rulesets are converted in a trivial way + g_converted_rulesets_cache[id(ruleset)] = new_rules - if type(ruleset[0]) != tuple: - return False - return type(ruleset[0][1]) == set +def serviceruleset_is_converted(ruleset): + return id(ruleset) in g_converted_rulesets_cache # Compute outcome of a service rule set that has an item @@ -1636,11 +1631,12 @@ def service_extra_conf(hostname, service, ruleset): convert_service_ruleset(ruleset) entries = [] - for item, hosts, servlist in ruleset: + for item, hosts, servlist in g_converted_rulesets_cache[id(ruleset)]: if hostname in hosts and in_extraconf_servicelist(servlist, service): entries.append(item) return entries + def convert_boolean_service_ruleset(ruleset): new_rules = [] for rule in ruleset: @@ -1667,27 +1663,15 @@ def convert_boolean_service_ruleset(ruleset): hosts = all_matching_hosts(tags, hostlist) new_rules.append((negate, hosts, servlist)) - # Replace rules inplace. This finally modifies it, so we - # need this conversion only once - ruleset[:] = new_rules - - -def boolean_serviceruleset_is_converted(ruleset): - if not ruleset: - return True # empty rulesets are converted in a trivial way - - if type(ruleset[0]) != tuple: - return False - - return type(ruleset[0][1]) == set + g_converted_rulesets_cache[id(ruleset)] = new_rules # Compute outcome of a service rule set that just say yes/no def in_boolean_serviceconf_list(hostname, service_description, ruleset): - if not boolean_serviceruleset_is_converted(ruleset): + if not serviceruleset_is_converted(ruleset): convert_boolean_service_ruleset(ruleset) - for negate, hosts, servlist in ruleset: + for negate, hosts, servlist in g_converted_rulesets_cache[id(ruleset)]: if hostname in hosts and \ in_extraconf_servicelist(servlist, service_description): return not negate @@ -1743,6 +1727,7 @@ def in_extraconf_hostlist(hostlist, hostname): return False + def in_extraconf_servicelist(list, item): for pattern in list: # Allow negation of pattern with prefix '!' @@ -2962,7 +2947,29 @@ no_inventory_possible = None # of all autochecks files. The check helpers of the running core just # use those files, so that changes in the actual config do not harm # the running system. -derived_config_variable_names = [ "hosttags", "all_hosts_untagged" ] + +derived_config_variable_names = [ "hosttags" ] + +# These variables are part of the Check_MK configuration, but are not needed +# by the Check_MK keepalive mode, so exclude them from the packed config +skipped_config_variable_names = [ + "define_contactgroups", + "define_hostgroups", + "define_servicegroups", + "service_contactgroups", + "host_contactgroups", + "service_groups", + "host_groups", + "contacts", + "host_paths", + "timeperiods", + "host_attributes", + "all_hosts_untagged", + "extra_service_conf", + "extra_host_conf", + "extra_nagios_conf", +] + def pack_config(): # Checks whether or not a variable can be written to the config.mk # and read again from it. @@ -2978,11 +2985,15 @@ def pack_config(): filepath = var_dir + "/core/config.mk" out = file(filepath + ".new", "w") - out.write("#!/usr/bin/python\n# encoding: utf-8\n# Created by Check_MK. Dump of the currently active configuration\n\n") + out.write("#!/usr/bin/python\n" + "# encoding: utf-8\n" + "# Created by Check_MK. Dump of the currently active configuration\n\n") for varname in list(config_variable_names) + derived_config_variable_names: - val = globals()[varname] - if packable(varname, val): - out.write("\n%s = %r\n" % (varname, val)) + if varname not in skipped_config_variable_names: + val = globals()[varname] + if packable(varname, val): + out.write("\n%s = %r\n" % (varname, val)) + for varname, factory_setting in factory_settings.items(): if varname in globals(): out.write("\n%s = %r\n" % (varname, globals()[varname])) @@ -4895,7 +4906,7 @@ def copy_globals(): "g_check_table_cache", "g_singlehost_checks", "g_nodesof_cache", "g_compiled_regexes", "vars_before_config", "g_initial_times", "g_keepalive_initial_memusage", - "g_dns_cache", "g_ip_lookup_cache" ] \ + "g_dns_cache", "g_ip_lookup_cache", "g_converted_rulesets_cache" ] \ and type(value).__name__ not in [ "function", "module", "SRE_Pattern" ]: global_saved[varname] = copy.copy(value) return global_saved diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 0ea9407..7d502a0 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -91,6 +91,8 @@ def reset_global_caches(): g_dns_cache = {} global g_ip_lookup_cache g_ip_lookup_cache = None # permanently cached ipaddresses from ipaddresses.cache + global g_converted_rulesets_cache + g_converted_rulesets_cache = {} reset_global_caches()

9 years, 4 months

Check_MK Git: check_mk: Fixed name of check internal helper variable

by Lars Michelsen

Module: check_mk Branch: master Commit: 79cfaddc703a56d6ac20bcfc34384476e1d52c18 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79cfaddc703a56… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 5 14:02:07 2015 +0100 Fixed name of check internal helper variable --- checks/cmctc_lcp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/checks/cmctc_lcp b/checks/cmctc_lcp index 288ed3f..b0383bf 100644 --- a/checks/cmctc_lcp +++ b/checks/cmctc_lcp @@ -125,12 +125,12 @@ snmp_info["cmctc_lcp"] = ( ) -for s, i in cmctc_lcp_sensortypes.items(): - check_info['cmctc_lcp.' + s] = { - "check_function" : (lambda st: lambda item,params,info: check_cmctc_lcp(item, params, info, st))(s), - "inventory_function" : (lambda st: lambda info: inventory_cmctc_lcp(info, st))(s), +for _s, _i in cmctc_lcp_sensortypes.items(): + check_info['cmctc_lcp.' + _s] = { + "check_function" : (lambda st: lambda item,params,info: check_cmctc_lcp(item, params, info, st))(_s), + "inventory_function" : (lambda st: lambda info: inventory_cmctc_lcp(info, st))(_s), "has_perfdata" : True, - "service_description" : i[1], + "service_description" : _i[1], } # Set WATO check group for temperature checks

9 years, 4 months

Check_MK Git: check_mk: Added new metrics-based Perf-O-Meters for AIX and Windows memory checks

by Mathias Kettner

Module: check_mk Branch: master Commit: e67322bd326a47a4bc63ec96ea88ba2b39d368ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e67322bd326a47… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 5 12:33:15 2015 +0100 Added new metrics-based Perf-O-Meters for AIX and Windows memory checks --- web/htdocs/metrics.py | 14 ++++++++++++-- web/plugins/metrics/check_mk.py | 3 +++ web/plugins/views/perfometer.py | 1 - 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 0f849e0..8b5ace4 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -219,12 +219,18 @@ def evaluate_literal(expression, translated_metrics): # e.g. "fs_used:max(%)" -> "fs_used" def get_name(expression): + if type(expression) in (int, float): + return None if expression.endswith("(%)"): expression = expression[:-3] return expression.split(":")[0] def get_color(expression): - return metric_info[get_name(expression)]["color"] + name = get_name(expression) + if name: + return metric_info[name]["color"] + else: + return "#808080" def get_unit(expression): if expression.endswith("(%)"): @@ -247,12 +253,16 @@ def perfometer_possible(perfometer, translated_metrics): required = [ perf_args[0] ] elif perf_type == "stacked": required = perf_args[0] + if perf_args[1]: + required = required + [perf_args[1]] # Reference value for 100% + if perf_args[2]: + required = required + [perf_args[2]] # Labelling value else: raise MKInternalError(_("Undefined Perf-O-Meter type '%s'") % perf_type) for req in required: try: - evaluate(req, translated_metrics) + x = evaluate(req, translated_metrics) except: return False return True diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 0c8fa10..ec8ebad 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -236,6 +236,8 @@ check_metrics["check_mk-blade_bx_load"] = {} check_metrics["check_mk-cpu.threads"] = {} check_metrics["check_mk-mem.linux"] = {} +check_metrics["check_mk-aix_memory"] = { "ramused" : { "name" : "mem_used", "scale": MB }, "swapused" : { "name" : "swap_used", "scale": MB }} +check_metrics["check_mk-mem.win"] = { "memory" : { "name" : "mem_used", "scale" : MB }, "pagefile" : { "name" : "pagefile_used", "scale" : MB }} check_metrics["check_mk-df"] = { 0: { "name": "fs_used", "scale" : MB } } check_metrics["check_mk-vms_df"] = { 0: { "name": "fs_used", "scale" : MB } } @@ -331,6 +333,7 @@ perfometer_info.append(("stacked", ( [ "user", "system", "io_wait" ], perfometer_info.append(("stacked", ( [ "fs_used(%)" ], 100.0, None))) perfometer_info.append(("stacked", ( [ "mem_used", "swap_used", "caches", "mem_free", "swap_free" ], None, ("mem_total,mem_used,swap_used,+,/", "100%")))) perfometer_info.append(("stacked", ( [ "mem_used" ], "mem_total", None))) +perfometer_info.append(("stacked", ( [ "mem_used(%)" ], 100.0, None))) perfometer_info.append(("logarithmic", ( "time_offset", 1.0, 10.0))) diff --git a/web/plugins/views/perfometer.py b/web/plugins/views/perfometer.py index 50c9cbf..64dbf10 100644 --- a/web/plugins/views/perfometer.py +++ b/web/plugins/views/perfometer.py @@ -198,7 +198,6 @@ def render_metrics_perfometer(perfometer, translated_metrics): total = metrics.evaluate(total_spec, translated_metrics) for ex in metrics_expressions: - name = ex.split(":")[0] value = metrics.evaluate(ex, translated_metrics) color = metrics.get_color(ex) h += perfometer_td(100.0 * value / total, color)

9 years, 4 months

← Newer
1
...
21
22
23
24
25
26
27
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2015