Checkmk git commits March 2017

checkmk-commits@lists.checkmk.com

11 participants
379 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 84915168d759d23fb1c162152fd70fa8c0859bb6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84915168d759d2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 24 10:13:58 2017 +0100 GUI crawl: Save web.log in results Change-Id: I8c52ad6263075edf1fb15fc59a06f0ae2bd89bd1 --- tests/web/test_crawl.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/web/test_crawl.py b/tests/web/test_crawl.py index c83468d..f3ee934 100644 --- a/tests/web/test_crawl.py +++ b/tests/web/test_crawl.py @@ -10,6 +10,7 @@ import signal import threading import Queue import traceback +import shutil from urlparse import urlsplit, parse_qsl, urlunsplit, urljoin from urllib import urlencode from bs4 import BeautifulSoup @@ -318,6 +319,10 @@ class TestCrawler(object): return var_dir() + "/crawl.report" + def web_log_file(self): + return var_dir() + "/craw-web.log" + + def load_stats(self): try: self.stats = eval(file(self.stats_file()).read()) @@ -379,6 +384,9 @@ class TestCrawler(object): os.rename(self.report_file()+".tmp", self.report_file()) + # Save the web.log for later diagnose + shutil.copyfile(self.site.read_file("var/log/web.log"), self.web_log_file()) + if self.errors: pytest.fail("Crawled %d URLs in %d seconds. Failures:\n%s" % (len(self.visited), time.time() - self.started, "\n".join(self.errors)))

7 years, 6 months

4512 FIX Rule list: Fixed possible "assert table" error on ruleset rule listing page

by Lars Michelsen

Module: check_mk Branch: master Commit: 6fe3fd990c97774a8e6213d31d09444d9a209d2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6fe3fd990c9777… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 24 10:45:19 2017 +0100 4512 FIX Rule list: Fixed possible "assert table" error on ruleset rule listing page This issue could occur in specific situations when having a specific folder hierarchy while some folders have no rule assigned and some have. Change-Id: I39430fb8ff7f4251d8f29e39ec10f87cd6268837 --- .werks/4512 | 12 ++++++++++++ web/htdocs/wato.py | 13 +++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/.werks/4512 b/.werks/4512 new file mode 100644 index 0000000..217f9dc --- /dev/null +++ b/.werks/4512 @@ -0,0 +1,12 @@ +Title: Rule list: Fixed possible "assert table" error on ruleset rule listing page +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1490348642 + +This issue could occur in specific situations when having a specific folder hierarchy +while some folders have no rule assigned and some have. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c76c8193..f6280cf 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12839,18 +12839,19 @@ class ModeEditRuleset(WatoMode): skip_this_folder = False for folder, rulenr, rule in ruleset.get_rules(): if folder != last_folder: - skip_this_folder = False + if not Folder.current().is_root() and not folder.is_transitive_parent_of(Folder.current()): + skip_this_folder = True + continue + else: + skip_this_folder = False + if last_folder != None: table.end() first_in_group = True - alias_path = folder.alias_path(show_main = False) last_folder = folder - if not Folder.current().is_root() and not folder.is_transitive_parent_of(Folder.current()): - skip_this_folder = True - continue - + alias_path = folder.alias_path(show_main = False) table.begin("rules", title="%s %s" % (_("Rules in folder"), alias_path), css="ruleset", searchable=False, sortable=False, limit=None) else:

7 years, 6 months

updated werk text

by Simon Betz

Module: check_mk Branch: master Commit: f194f4e3fd92f7fa28f4515efa5852b5fec58b7e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f194f4e3fd92f7… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Mar 24 09:22:51 2017 +0100 updated werk text Change-Id: If22297a9d0c80d93feba3ab46f52e6717eac7c95 --- .werks/8734 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.werks/8734 b/.werks/8734 index ed9b410..a1cd103 100644 --- a/.werks/8734 +++ b/.werks/8734 @@ -7,4 +7,6 @@ Version: 1.2.8p19 Date: 1490341441 Class: fix - +If certificate is uploaded in the ruleset {{Monitoring Agents > Automatic Updates > Install agent updater (Linux, Windows)}} +that contains non-ascii character an encoding error was reported: +"The value of this rule is not valid. 'ascii' codec can't decode byte ..."

7 years, 6 months

8734 FIX cmk_update_agent: Fixed encoding error if certificate contains non-ascii characters

by Simon Betz

Module: check_mk Branch: master Commit: 460726c854255522e045f364395a028e50bee4e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=460726c8542555… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Mar 24 08:52:52 2017 +0100 8734 FIX cmk_update_agent: Fixed encoding error if certificate contains non-ascii characters Change-Id: I73ca41ac18d80717bec159a824ed11c1a4abe358 --- .werks/8734 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.werks/8734 b/.werks/8734 new file mode 100644 index 0000000..ed9b410 --- /dev/null +++ b/.werks/8734 @@ -0,0 +1,10 @@ +Title: cmk_update_agent: Fixed encoding error if certificate contains non-ascii characters +Level: 1 +Component: agents +Compatible: compat +Edition: cee +Version: 1.2.8p19 +Date: 1490341441 +Class: fix + +

