Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

Fixed and enabled unneeded-not warnings.

by Sven Panne

Module: check_mk Branch: master Commit: a0f0dbd29f92e5be3c84a7ec27d92598eeea40cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0f0dbd29f92e5… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 17 11:28:27 2018 +0200 Fixed and enabled unneeded-not warnings. Note that we can probably nuke quite a few of the newly introduced bool() calls, but this would require detailed case-by-case analysis. We leave this for a future cleanup. Change-Id: I86f93fd2644e59e016f4915af377d7f9dc98bb4d --- checks/dell_compellent_folder | 2 +- checks/f5_bigip_mem | 2 +- checks/mgmt_hr_fs | 2 +- checks/ucd_hr.include | 2 +- cmk/gui/bi.py | 16 ++++++++-------- cmk/gui/htmllib.py | 2 +- cmk/gui/plugins/views/commands.py | 2 +- cmk/gui/sidebar.py | 2 +- cmk/gui/wato/__init__.py | 6 +++--- cmk/gui/watolib.py | 2 +- cmk_base/config.py | 2 +- cmk_base/events.py | 3 +-- inventory/lnx_packages | 2 +- tests/pylint/pylintrc | 1 - 14 files changed, 22 insertions(+), 24 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a0f0dbd29f…

6 years, 2 months

local: Be strict about perfdata.

by Moritz Kiemer

Module: check_mk Branch: master Commit: f476b2c5fdb1f53999669f098f87a7e61cf14fcd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f476b2c5fdb1f5… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Jul 13 15:10:06 2018 +0200 local: Be strict about perfdata. Also: stop silently converting '' to 0.0 Change-Id: I7d371ad0afbb60b38b75858af85bf68356dfb638 --- checks/local | 102 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 52 insertions(+), 50 deletions(-) diff --git a/checks/local b/checks/local index c985fe0..964ce1b 100644 --- a/checks/local +++ b/checks/local @@ -40,54 +40,27 @@ def local_compute_state(perfdata): texts = [] - # 16MB -> 16.0 - def float_ignore_uom(value): - while value: - if value[-1] not in "0123456789.-": - value = value[:-1] - else: - return float(value) - return 0.0 - - - def outof_levels(value, levels): - if levels == None: - return - - if ':' in levels: - lower, upper = map(float, levels.split(':')) + def outof_levels_text(value, lower, upper): + if upper is not None and value >= upper: + return " %s >= %s" % (value, upper) + elif lower is not None and value <= lower: + return " %s <= %s" % (value, lower) else: - lower = None - upper = float(levels) - if value > upper: - return " %s > %s" % (value, upper) - elif lower != None and value < lower: - return " %s < %s" % (value, lower) + return "" worst = 0 - for entry in perfdata: - if len(entry) < 3: - continue # No levels attached - varname = entry[0] - value = float_ignore_uom(entry[1]) - warn = entry[2] - if len(entry) >= 4: - crit = entry[3] - else: - crit = None + for varname, value, lwarn, uwarn, lcrit, ucrit in perfdata: - text = outof_levels(value, crit) - if text: + text_crit = outof_levels_text(value, lcrit, ucrit) + if text_crit: worst = 2 - text = "%s%s(!!)" % (varname, text) - texts.append(text) + texts.append("%s%s(!!)" % (varname, text_crit)) else: - text = outof_levels(value, warn) - if text: + text_warn = outof_levels_text(value, lwarn, uwarn) + if text_warn: worst = max(worst, 1) - text = "%s%s(!)" % (varname, text) - texts.append(text) + texts.append("%s%s(!)" % (varname, text_warn)) else: texts.append("%s is %s(.)" % (varname, value)) @@ -109,6 +82,37 @@ def inventory_local(info): # Some helper functions +def float_ignore_uom(value): + # 16MB -> 16.0 + while value: + if value[-1] not in "0123456789.-": + value = value[:-1] + else: + break + # allow ValueError to be raised for '' + return float(value) + + +def _parse_perf_entry(entry): + """Parse to a list + + return [name, value, lower warn, upper warn, + lower crit, upper crit, min, max] + Do all needed type conversion here, to benefit from the try block + """ + varname, valuetxt = entry.split('=') + valuetxt = valuetxt.split(';') + p_entry = [varname, float_ignore_uom(valuetxt[0])] + for param in valuetxt[1:]: + if ':' in param: + p_entry += map(float, param.split(':')) + else: + p_entry += [None, float(param)] + p_entry += [None] * (8 - len(p_entry)) + + return p_entry + + def _parse_local_line(line): if not (len(line) >= 4 or (len(line) == 3 and line[0] == 'P')): return 3, "Incomplete line in local check output: %s" % " ".join(line), [] @@ -125,17 +129,15 @@ def _parse_local_line(line): if perftxt != "-": for entry in perftxt.split('|'): try: - varname, valuetxt = entry.split('=') - values = valuetxt.split(';') - compute_data.append( tuple([varname] + values) ) - # perfdata must not contain values with colons. So we split - # these values and use the upper levels only. - upper_values = [v.split(':')[-1] for v in values] - perfdata.append( tuple([varname] + upper_values) ) - + p_entry = _parse_perf_entry(entry) except ValueError: - return 3, "Invalid performance data %s in local check output %s" % \ - (perftxt, " ".join(line)), [] + return 3, "Invalid performance data entry %s in local check output %s" % \ + (entry, " ".join(line)), [] + compute_data.append(p_entry[:6]) + # perfdata must not contain lower levels + perfdata.append((p_entry[0], p_entry[1], p_entry[3], + p_entry[5], p_entry[6], p_entry[7])) + if statechar == 'P': state, texts = local_compute_state(compute_data)

