Checkmk git commits November 2016

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

4041 FIX Fix exception when editing global configuration settings

by Mathias Kettner

Module: check_mk Branch: master Commit: f07ed44c15e2c2b16549b9db9c58e74eb137cdc0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f07ed44c15e2c2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 4 11:53:36 2016 +0100 4041 FIX Fix exception when editing global configuration settings The exception just happened when you clicked on the name of the configuration variable. If you clicked on the value everything is fine. --- .werks/4041 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 4 ++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/4041 b/.werks/4041 new file mode 100644 index 0000000..ead0605 --- /dev/null +++ b/.werks/4041 @@ -0,0 +1,11 @@ +Title: Fix exception when editing global configuration settings +Level: 2 +Component: wato +Compatible: compat +Version: 1.4.0i2 +Date: 1478256770 +Class: fix + +The exception just happened when you clicked on the name of the +configuration variable. If you clicked on the value everything is +fine. diff --git a/ChangeLog b/ChangeLog index c203be1..2d765e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -70,6 +70,7 @@ * 3821 FIX: WATO Network Scan: Fixed risk of loosing site tags when performing a network scan... * 3951 FIX: oracle_sessions: fixed bug with default absolute levels... * 4039 FIX: Fix UnicodeEncodeError exception in WATO folder display... + * 4041 FIX: Fix exception when editing global configuration settings... Notifications: * 3957 mail: now allows extra HTML section between body and table diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 95375d4..3501720 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6475,9 +6475,9 @@ def render_global_configuration_variables(group_names, default_values, current_s edit_url = folder_preserving_link([("mode", edit_mode), ("varname", varname), ("site", html.var("site", ""))]) - title = '<a href="%s" class=%s title="%s">%s</a>' % \ + title = HTML('<a href="%s" class=%s title="%s">%s</a>' % \ (edit_url, varname in current_settings and '"modified"' or '""', - html.strip_tags(help_text), title_text) + html.strip_tags(help_text), title_text)) if varname in current_settings: to_text = valuespec.value_to_text(current_settings[varname])

7 years, 10 months

Fixed ' ' issue.

by Roland Halbig

Module: check_mk Branch: master Commit: 08cd0e858b24a048f31b9361ec83dd90550401ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08cd0e858b24a0… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Fri Nov 4 11:48:25 2016 +0100 Fixed ' ' issue. --- web/htdocs/htmllib.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index e5203d6..4924edb 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -423,6 +423,7 @@ class HTMLGenerator(OutputFunnel): text = self._unescaper_text.sub(r'<\1\2>', text) # Also repair link definitions text = self._unescaper_href.sub(r'<a href="\1">', text) + text = re.sub(r'&nbsp;', ' ', text) return text

7 years, 10 months

3952 FIX diskstat: fixed bug if multipath devices having an alias

by Marcel Arentz