7 years, 6 months

Bumped expected package sizes by 7MB due to new pycrptodome package.

by Sven Panne

Module: check_mk Branch: master Commit: c5d784e66cf699a8438d43c62fb990e4153771bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5d784e66cf699… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Mar 23 14:38:09 2017 +0100 Bumped expected package sizes by 7MB due to new pycrptodome package. Change-Id: I7946f12c7989e0b8f0ec1fe73758cf3dbcac8060 --- tests/packaging/test_files.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/packaging/test_files.py b/tests/packaging/test_files.py index 2204f35..2891ae1 100644 --- a/tests/packaging/test_files.py +++ b/tests/packaging/test_files.py @@ -25,9 +25,9 @@ def _get_package_paths(version_path, what): # In case packages grow/shrink this check has to be changed. @pytest.mark.parametrize("what,min_size,max_size", [ - ("rpm", 119*1024*1024, 178*1024*1024), - ("deb", 94*1024*1024, 153*1024*1024), - ("cma", 169*1024*1024, 183*1024*1024), + ("rpm", 119*1024*1024, 185*1024*1024), + ("deb", 94*1024*1024, 160*1024*1024), + ("cma", 169*1024*1024, 190*1024*1024), ]) def test_package_sizes(version_path, what, min_size, max_size): for pkg in _get_package_paths(version_path, what):

7 years, 6 months

Prepared WATO password modes and introduced WATO password mode for customers and sidebar snapin

by Simon Betz