6 years, 2 months

Be strict about discovery returning 2-tuples

by Moritz Kiemer

Module: check_mk Branch: master Commit: 4968dcd8d60789044108fbd456062aca2178e4e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4968dcd8d60789… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Jul 17 10:52:08 2018 +0200 Be strict about discovery returning 2-tuples lparstat_aix, windows_broadcom_bonding: Remove empty comment string cmk_base/discovery.py: Remove the ValueError that never was, and be more explicit. Adapt reality to error message (no quadruples!) Change-Id: I2793f59f897481da566433e3cb73fe071c55a0c1 --- checks/lparstat_aix | 2 +- checks/windows_broadcom_bonding | 2 +- cmk_base/discovery.py | 13 ++++++------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/checks/lparstat_aix b/checks/lparstat_aix index 4ae565a..242736a 100644 --- a/checks/lparstat_aix +++ b/checks/lparstat_aix @@ -50,7 +50,7 @@ lparstat_default_levels = (5, 10) def inventory_lparstat(info): if len(info) >= 1 and len(info[-1]) >= 5: - return [(None, "", "lparstat_default_levels")] + return [(None, "lparstat_default_levels")] def check_lparstat(item, params, info): if len(info) == 1: diff --git a/checks/windows_broadcom_bonding b/checks/windows_broadcom_bonding index a400ffa..f01270e 100644 --- a/checks/windows_broadcom_bonding +++ b/checks/windows_broadcom_bonding @@ -34,7 +34,7 @@ def inventory_windows_broadcom_bonding(info): inventory = [] for line in info[1:]: - inventory.append( (" ".join(line[:-1]), "", None) ) + inventory.append( (" ".join(line[:-1]), None) ) return inventory def check_windows_broadcom_bonding(item, params, info): diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index 9de6777..a4940f9 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -792,13 +792,12 @@ def _execute_discovery(multi_host_sections, hostname, ipaddress, check_plugin_na if len(entry) == 2: # comment is now obsolete item, paramstring = entry - else: - try: - item, paramstring = entry[0], entry[2] - except ValueError: - console.error("%s: Check %s returned invalid discovery data (not 2 or 3 elements): %r\n" % - (hostname, check_plugin_name, repr(entry))) - continue + elif len(entry) == 3: # allow old school + item, __, paramstring = entry + else: # we really don't want longer tuples (or 1-tuples). + console.error("%s: Check %s returned invalid discovery data (not 2 or 3 elements): %r\n" % + (hostname, check_plugin_name, repr(entry))) + continue # Check_MK 1.2.7i3 defines items to be unicode strings. Convert non unicode # strings here seamless. TODO remove this conversion one day and replace it

6 years, 2 months

Use config.user object in host/folder permission checking

by Lars Michelsen

Module: check_mk Branch: master Commit: 49c65215fa7267424f3c23c1aa50648ee1c56a18 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49c65215fa7267… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 17 08:03:26 2018 +0200 Use config.user object in host/folder permission checking Cleaned up handing over of the user_id of the currently logged in user. Instead use the more up-to-date config.user object to access the currently logged in users information. Change-Id: Ie6c00118425bdbcfa9c6df67600c5a6332d0af9f --- cmk/gui/watolib.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index bac3faa..2d22165 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -783,7 +783,7 @@ class ConfigDomainOMD(ConfigDomain): class WithPermissions(object): def may(self, how): # how is "read" or "write" try: - self._user_needs_permission(config.user.id, how) + self._user_needs_permission(how) return True except MKAuthException, e: return False @@ -791,17 +791,17 @@ class WithPermissions(object): def reason_why_may_not(self, how): try: - self._user_needs_permission(config.user.id, how) + self._user_needs_permission(how) return False except MKAuthException, e: return HTML("%s" % e) def need_permission(self, how): - self._user_needs_permission(config.user.id, how) + self._user_needs_permission(how) - def _user_needs_permission(self, user_id, how): + def _user_needs_permission(self, how): raise NotImplementedError() @@ -1984,14 +1984,14 @@ class CREFolder(BaseFolder): return host - def _user_needs_permission(self, user_id, how): - if config.user_may(user_id, "wato.all_folders"): + def _user_needs_permission(self, how): + if config.user.may("wato.all_folders"): return - if how == "read" and config.user_may(user_id, "wato.see_all_folders"): + if how == "read" and config.user.may("wato.see_all_folders"): return permitted_groups, folder_contactgroups, use_for_services = self.groups() - user_contactgroups = userdb.contactgroups_of_user(user_id) + user_contactgroups = userdb.contactgroups_of_user(config.user.id) for c in user_contactgroups: if c in permitted_groups: @@ -2586,7 +2586,7 @@ class SearchFolder(BaseFolder): return True - def _user_needs_permission(self, user_id, how): + def _user_needs_permission(self, how): pass @@ -2893,7 +2893,7 @@ class CREHost(WithPermissionsAndAttributes): return self.folder().groups(self) - def _user_needs_permission(self, user_id, how): + def _user_needs_permission(self, how): if config.user.may("wato.all_folders"): return True @@ -2901,7 +2901,7 @@ class CREHost(WithPermissionsAndAttributes): config.user.need_permission("wato.edit_hosts") permitted_groups, host_contact_groups, use_for_services = self.groups() - user_contactgroups = userdb.contactgroups_of_user(user_id) + user_contactgroups = userdb.contactgroups_of_user(config.user.id) for c in user_contactgroups: if c in permitted_groups:

6 years, 2 months

Extended expected packet sizes (Needed for new 32bit agent updater)

by Lars Michelsen

Module: check_mk Branch: master Commit: 40eea76209639183756f4b38190ae98628b63c73 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40eea762096391… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 17 11:50:14 2018 +0200 Extended expected packet sizes (Needed for new 32bit agent updater) Change-Id: I537850d89c5fe8ec40a3bdc0410be8d1851e0ce5 --- tests/packaging/test_files.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/packaging/test_files.py b/tests/packaging/test_files.py index 7a666e4..14b6e3b 100644 --- a/tests/packaging/test_files.py +++ b/tests/packaging/test_files.py @@ -22,9 +22,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, 210*1024*1024), + ("rpm", 119*1024*1024, 215*1024*1024), ("deb", 94*1024*1024, 195*1024*1024), - ("cma", 169*1024*1024, 215*1024*1024), + ("cma", 169*1024*1024, 220*1024*1024), ("tar.gz", 320*1024*1024, 400*1024*1024), ]) def test_package_sizes(version_path, what, min_size, max_size):