Module: check_mk Branch: master Commit: 44cf19c81394be4a3c381a41b464670ec9af027e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44cf19c81394be… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Fri Nov 4 11:45:14 2016 +0100 3952 FIX diskstat: fixed bug if multipath devices having an alias Previously detectiong of multipath devices has only been working if there is no alias for these devices. This Bug is now fixed. --- .werks/3952 | 9 +++++++++ ChangeLog | 1 + checks/diskstat | 8 +++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/3952 b/.werks/3952 new file mode 100644 index 0000000..503870a --- /dev/null +++ b/.werks/3952 @@ -0,0 +1,9 @@ +Title: diskstat: fixed bug if multipath devices having an alias +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i2 +Date: 1478255992 +Class: fix + +Previously detectiong of multipath devices has only been working if there is no alias for these devices. This Bug is now fixed. diff --git a/ChangeLog b/ChangeLog index 39a5f8d..c203be1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -47,6 +47,7 @@ * 3741 FIX: omd_status: Fix labelling and structure of several metric graphs * 3986 FIX: esx_vsphere_counters.uptime: fixed incorrect alert when receiving corrupted counter data... * 3987 FIX: Check_MK Agent Access: Windows agent reported incorrect only from value + * 3952 FIX: diskstat: fixed bug if multipath devices having an alias... Multisite: * 3959 Two new filters for the comment view: author and comment text field diff --git a/checks/diskstat b/checks/diskstat index 981e358..b2681d2 100644 --- a/checks/diskstat +++ b/checks/diskstat @@ -304,7 +304,8 @@ def diskstat_convert_info(parsed): # with multipath names like "SDataCoreSANsymphony_DAT07-fscl" if multipath_info: for uuid, multipath in multipath_info.items(): - if multipath["device"] in converted_disks: + if multipath["device"] in converted_disks or \ + "DM %s" % multipath["alias"] in converted_disks: for path in multipath["paths"]: if path in converted_disks: del converted_disks[path] @@ -313,6 +314,11 @@ def diskstat_convert_info(parsed): converted_disks[uuid] = converted_disks[multipath["device"]] del converted_disks[multipath["device"]] + if "DM %s" % multipath["alias"] in converted_disks: + alias = "DM %s" % multipath["alias"] + converted_disks[uuid] = converted_disks[alias] + del converted_disks[alias] + # Remove any left-over device mapper devices that are not part of a # known multipath device, LVM device or whatever for device in converted_disks.keys():

7 years, 10 months

made functions more understandable

by Marcel Arentz

Module: check_mk Branch: master Commit: ae3fcd7c3a476b4e476f9a369f9cc82ac7be2e7e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae3fcd7c3a476b… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Fri Nov 4 11:37:09 2016 +0100 made functions more understandable --- checks/diskstat | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/checks/diskstat b/checks/diskstat index 229bf4a..981e358 100644 --- a/checks/diskstat +++ b/checks/diskstat @@ -292,9 +292,9 @@ def diskstat_extract_name_info(info): return timestamp, info_plain, name_info -def diskstat_convert_info(info): - disks, multipath_info = info - converted_disks = dict(disks.items()) # we must not mody info! +def diskstat_convert_info(parsed): + disks, multipath_info = parsed + converted_disks = dict(disks.items()) # we must not modify info! # If we have information about multipathing, then remove the # physical path devices from the disks array. But only do this, @@ -322,8 +322,8 @@ def diskstat_convert_info(info): return converted_disks -def inventory_diskstat(info): - converted_disks = diskstat_convert_info(info) +def inventory_diskstat(parsed): + converted_disks = diskstat_convert_info(parsed) # Use generic diskstat inventory function that is used also for other # Disk IO checks. That expects a table of (node, device, ...)

7 years, 10 months

Fix bogus   in host statistics

by Mathias Kettner

Module: check_mk Branch: master Commit: 7d704247322c6dde1782a29858c84208f4b4e755 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d704247322c6d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 4 11:32:59 2016 +0100 Fix bogus   in host statistics --- web/plugins/dashboard/dashlets.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index e7bb87c..2aa9b87 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -257,7 +257,7 @@ def render_statistics(pie_id, what, table, filter, dashlet): table_entries = pies while len(table_entries) < 6: - table_entries = table_entries + [ (("", "#95BBCD", "", ""), " ") ] + table_entries = table_entries + [ (("", "#95BBCD", "", ""), HTML(" ")) ] table_entries.append(((_("Total"), "", "all%s" % what, ""), total)) for (name, color, viewurl, query), count in table_entries:

7 years, 10 months

4040 Fix error in view about "No WATO folder ..." in case of host imported via cmcdump

by Mathias Kettner