Module: check_mk Branch: master Commit: 4cb485a1413a64802d3894ca53ec944bb89aaec9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4cb485a1413a64… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Mar 23 11:28:19 2017 +0100 Prepared WATO password modes and introduced WATO password mode for customers and sidebar snapin Change-Id: I945c287bc119fc84a48d162dff5f350e71638b06 --- web/htdocs/wato.py | 161 ++++++++++++++++++++++++++++------------------------- 1 file changed, 86 insertions(+), 75 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ceb0b58..c76c8193 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15726,6 +15726,11 @@ class PasswordStore(object): class ModePasswords(WatoMode, PasswordStore): + def __init__(self): + super(ModePasswords, self).__init__() + self._contact_groups = userdb.load_group_information().get("contact", {}) + + def title(self): return _("Passwords") @@ -15770,38 +15775,41 @@ class ModePasswords(WatoMode, PasswordStore): "including this password store, are needed in plain text to contact remote systems " "for monitoring. So all those passwords have to be stored readable by the monitoring.")) - contact_groups = userdb.load_group_information().get("contact", {}) - - def contact_group_alias(name): - return contact_groups.get(name, {"alias": name})["alias"] passwords = self._owned_passwords() table.begin("passwords", _("Passwords")) for ident, password in sorted(passwords.items(), key=lambda e: e[1]["title"]): table.row() - - table.cell(_("Actions"), css="buttons") - edit_url = html.makeuri_contextless([("mode", "edit_password"), ("ident", ident)]) - html.icon_button(edit_url, _("Edit this password"), "edit") - delete_url = make_action_link([("mode", "passwords"), ("_delete", ident)]) - html.icon_button(delete_url, _("Delete this password"), "delete") - - table.cell(_("Title"), html.attrencode(password["title"])) - table.cell(_("Editable by")) - if password["owned_by"] == None: - html.write_text(_("Administrators (having the permission " - "\"Write access to all passwords\")")) - else: - html.write_text(contact_group_alias(password["owned_by"])) - table.cell(_("Shared with")) - if not password["shared_with"]: - html.write_text(_("Not shared")) - else: - html.write(html.attrencode(", ".join([ contact_group_alias(g) for g in password["shared_with"]]))) + self._password_row(ident, password) table.end() + def _password_row(self, ident, password): + table.cell(_("Actions"), css="buttons") + edit_url = html.makeuri_contextless([("mode", "edit_password"), ("ident", ident)]) + html.icon_button(edit_url, _("Edit this password"), "edit") + delete_url = make_action_link([("mode", "passwords"), ("_delete", ident)]) + html.icon_button(delete_url, _("Delete this password"), "delete") + + table.cell(_("Title"), html.attrencode(password["title"])) + table.cell(_("Editable by")) + if password["owned_by"] == None: + html.write_text(_("Administrators (having the permission " + "\"Write access to all passwords\")")) + else: + html.write_text(self._contact_group_alias(password["owned_by"])) + table.cell(_("Shared with")) + if not password["shared_with"]: + html.write_text(_("Not shared")) + else: + html.write(html.attrencode(", ".join([ self._contact_group_alias(g) for g in password["shared_with"]]))) + + + def _contact_group_alias(self, name): + return self._contact_groups.get(name, {"alias": name})["alias"] + + class ModeEditPassword(WatoMode, PasswordStore): def __init__(self): @@ -15814,15 +15822,15 @@ class ModeEditPassword(WatoMode, PasswordStore): except KeyError: raise MKUserError("ident", _("This password does not exist.")) - self._new = False - self._ident = ident - self._cfg = password - self._title = _("Edit password: %s") % password["title"] + self._new = False + self._ident = ident + self._cfg = password + self._title = _("Edit password: %s") % password["title"] else: - self._new = True - self._ident = None - self._cfg = {} - self._title = _("New password") + self._new = True + self._ident = None + self._cfg = {} + self._title = _("New password") def title(self): @@ -15834,6 +15842,14 @@ class ModeEditPassword(WatoMode, PasswordStore): def valuespec(self): + return Dictionary( + title = _("Password"), + elements = self._vs_elements(), + optional_keys = ["contact_groups"], + render = "form", ) + + + def _vs_elements(self): if self._new: ident_attr = [ ("ident", ID( @@ -15862,50 +15878,45 @@ class ModeEditPassword(WatoMode, PasswordStore): else: admin_element = [] - return Dictionary( - title = _("Password"), - elements = ident_attr + [ - ("title", TextUnicode( - title = _("Title"), - allow_empty = False, - size = 64, - )), - ("password", PasswordSpec( - title = _("Password"), - allow_empty = False, - hidden = True, - )), - ("owned_by", Alternative( - title = _("Editable by"), - help = _("Each password is owned by a group of users which are able to edit, " - "delete and use existing passwords."), - style = "dropdown", - elements = admin_element + [ - DropdownChoice( - title = _("Members of the contact group:"), - choices = lambda: self.__contact_group_choices(only_own=True), - invalid_choice = "complain", - empty_text = _("You need to be member of at least one contact group to be able to " - "create a password."), - invalid_choice_title = _("Group not existant or not member"), - invalid_choice_error = _("The choosen group is either not existant " - "anymore or you are not a member of this " - "group. Please choose another one."), - ), - ] - )), - ("shared_with", DualListChoice( - title = _("Share with"), - help = _("By default only the members of the owner contact group are permitted " - "to use a a configured password. It is possible to share a password with " - "other groups of users to make them able to use a password in checks."), - choices = self.__contact_group_choices, - autoheight = False, - )), - ], - optional_keys = ["contact_groups"], - render = "form", - ) + return ident_attr + [ + ("title", TextUnicode( + title = _("Title"), + allow_empty = False, + size = 64, + )), + ("password", PasswordSpec( + title = _("Password"), + allow_empty = False, + hidden = True, + )), + ("owned_by", Alternative( + title = _("Editable by"), + help = _("Each password is owned by a group of users which are able to edit, " + "delete and use existing passwords."), + style = "dropdown", + elements = admin_element + [ + DropdownChoice( + title = _("Members of the contact group:"), + choices = lambda: self.__contact_group_choices(only_own=True), + invalid_choice = "complain", + empty_text = _("You need to be member of at least one contact group to be able to " + "create a password."), + invalid_choice_title = _("Group not existant or not member"), + invalid_choice_error = _("The choosen group is either not existant " + "anymore or you are not a member of this " + "group. Please choose another one."), + ), + ] + )), + ("shared_with", DualListChoice( + title = _("Share with"), + help = _("By default only the members of the owner contact group are permitted " + "to use a a configured password. It is possible to share a password with " + "other groups of users to make them able to use a password in checks."), + choices = self.__contact_group_choices, + autoheight = False, + )), + ] def __contact_group_choices(self, only_own=False):

7 years, 6 months

updated werk 4194

by Marcel Arentz

Module: check_mk Branch: master Commit: a2873f1a3cce4db38246ce44a5fb88957585b309 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2873f1a3cce4d… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Mar 23 12:30:12 2017 +0100 updated werk 4194 Change-Id: I0db6577a7abe017f81aa520fb7ed3e5bfcc89c74 --- checks/esx_vsphere_hostsystem | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/checks/esx_vsphere_hostsystem b/checks/esx_vsphere_hostsystem index 7c794ab..c91e82b 100644 --- a/checks/esx_vsphere_hostsystem +++ b/checks/esx_vsphere_hostsystem @@ -418,14 +418,13 @@ def esx_vsphere_multipath_convert(info): paths.setdefault(lun_id, []) # Note: There is no path type information available in these esx paths paths[lun_id].append((state, None, path)) - continue # Legacy format for older vSphere versions: else: path_tokens = path.split('-') if "." not in path_tokens[-1]: continue # invalid format / unknown type - path_type, path_id = path_tokens[-1].split('.') + path_type, lun_id = path_tokens[-1].split('.') hw_type = path.split('.')[0]

7 years, 6 months

Fixed possible exception when visuals use an integer as single info key

by Lars Michelsen

Module: check_mk Branch: master Commit: d3ec484efd66f9339dbf850c3ab2128a312bb91d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3ec484efd66f9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 22 12:44:34 2017 +0100 Fixed possible exception when visuals use an integer as single info key (recently introduced error) Change-Id: I920b9c6d3f664825365f4ff8568e49d8d3ee7d3b --- web/htdocs/visuals.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 3c18941..e62fb37 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -1055,7 +1055,7 @@ def add_context_to_uri_vars(visual, only_infos=None, only_count=False): # filter vars in "multiple" context are not enforced. for key in get_single_info_keys(visual): if key in visual['context']: - html.set_var(key, visual['context'][key]) + html.set_var(key, "%s" % visual['context'][key]) # Now apply the multiple context filters for info_key in only_infos: @@ -1070,7 +1070,7 @@ def add_context_to_uri_vars(visual, only_infos=None, only_count=False): break if not skip or only_count: for uri_varname, value in filter_vars.items(): - html.set_var(uri_varname, value) + html.set_var(uri_varname, "%s" % value) # Vice versa: find all filters that belong to the current URI variables # and create a context dictionary from that.

7 years, 6 months

Reserved 10 Werk IDS

by Andreas Umbreit

Module: check_mk Branch: master Commit: ec8cc466d83146c16678508ea4007f999768e4b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec8cc466d83146… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Thu Mar 23 09:37:18 2017 +0100 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 02588fd..835fe1b 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4556 +4566

7 years, 6 months

some refactoring revisited

by Marcel Arentz

Module: check_mk Branch: master Commit: ec7cdd1288c3efe1c849d583fe8b66ac60b8afd1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec7cdd1288c3ef… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Mar 22 16:56:06 2017 +0100 some refactoring revisited Change-Id: I2e1a898ce40a6eebbeaf211123901056064a4d7a --- checks/esx_vsphere_hostsystem | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/checks/esx_vsphere_hostsystem b/checks/esx_vsphere_hostsystem index 0d694b6..7c794ab 100644 --- a/checks/esx_vsphere_hostsystem +++ b/checks/esx_vsphere_hostsystem @@ -397,10 +397,10 @@ def esx_vsphere_multipath_convert(info): data = zip(data[::2], data[1::2]) for path, state in data: - # ESX 6.0 uses a different format, e.g "vmhba32:C0:T0:L0 active" + # vSphere6 uses a different format, e.g "vmhba32:C0:T0:L0 active" if len(path.split(":")) == 4: hba_num = int(path.split(":")[0].replace("vmhba", "")) - real_path = path.split(":")[-1] + lun_id = path.split(":")[-1] # vmware specificies three different types of LUNs. Physical LUNs will # reserves vmhba number 0-31. The other two reserve numbers of base64. @@ -409,27 +409,29 @@ def esx_vsphere_multipath_convert(info): # 64-95 for logical LUNs like iSCSI. # These should be added as different multipath LUNs. if hba_num >= 32 and hba_num % 64 < 33: - real_path = "%s pseudo-logical" % real_path + lun_id = "%s pseudo-logical" % lun_id elif hba_num >= 32 and hba_num % 64 > 32: - real_path = "%s logical" % real_path + lun_id = "%s logical" % lun_id else: - real_path = "%s physical" % real_path + lun_id = "%s physical" % lun_id - paths.setdefault(real_path, []) + paths.setdefault(lun_id, []) # Note: There is no path type information available in these esx paths - paths[real_path].append((state, None, path)) + paths[lun_id].append((state, None, path)) continue - path_tokens = path.split('-') - if "." not in path_tokens[-1]: - continue # invalid format / unknown type - path_type, path_id = path_tokens[-1].split('.') + # Legacy format for older vSphere versions: + else: + path_tokens = path.split('-') + if "." not in path_tokens[-1]: + continue # invalid format / unknown type + path_type, path_id = path_tokens[-1].split('.') - if path_type in ['naa', 'eui']: hw_type = path.split('.')[0] - if hw_type != 'unknown': - paths.setdefault(path_id, []) - paths[path_id].append((state, "%s/%s" % (path_type, hw_type), path)) + + if path_type in ['naa', 'eui'] and not hw_type == 'unknown': + paths.setdefault(lun_id, []) + paths[lun_id].append((state, "%s/%s" % (path_type, hw_type), path)) return paths

7 years, 6 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2017