6 years, 2 months

6351 FIX Fixed creating BI aggregations

by Lars Michelsen

Module: check_mk Branch: master Commit: 3af2a052507894a864aae410061280b655c5a95c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3af2a052507894… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 17 07:51:14 2018 +0200 6351 FIX Fixed creating BI aggregations In previous 1.5 releases it was not possible to create BI aggregations using the WATO configuration. Change-Id: I7a7ebc4c458a63d0f09791bba241d3f856cb776a --- .werks/6351 | 12 ++++++++++++ cmk/gui/plugins/wato/bi.py | 5 ++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/6351 b/.werks/6351 new file mode 100644 index 0000000..3fd9196 --- /dev/null +++ b/.werks/6351 @@ -0,0 +1,12 @@ +Title: Fixed creating BI aggregations +Level: 1 +Component: bi +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1531806596 + +In previous 1.5 releases it was not possible to create BI aggregations using +the WATO configuration. diff --git a/cmk/gui/plugins/wato/bi.py b/cmk/gui/plugins/wato/bi.py index 865b488..69d8b47 100644 --- a/cmk/gui/plugins/wato/bi.py +++ b/cmk/gui/plugins/wato/bi.py @@ -599,7 +599,10 @@ class ModeBI(WatoMode, BIManagement): def _transform_forth_vs_call_rule(self, choice): pack = self.pack_containing_rule(choice) - return (pack['id'], choice) + if pack: + return (pack['id'], choice) + else: + return None def _get_vs_host_re(self):