Module: check_mk Branch: master Commit: a776d02d1b0c98cbbd5a92b8fe54acf02bda04e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a776d02d1b0c98… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 4 11:32:34 2016 +0100 4040 Fix error in view about "No WATO folder ..." in case of host imported via cmcdump --- .werks/4040 | 11 +++++++++++ ChangeLog | 1 + web/plugins/views/wato.py | 6 +++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/4040 b/.werks/4040 new file mode 100644 index 0000000..7627639 --- /dev/null +++ b/.werks/4040 @@ -0,0 +1,11 @@ +Title: Fix error in view about "No WATO folder ..." in case of host imported via cmcdump +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i2 +Date: 1478255430 +Class: fix + +If you import a host with <tt>cmcdump</tt> and that host has a folder that is not +present on the central system then a red error message was printed and the layout +of the view was broken. This has been fixed. diff --git a/ChangeLog b/ChangeLog index 2c6e35f..39a5f8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,7 @@ * 4037 FIX: Fix graphs that have optional metrics... * 3973 FIX: Backup: Fixed displaying wrong finish time after backup completion * 3974 FIX: Sorting comments in hover menu of comments icon by time now + * 4040 FIX: Fix error in view about "No WATO folder ..." in case of host imported via cmcdump... WATO: * 3915 User access times: New icon when never logged in; New column "last seen" diff --git a/web/plugins/views/wato.py b/web/plugins/views/wato.py index 16c6eb2..7b1316a 100644 --- a/web/plugins/views/wato.py +++ b/web/plugins/views/wato.py @@ -39,7 +39,11 @@ def get_wato_folder(row, how, with_links = True): if not filename.startswith("/wato/") or not filename.endswith("/hosts.mk"): return "" wato_path = filename[6:-9] - title_path = wato.get_folder_title_path(wato_path, with_links) + try: + title_path = wato.get_folder_title_path(wato_path, with_links) + except Exception, e: + return "%s" % e + if how == "plain": return title_path[-1] elif how == "abs":

7 years, 10 months

Fixed some bugs with HTML class.

by Roland Halbig

Module: check_mk Branch: master Commit: 12157a769689f3f35c22426987a680264439558a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12157a769689f3… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Fri Nov 4 11:18:19 2016 +0100 Fixed some bugs with HTML class. --- web/htdocs/htmllib.py | 12 ++++++++++-- web/htdocs/table.py | 5 +++-- web/htdocs/valuespec.py | 1 + web/htdocs/wato.py | 22 +++++++++++----------- web/plugins/views/painters.py | 2 +- 5 files changed, 26 insertions(+), 16 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 8187e9b..e5203d6 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -120,6 +120,14 @@ class HTML(object): return self.value + def __unicode__(self): + return self.value + + + def __repr__(self): + return "HTML(%s)" % repr(self.value) + + def __add__(self, other): if isinstance(other, HTML): return self.value + other.value @@ -233,7 +241,7 @@ class OutputFunnel(object): return if isinstance(text, HTML): - text = text.value + text = "%s" % text if type(text) not in [str, unicode]: # also possible: type Exception! raise MKGeneralException(_('Type Error: html.write accepts str and unicode input objects only!')) @@ -489,7 +497,7 @@ class HTMLGenerator(OutputFunnel): def strip_tags(self, ht): if isinstance(ht, HTML): - return self.strip_tags(ht.value) + ht = "%s" % ht if type(ht) not in [str, unicode]: return ht diff --git a/web/htdocs/table.py b/web/htdocs/table.py index de478a1..a2cd3b1 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -115,8 +115,9 @@ def cell(*posargs, **kwargs): next_args = posargs, kwargs def add_cell(title="", text="", css=None, help=None, colspan=None, sortable=True): - if type(text) == HTML: - text = text.value + + if isinstance(text, HTML): + text = "%s" % text if type(text) != unicode: text = str(text) htmlcode = text + html.drain() diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index afda586..d31b346 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -476,6 +476,7 @@ class TextAscii(ValueSpec): ValueSpec.custom_validate(self, value, varprefix) + class TextUnicode(TextAscii): def __init__(self, **kwargs): TextAscii.__init__(self, **kwargs) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5c2ea34..95375d4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2307,7 +2307,7 @@ def output_analysed_ruleset(all_rulesets, rulespec, hostname, service, known_set elif known_settings is not PARAMETERS_UNKNOWN: try: - html.write_text(valuespec.value_to_text(known_settings)) + html.write(valuespec.value_to_text(known_settings)) except Exception, e: if config.debug: raise @@ -2332,7 +2332,7 @@ def output_analysed_ruleset(all_rulesets, rulespec, hostname, service, known_set # If there is a factory default then show that one elif rulespec["factory_default"] is not NO_FACTORY_DEFAULT: setting = rulespec["factory_default"] - html.write_text(valuespec.value_to_text(setting)) + html.write(valuespec.value_to_text(setting)) # Rulesets that build lists are empty if no rule matches elif rulespec["match"] in ("all", "list"): @@ -2340,14 +2340,14 @@ def output_analysed_ruleset(all_rulesets, rulespec, hostname, service, known_set # Else we use the default value of the valuespec else: - html.write_text(valuespec.value_to_text(valuespec.default_value())) + html.write(valuespec.value_to_text(valuespec.default_value())) # We have a setting elif valuespec: if rulespec["match"] in ( "all", "list" ): - html.write_text(", ".join([valuespec.value_to_text(e) for e in setting])) + html.write(", ".join([valuespec.value_to_text(e) for e in setting])) else: - html.write_text(valuespec.value_to_text(setting)) + html.write(valuespec.value_to_text(setting)) # Binary rule, no valuespec, outcome is True or False else: @@ -6626,7 +6626,7 @@ def mode_edit_configvar(phase, what = 'globalvars'): if curvalue == defvalue: html.write_text(_("Your setting and factory settings are identical.")) else: - html.write_text(valuespec.value_to_text(defvalue)) + html.write(valuespec.value_to_text(defvalue)) forms.end() html.button("save", _("Save")) @@ -8085,9 +8085,9 @@ def mode_notifications(phase): table.cell(_("Plugin parameters"), ", ".join(parameters)) table.cell(_("Bulking")) if bulk: - html.write_text(_("Time horizon") + ": " + Age().value_to_text(bulk["interval"])) + html.write(_("Time horizon") + ": " + Age().value_to_text(bulk["interval"])) html.write_text(", %s: %d" % (_("Maximum count"), bulk["count"])) - html.write_text(", %s %s" % (_("group by"), vs_notification_bulkby().value_to_text(bulk["groupby"]))) + html.write(", %s %s" % (_("group by"), vs_notification_bulkby().value_to_text(bulk["groupby"]))) table.end() @@ -10226,7 +10226,7 @@ def mode_users(phase): for name, attr in visible_custom_attrs: vs = attr['valuespec'] table.cell(_u(vs.title())) - html.write_text(vs.value_to_text(user.get(name, vs.default_value()))) + html.write(vs.value_to_text(user.get(name, vs.default_value()))) table.end() @@ -10352,7 +10352,7 @@ def mode_edit_user(phase): if attr['user_editable'] and not is_locked(name): vs.render_input("ua_" + name, user.get(name, vs.default_value())) else: - html.write_text(vs.value_to_text(user.get(name, vs.default_value()))) + html.write(vs.value_to_text(user.get(name, vs.default_value()))) # Render hidden to have the values kept after saving html.open_div(style="display:none") vs.render_input("ua_" + name, user.get(name, vs.default_value())) @@ -14404,7 +14404,7 @@ def page_user_profile(change_pw=False): vs.render_input("ua_" + name, value) html.help(_u(vs.help())) else: - html.write_text(vs.value_to_text(value)) + html.write(vs.value_to_text(value)) # Save button forms.end() diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index d6c29b3..4b7fb58 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -301,7 +301,7 @@ def process_multisite_icons(what, row, tags, custom_vars, toplevel): elif type(result) in [str, unicode, HTML]: if isinstance(result, HTML): - result = result.value + result = "%s" % result # TODO: This is handling the deprecated API with 1.2.7. Remove this one day. if result[0] == '<':