6 years, 2 months

Simplified host/folder permission checking

by Lars Michelsen

Module: check_mk Branch: master Commit: a35f5a88a0e5c1054640188add618e0007a587a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a35f5a88a0e5c1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 17 07:59:48 2018 +0200 Simplified host/folder permission checking * Dropped a few useless methods * Made internal helpers private Change-Id: I8a9dd79fcc07aff71c19db7d67175f9753b254e9 --- cmk/gui/watolib.py | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index d316bdd..bac3faa 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -782,37 +782,29 @@ class ConfigDomainOMD(ConfigDomain): class WithPermissions(object): def may(self, how): # how is "read" or "write" - return self.user_may(config.user.id, how) - - - def reason_why_may_not(self, how): - return self.reason_why_user_may_not(config.user.id, how) - - - def user_needs_permission(self, user_id, how): - raise NotImplementedError() - - - def need_permission(self, how): - self.user_needs_permission(config.user.id, how) - - - def user_may(self, user_id, how): try: - self.user_needs_permission(user_id, how) + self._user_needs_permission(config.user.id, how) return True except MKAuthException, e: return False - def reason_why_user_may_not(self, user_id, how): + def reason_why_may_not(self, how): try: - self.user_needs_permission(user_id, how) + self._user_needs_permission(config.user.id, how) return False except MKAuthException, e: return HTML("%s" % e) + def need_permission(self, how): + self._user_needs_permission(config.user.id, how) + + + def _user_needs_permission(self, user_id, how): + raise NotImplementedError() + + # Base class containing a couple of generic permission checking functions, used # for Host and Folder @@ -1992,7 +1984,7 @@ class CREFolder(BaseFolder): return host - def user_needs_permission(self, user_id, how): + def _user_needs_permission(self, user_id, how): if config.user_may(user_id, "wato.all_folders"): return if how == "read" and config.user_may(user_id, "wato.see_all_folders"): @@ -2594,7 +2586,7 @@ class SearchFolder(BaseFolder): return True - def user_needs_permission(self, user_id, how): + def _user_needs_permission(self, user_id, how): pass @@ -2901,7 +2893,7 @@ class CREHost(WithPermissionsAndAttributes): return self.folder().groups(self) - def user_needs_permission(self, user_id, how): + def _user_needs_permission(self, user_id, how): if config.user.may("wato.all_folders"): return True