7 years, 10 months

Adopted HTML test.

by Roland Halbig

Module: check_mk Branch: master Commit: 690b38bcf48bf9fab454356842c22675583110b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=690b38bcf48bf9… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Fri Nov 4 11:18:52 2016 +0100 Adopted HTML test. --- tests/web/test_html.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/web/test_html.py b/tests/web/test_html.py index b416d60..13f9114 100644 --- a/tests/web/test_html.py +++ b/tests/web/test_html.py @@ -21,10 +21,12 @@ def test_class_HTML(): a = "One" b = "two" c = "Three" + d = unicode('u') A = HTML(a) B = HTML(b) C = HTML(c) + D = HTML(d) assert (A + B) == (a + b) print A @@ -62,3 +64,9 @@ def test_class_HTML(): assert isinstance("TEST%s" % A, str) assert "test" + C == "test" + c + + assert D == d + assert "%s" % D == "%s" % d + assert isinstance(D.value, unicode) + + assert repr(D) == "HTML(%s)" % repr(d)

7 years, 10 months

Fixed initial wato config check during test site creation

by Lars Michelsen

Module: check_mk Branch: master Commit: 06d90399cd79339634bddaf99a94669522c055a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06d90399cd7933… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 4 09:25:24 2016 +0100 Fixed initial wato config check during test site creation --- tests/testlib/__init__.py | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 96a39b2..661c6f8 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -289,14 +289,29 @@ class Site(object): assert "<title>WATO" in response assert "<div class=\"title\">Manual Checks</div>" in response - for f in [ - "etc/check_mk/conf.d/wato/rules.mk", - "etc/check_mk/multisite.d/wato/hosttags.mk", - "etc/check_mk/conf.d/wato/global.mk", - "var/check_mk/web/automation", - "var/check_mk/web/automation/automation.secret" ]: - assert self.file_exists(f), \ - "Failed to initialize WATO data structures (%s missing)" % f + missing_files = [ + "etc/check_mk/conf.d/wato/rules.mk", + "etc/check_mk/multisite.d/wato/hosttags.mk", + "etc/check_mk/conf.d/wato/global.mk", + "var/check_mk/web/automation", + "var/check_mk/web/automation/automation.secret" + ] + + wait_time = 10 + while missing_files and wait_time >= 0: + for f in missing_files[:]: + if self.file_exists(f): + missing_files.remove(f) + + if not missing_files: + break + + time.sleep(0.5) + wait_time -= 0.5 + + assert not missing_files, \ + "Failed to initialize WATO data structures " \ + "(Still missing: %s)" % missing_files # This opens a currently free TCP port and remembers it in the object for later use

7 years, 10 months

avaya_88xx default levels now actually apply

by Konstantin Büttner

Module: check_mk Branch: master Commit: 33afd2ec9142dae1a93bd527b044e1168d142aa7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33afd2ec9142da… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Nov 3 18:12:20 2016 +0100 avaya_88xx default levels now actually apply --- checks/avaya_88xx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/avaya_88xx b/checks/avaya_88xx index d1ce739..f084bd4 100644 --- a/checks/avaya_88xx +++ b/checks/avaya_88xx @@ -72,7 +72,7 @@ check_info["avaya_88xx"] = { 'check_function': check_avaya_88xx, 'inventory_function': inventory_avaya_88xx, 'service_description': 'Temperature Fan %s', - 'default_levels_variable': "avaya_88xx_temp_default_levels", + 'default_levels_variable': "avaya_88xx_default_levels", 'has_perfdata': True, 'group': 'temperature', # RAPID-CITY MIB

7 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2016