6 years, 2 months

Fixed possible broken GUI cron jobs when no user is authenticated

by Lars Michelsen

Module: check_mk Branch: master Commit: 0b0935c844365f55630dc3fe9923e579a88a585b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b0935c844365f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 17 08:35:14 2018 +0200 Fixed possible broken GUI cron jobs when no user is authenticated The cron job page handler, which is a "not authenticated" call, is now being initialized with the super user context which means that the following code is permitted for all GUI permissions. Single jobs may change the user contexts as before, depending on their needs. Change-Id: I33b111d28584d452a125f18c7730215071c087d9 --- cmk/gui/cron.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cmk/gui/cron.py b/cmk/gui/cron.py index 9565d5d..4996aef 100644 --- a/cmk/gui/cron.py +++ b/cmk/gui/cron.py @@ -34,6 +34,7 @@ import cmk.store as store import cmk.gui.utils as utils import cmk.gui.i18n import cmk.gui.pages +import cmk.gui.config as config from cmk.gui.globals import html from cmk.gui.log import logger from cmk.gui.exceptions import MKGeneralException @@ -75,6 +76,13 @@ def page_run_cron(): file(lock_file, "w") # touches the file store.aquire_lock(lock_file) + # The cron page is accessed unauthenticated. After leaving the page_run_cron area + # into the job functions we always want to have a user context initialized to keep + # the code free from special cases (if no user logged in, then...). + # The jobs need to be run in privileged mode in general. Some jobs, like the network + # scan, switch the user context to a specific other user during execution. + config.set_super_user() + logger.debug("Starting cron jobs") for cron_job in multisite_cronjobs:

6 years, 2 months

6228 fortisandbox_cpu_util, fortisandbox_queues: New checks for Fortinet FortiSandbox Appliance

by Konstantin Büttner

Module: check_mk Branch: master Commit: d08b261318cf91659443fa575f94bf3310bb1ff1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d08b261318cf91… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Jul 17 11:34:57 2018 +0200 6228 fortisandbox_cpu_util, fortisandbox_queues: New checks for Fortinet FortiSandbox Appliance Change-Id: I112ba4486119a55ba68b5b5b7a83ae4b013e9e8a --- .werks/6228 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.werks/6228 b/.werks/6228 new file mode 100644 index 0000000..09453d6 --- /dev/null +++ b/.werks/6228 @@ -0,0 +1,10 @@ +Title: fortisandbox_cpu_util, fortisandbox_queues: New checks for Fortinet FortiSandbox Appliance +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1531820073 +Class: feature + +

6 years, 2 months

6310 FIX mk_postgres: Fixed baking postgres plugin and related bakery rule

by Simon Betz

Module: check_mk Branch: master Commit: d31ab121765542176d00b271dcad3ed99f17a38f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d31ab121765542… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jul 16 14:07:13 2018 +0200 6310 FIX mk_postgres: Fixed baking postgres plugin and related bakery rule Change-Id: I420fd04fd19732bb62df54e4514453a16292b675 --- .werks/6310 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/6310 b/.werks/6310 new file mode 100644 index 0000000..784fb08 --- /dev/null +++ b/.werks/6310 @@ -0,0 +1,11 @@ +Title: mk_postgres: Fixed baking postgres plugin and related bakery rule +Level: 1 +Component: agents +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1531742798 + +

6 years, 2 months

← Newer
1
...
19
20
21
22
23
24
25
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2018