Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

6309 FIX winperf: Set default levels to 90, 95 percent

by Simon Betz

Module: check_mk Branch: master Commit: ad0b6203469bbf30255484289645b258d19ffc10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad0b6203469bbf… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jul 16 10:32:17 2018 +0200 6309 FIX winperf: Set default levels to 90, 95 percent Change-Id: Ic6e0f2c5b191a030cc871aea73720f2528f74b31 --- .werks/6309 | 10 ++++++++++ checks/winperf | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/6309 b/.werks/6309 new file mode 100644 index 0000000..7a84fad --- /dev/null +++ b/.werks/6309 @@ -0,0 +1,10 @@ +Title: winperf: Set default levels to 90, 95 percent +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1531729918 +Class: fix + + diff --git a/checks/winperf b/checks/winperf index 94ff322..33403f2 100644 --- a/checks/winperf +++ b/checks/winperf @@ -33,7 +33,7 @@ def inventory_win_cpuusage(info): except: pass -winperf_cpu_default_levels = ( 101, 101 ) +winperf_cpu_default_levels = (90, 95) # params: levels for warn / crit in percentage def check_win_cpuusage(item, params, info):

6 years, 2 months

Updated werk

by Simon Betz

Module: check_mk Branch: master Commit: 7dac3023283cfe775661c400ac0b03f9df6cbe89 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7dac3023283cfe… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jul 16 10:36:28 2018 +0200 Updated werk Change-Id: I439c177529d626a3a7e8832b384b010be1a287a3 --- .werks/6309 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.werks/6309 b/.werks/6309 index 7a84fad..6e04da6 100644 --- a/.werks/6309 +++ b/.werks/6309 @@ -7,4 +7,6 @@ Version: 1.6.0i1 Date: 1531729918 Class: fix - +Before these levels were set to 101, 101 percent. +You have to perform a rediscovery in order to use +the new ones.

6 years, 2 months

Explicitly import html object everywhere

by Lars Michelsen

6 years, 2 months

Add all GUI python source files to mypy files

by Lars Michelsen

Module: check_mk Branch: master Commit: 2c42831a718043a3fb8cead8dd1b869ec5dcab95 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c42831a718043… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 12 22:37:05 2018 +0200 Add all GUI python source files to mypy files Change-Id: If6a4ec82ca5be3410f4e2d50ad85a3da36c352dd --- tests/static/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/static/Makefile b/tests/static/Makefile index 5399e16..9fae91a 100644 --- a/tests/static/Makefile +++ b/tests/static/Makefile @@ -1,5 +1,5 @@ -FILES_TO_CHECK := $(realpath $(addprefix ../../cmk/ec/,defaults.py export.py settings.py)) \ - $(realpath $(addprefix ../../cmk/gui/,http_status.py exceptions.py i18n.py)) +FILES_TO_CHECK := $(realpath ../../cmk)\ + $(realpath ../../cmk/gui/app/index.wsgi) MYPYPATH := $(realpath typeshed) PIPENV := PIPENV_NO_INHERIT=true PIPENV_VENV_IN_PROJECT=true pipenv

6 years, 2 months

Dropped the automatically available html variable

by Lars Michelsen

Module: check_mk Branch: master Commit: f9b4feaf6a5d22d4028ac876ddd0691987876184 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9b4feaf6a5d22… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 12 22:13:34 2018 +0200 Dropped the automatically available html variable Previously the current html object was available to all GUI code via the __builtin__ namespace while processing a request. This was tool friendly and has been replaced with this mechanism. We have a proxy object which forwards all requests to the html() object of the current request. Each module that needs the html object for e.g. rendering html code needs to use the import "from cmk.gui.globals import html" first. Change-Id: Id590d42bc0a8a27defeb6bad2619c6f0dd00bdb8 --- cmk/gui/globals.py | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++ tests/pylint/pylintrc | 4 ---- web/app/index.wsgi | 15 ++++++++----- 3 files changed, 70 insertions(+), 9 deletions(-) diff --git a/cmk/gui/globals.py b/cmk/gui/globals.py new file mode 100644 index 0000000..9a8218d --- /dev/null +++ b/cmk/gui/globals.py @@ -0,0 +1,60 @@ +#!/usr/bin/env python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +# Previously the current html object was available to all GUI code via the +# __builtin__ namespace while processing a request. This was tool friendly +# and has been replaced with this mechanism. We have a proxy object which +# forwards all requests to the html() object of the current request. + +class HTMLProxy(object): + def __init__(self): + super(HTMLProxy, self).__init__() + self._current_html = None + + + def set_current(self, obj): + self._current_html = obj + + + def unset_current(self): + self._current_html = None + + + def __getattribute__(self, name): + if name == "set_current" or name == "unset_current" or name == "_current_html": + return object.__getattribute__(self, name) + + h = self._current_html + if h is None: + raise AttributeError("Not in html context") + return getattr(h, name) + + + def __repr__(self): + return repr(self._current_html) + + +html = HTMLProxy() diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index 7537c78..497e046 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -105,7 +105,3 @@ msg-template={path}:{line}: [{msg_id}({symbol}), {obj}] {msg} [FORMAT] max-line-length=100 - -[VARIABLES] -# Needed by web code because of super globals. TODO Clean this up some day -additional-builtins=html diff --git a/web/app/index.wsgi b/web/app/index.wsgi index d4f3b87..dcd4605 100644 --- a/web/app/index.wsgi +++ b/web/app/index.wsgi @@ -32,8 +32,10 @@ import traceback import livestatus +import cmk.paths +import cmk.store as store + import cmk.gui.i18n -from cmk.gui.i18n import _ import cmk.gui.sites as sites import cmk.gui.config as config import cmk.gui.modules as modules @@ -41,12 +43,13 @@ import cmk.gui.pages as pages import cmk.gui.userdb as userdb import cmk.gui.login as login import cmk.gui.log as log -from cmk.gui.log import logger import cmk.gui.htmllib import cmk.gui.http import cmk.gui.http_status -import cmk.paths -import cmk.store as store +import cmk.gui.globals +from cmk.gui.log import logger +from cmk.gui.i18n import _ +from cmk.gui.globals import html from cmk.gui.exceptions import ( MKUserError, @@ -68,7 +71,8 @@ class Application(object): # Create an object that contains all data about the request and # helper functions for creating valid HTML. Parse URI and # store results in the request object for later usage. - __builtin__.html = cmk.gui.htmllib.html(self._request, self._response) + h = cmk.gui.htmllib.html(self._request, self._response) + cmk.gui.globals.html.set_current(h) self._process_request() @@ -149,6 +153,7 @@ class Application(object): userdb.finalize() sites.disconnect() html.finalize() + cmk.gui.globals.html.unset_current() def _handle_request(self):

6 years, 2 months

Attempted fix/workaround for background job problem (untested).

by Sven Panne

Module: check_mk Branch: master Commit: 80cf7e23f738ca2d15ccc5898d2b0fa2d5f8e815 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80cf7e23f738ca… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jul 16 09:29:40 2018 +0200 Attempted fix/workaround for background job problem (untested). Change-Id: I6476258791b95ca373b968724a97e9c478d87fe5 --- cmk/gui/gui_background_job.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cmk/gui/gui_background_job.py b/cmk/gui/gui_background_job.py index 12b8534..c4b2e12 100644 --- a/cmk/gui/gui_background_job.py +++ b/cmk/gui/gui_background_job.py @@ -150,6 +150,9 @@ class GUIBackgroundJobSnapshottedFunctions(background_job.BackgroundJob): +# TODO: The superclasses are nonsense: GUIBackgroundJobSnapshottedFunctions +# already derives from background_jobs.BackgroundJob. What is the right way to +# fix this? class GUIBackgroundJob(GUIBackgroundJobSnapshottedFunctions, background_job.BackgroundJob): _background_process_class = GUIBackgroundProcess @@ -193,14 +196,16 @@ class GUIBackgroundJob(GUIBackgroundJobSnapshottedFunctions, background_job.Back # Provides the frozen state of a background job # Quite helpful when generating GUI pages with several phases + +# TODO: What on earth is this class supposed to do? class GUIBackgroundStatusSnapshot(object): def __init__(self, background_job): super(GUIBackgroundStatusSnapshot, self).__init__() self._job_status = background_job.get_status() self._logger = background_job._logger.getChild("snapshot") - for name, value in GUIBackgroundJobSnapshottedFunctions.__dict__.iteritems(): - if hasattr(value, "__call__"): + for name in dir(GUIBackgroundJobSnapshottedFunctions): + if callable(getattr(GUIBackgroundJobSnapshottedFunctions, name)): self._job_status[name] = getattr(background_job, name)()

6 years, 2 months

6346 FIX Fixed failed host rename when host is configured as parent on folder level

by Lars Michelsen

Module: check_mk Branch: master Commit: 464e03f18554714a83274bf78c25004e419cfbba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=464e03f1855471… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 13 13:45:35 2018 +0200 6346 FIX Fixed failed host rename when host is configured as parent on folder level During host rename an error "TypeError: not all arguments converted during string formatting" could occur. This happened when the host was configured in at least one folder as parent. In such a situation the host was renamed partially. The best way to recover from this situation is to activate all pending changes and use the renaming feature again to change the host back to it's original name. Then update to at least 1.5.0b9 and try renaming the host again. Change-Id: If4581639053ba5eecf2b7f3b876756649bbf8437 --- .werks/6346 | 16 ++++++++++++++++ cmk/gui/watolib.py | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.werks/6346 b/.werks/6346 new file mode 100644 index 0000000..50b7741 --- /dev/null +++ b/.werks/6346 @@ -0,0 +1,16 @@ +Title: Fixed failed host rename when host is configured as parent on folder level +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1531482119 + +During host rename an error "TypeError: not all arguments converted during string formatting" could +occur. This happened when the host was configured in at least one folder as parent. + +In such a situation the host was renamed partially. The best way to recover from this situation +is to activate all pending changes and use the renaming feature again to change the host back +to it's original name. Then update to at least 1.5.0b9 and try renaming the host again. diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index 65ffe51..f4aed4d 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -2398,8 +2398,8 @@ class CREFolder(BaseFolder): if not changed: return False - add_change("rename-parent", _("Renamed parent (set in folder) from %s to %s") % - (self.path(), oldname, newname), + add_change("rename-parent", _("Renamed parent from %s to %s in folder \"%s\"") % + (oldname, newname, self.alias_path()), obj=self, sites=self.all_site_ids()) self.save_hosts() self.save()

6 years, 2 months

6348 FIX Contact groups in notification rule conditions are now sorted

by Lars Michelsen

Module: check_mk Branch: master Commit: a05b5c6d1c4d214c4bc9f66d9160501bfc537750 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a05b5c6d1c4d21… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 13 14:52:47 2018 +0200 6348 FIX Contact groups in notification rule conditions are now sorted Change-Id: Ic6ba060f13037aa6e3ea033c93c2fdb1382dfe77 --- .werks/6348 | 11 +++++++++++ cmk/gui/userdb.py | 5 +++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/6348 b/.werks/6348 new file mode 100644 index 0000000..883ad0e --- /dev/null +++ b/.werks/6348 @@ -0,0 +1,11 @@ +Title: Contact groups in notification rule conditions are now sorted +Level: 1 +Component: notifications +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1531486339 + + diff --git a/cmk/gui/userdb.py b/cmk/gui/userdb.py index 02a1dd5..567f5ad 100644 --- a/cmk/gui/userdb.py +++ b/cmk/gui/userdb.py @@ -1086,8 +1086,9 @@ class GroupChoice(DualListChoice): def load_groups(self, with_foreign_groups): all_groups = load_group_information() this_group = all_groups.get(self.what, {}) - return [ (k, t['alias'] and t['alias'] or k) for (k, t) in this_group.items() - if with_foreign_groups or k in config.user.contact_groups() ] + return sorted([ (k, t['alias'] and t['alias'] or k) for (k, t) in this_group.items() + if with_foreign_groups or k in config.user.contact_groups() ], + key=lambda x: x[1].lower()) #.

6 years, 2 months

Fixed and enabled blacklisted-name warnings.

by Sven Panne

Module: check_mk Branch: master Commit: 501e2447cd75921f02472d92993e46b0939d312f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=501e2447cd7592… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jul 13 15:07:19 2018 +0200 Fixed and enabled blacklisted-name warnings. Change-Id: I73ae03719eb4e4f8543b8cf15e882ba714ffc6f0 --- checks/blade_powerfan | 3 ++- checks/fsc_fans | 3 ++- checks/fsc_subsystems | 3 ++- checks/genua_fan | 3 ++- checks/logwatch | 30 ++++++++++++++++++++---------- checks/netctr | 3 ++- cmk/gui/config.py | 27 ++++++++++++++++++--------- cmk/gui/logwatch.py | 24 ++++++++++++++++-------- cmk/gui/md5crypt.py | 6 ++++-- cmk/gui/plugins/views/layouts.py | 3 ++- cmk/gui/views.py | 3 ++- cmk/gui/visuals.py | 3 ++- omd/packages/omd/omd | 6 ++++-- tests/pylint/pylintrc | 1 - 14 files changed, 78 insertions(+), 40 deletions(-) diff --git a/checks/blade_powerfan b/checks/blade_powerfan index a85495a..46f4d32 100644 --- a/checks/blade_powerfan +++ b/checks/blade_powerfan @@ -31,7 +31,8 @@ def inventory_blade_powerfan(info): def check_blade_powerfan(item, params, info): warn_perc, crit_perc = params for index, present, status, fancount, speedperc, rpm, ctrlstate in info: - if index != item: continue + if index != item: + continue perfdata=[ ('perc', speedperc, warn_perc, crit_perc, "0", "100" ), ('rpm', rpm ) ] speedperc_int = saveint(speedperc) diff --git a/checks/fsc_fans b/checks/fsc_fans index 10e9369..5ea3177 100644 --- a/checks/fsc_fans +++ b/checks/fsc_fans @@ -34,7 +34,8 @@ def check_fsc_fans(item, params, info): for line in info: # , value1, value2 in info: name = line[0] - if name != item: continue + if name != item: + continue rpm = int(line[1]) return check_fan(rpm, params) diff --git a/checks/fsc_subsystems b/checks/fsc_subsystems index a3e3e37..aa0dce7 100644 --- a/checks/fsc_subsystems +++ b/checks/fsc_subsystems @@ -32,7 +32,8 @@ def check_fsc_subsystems(item, params, info): warn, crit = params for line in info: # , value1, value2 in info: name = line[0] - if name != item: continue + if name != item: + continue if line[1] == u"": return 3, "Status not found in SNMP data" status = int(line[1]) diff --git a/checks/genua_fan b/checks/genua_fan index 85f06b4..ae002a2 100644 --- a/checks/genua_fan +++ b/checks/genua_fan @@ -57,7 +57,8 @@ def check_genua_fan(item, params, info): upperwarn, uppercrit = params["upper"] for line in info[0]: fanNo, fanName, fanRPM, fanState = line - if fanName != item: continue + if fanName != item: + continue rpm = saveint(fanRPM) state, state_readable = map_states[fanState] diff --git a/checks/logwatch b/checks/logwatch index 02a824a..0729d7b 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -136,19 +136,29 @@ def logwatch_state(state): def logwatch_level_name(level): - if level == 'O': return 'OK' - elif level == 'W': return 'WARN' - elif level == 'u': return 'WARN' # undefined states are treated as warning - elif level == 'C': return 'CRIT' - else: return 'IGN' + if level == 'O': + return 'OK' + elif level == 'W': + return 'WARN' + elif level == 'u': + return 'WARN' # undefined states are treated as warning + elif level == 'C': + return 'CRIT' + else: + return 'IGN' def logwatch_level_worst(worst, level): - if level == 'O': return max(worst, 0) - elif level == 'W': return max(worst, 1) - elif level == 'u': return max(worst, 1) - elif level == 'C': return max(worst, 2) - else: return worst + if level == 'O': + return max(worst, 0) + elif level == 'W': + return max(worst, 1) + elif level == 'u': + return max(worst, 1) + elif level == 'C': + return max(worst, 2) + else: + return worst # Extracts patterns that are relevant for the current host and item. diff --git a/checks/netctr b/checks/netctr index e223d3f..5a21fd7 100644 --- a/checks/netctr +++ b/checks/netctr @@ -73,7 +73,8 @@ def check_netctr_combined(nic, params, info): # Look for line describing this nic for nicline in info[1:]: - if nicline[0] != nic: continue + if nicline[0] != nic: + continue perfdata = [] infotxt = "" problems_per_sec = 0.0 diff --git a/cmk/gui/config.py b/cmk/gui/config.py index 44f1b3a..643b2ab 100644 --- a/cmk/gui/config.py +++ b/cmk/gui/config.py @@ -91,15 +91,24 @@ permission_declaration_functions = [] ALL_HOSTS = '(.*)' HOST_STATE = ('__HOST_STATE__',) HIDDEN = ('__HIDDEN__',) -class FOREACH_HOST(object): pass -class FOREACH_CHILD(object): pass -class FOREACH_CHILD_WITH(object): pass -class FOREACH_PARENT(object): pass -class FOREACH_SERVICE(object): pass -class REMAINING(object): pass -class DISABLED(object): pass -class HARD_STATES(object): pass -class DT_AGGR_WARN(object): pass +class FOREACH_HOST(object): + pass +class FOREACH_CHILD(object): + pass +class FOREACH_CHILD_WITH(object): + pass +class FOREACH_PARENT(object): + pass +class FOREACH_SERVICE(object): + pass +class REMAINING(object): + pass +class DISABLED(object): + pass +class HARD_STATES(object): + pass +class DT_AGGR_WARN(object): + pass # Has to be declared here once since the functions can be assigned in # bi.py and also in multisite.mk. "Double" declarations are no problem diff --git a/cmk/gui/logwatch.py b/cmk/gui/logwatch.py index e866568..b3d0650 100644 --- a/cmk/gui/logwatch.py +++ b/cmk/gui/logwatch.py @@ -482,16 +482,24 @@ stylesheets = [ 'pages', 'status', 'logwatch' ] nagios_illegal_chars = '`;~!$%^&*|\'"<>?,()=' def level_name(level): - if level == 'W': return 'WARN' - elif level == 'C': return 'CRIT' - elif level == 'O': return 'OK' - else: return 'OK' + if level == 'W': + return 'WARN' + elif level == 'C': + return 'CRIT' + elif level == 'O': + return 'OK' + else: + return 'OK' def level_state(level): - if level == 'W': return 1 - elif level == 'C': return 2 - elif level == 'O': return 0 - else: return 0 + if level == 'W': + return 1 + elif level == 'C': + return 2 + elif level == 'O': + return 0 + else: + return 0 #. diff --git a/cmk/gui/md5crypt.py b/cmk/gui/md5crypt.py index 2d9ff1d..c11611e 100644 --- a/cmk/gui/md5crypt.py +++ b/cmk/gui/md5crypt.py @@ -88,10 +88,12 @@ def md5crypt(password, salt, magic='$1$'): for a, b, c in ((0, 6, 12), (1, 7, 13), (2, 8, 14), (3, 9, 15), (4, 10, 5)): v = ord(final[a]) << 16 | ord(final[b]) << 8 | ord(final[c]) for i in range(4): - rearranged += itoa64[v & 0x3f]; v >>= 6 + rearranged += itoa64[v & 0x3f] + v >>= 6 v = ord(final[11]) for i in range(2): - rearranged += itoa64[v & 0x3f]; v >>= 6 + rearranged += itoa64[v & 0x3f] + v >>= 6 return magic + salt + '$' + rearranged diff --git a/cmk/gui/plugins/views/layouts.py b/cmk/gui/plugins/views/layouts.py index ebcdfb1..c3fea76 100644 --- a/cmk/gui/plugins/views/layouts.py +++ b/cmk/gui/plugins/views/layouts.py @@ -654,7 +654,8 @@ def render_grouped_list(rows, view, group_cells, cells, num_columns, show_checkb # render state, if available through whole tr if not row.get('service_description'): state = row.get("host_state", 0) - if state > 0: state +=1 # 1 is critical for hosts + if state > 0: + state +=1 # 1 is critical for hosts else: state = row.get("service_state", 0) else: diff --git a/cmk/gui/views.py b/cmk/gui/views.py index a06b116..003c306 100644 --- a/cmk/gui/views.py +++ b/cmk/gui/views.py @@ -1582,7 +1582,8 @@ def sort_data(data, sorters): c = neg * func(e1, e2, *args) else: c = neg * func(e1, e2) - if c != 0: return c + if c != 0: + return c return 0 # equal data.sort(multisort) diff --git a/cmk/gui/visuals.py b/cmk/gui/visuals.py index 221ca13..6a222b8 100644 --- a/cmk/gui/visuals.py +++ b/cmk/gui/visuals.py @@ -103,7 +103,8 @@ def load_plugins(force): }, }) - global title_functions ; title_functions = [] + global title_functions + title_functions = [] utils.load_web_plugins('visuals', globals()) diff --git a/omd/packages/omd/omd b/omd/packages/omd/omd index 126554d..b01701b 100644 --- a/omd/packages/omd/omd +++ b/omd/packages/omd/omd @@ -4420,11 +4420,13 @@ def md5crypt(password, salt, magic='$1$'): for a, b, c in ((0, 6, 12), (1, 7, 13), (2, 8, 14), (3, 9, 15), (4, 10, 5)): v = ord(final[a]) << 16 | ord(final[b]) << 8 | ord(final[c]) for i in range(4): - rearranged += itoa64[v & 0x3f]; v >>= 6 + rearranged += itoa64[v & 0x3f] + v >>= 6 v = ord(final[11]) for i in range(2): - rearranged += itoa64[v & 0x3f]; v >>= 6 + rearranged += itoa64[v & 0x3f] + v >>= 6 return magic + salt + '$' + rearranged diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index cafe9aa..7537c78 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -37,7 +37,6 @@ disable= logging-not-lazy, missing-docstring, multiple-imports, - multiple-statements, no-else-return, no-self-use, protected-access,

6 years, 2 months

df: Fix case of "zfs is hashed (/usr/sbin/zsf)"

by Moritz Kiemer

Module: check_mk Branch: master Commit: abd02ebf32678c7f46322c79ac9e77ca227dcb4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abd02ebf32678c… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Jul 13 10:17:16 2018 +0200 df: Fix case of "zfs is hashed (/usr/sbin/zsf)" Change-Id: I5ea9bf7fd3bab445fb9470ceae2ce05ab1f86d2b --- checks/df | 11 ++++++----- tests/unit/checks/test_df_check.py | 4 ++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/checks/df b/checks/df index 0f692c7..9143903 100644 --- a/checks/df +++ b/checks/df @@ -129,11 +129,12 @@ def parse_df(info): else: mountpoint = " ".join(line[6:]).replace('\\', '/') # Windows \ is replaced with / - - if line[2] == '-' or int(line[2]) == 0: - continue # exclude filesystems without size - - + # exclude filesystems without size + try: + if int(line[2]) == 0: + continue + except ValueError: + continue # Beware: the 6th column of df ("used perc") may includes 5% which are reserved # for the superuser, whereas the 4th colum ("used MB") does *not* include that. diff --git a/tests/unit/checks/test_df_check.py b/tests/unit/checks/test_df_check.py index 5c6009c..4d25bdc 100644 --- a/tests/unit/checks/test_df_check.py +++ b/tests/unit/checks/test_df_check.py @@ -208,6 +208,9 @@ info_df_btrfs = \ [u'[df_inodes_end]']] +info_solaris_zfs = [ + [u'zfs', u'is', u'hashed', u'(/usr/sbin/zfs)'], +] #. # .--Test functions------------------------------------------------------. @@ -241,6 +244,7 @@ info_df_btrfs = \ (info_df_btrfs, [(u'btrfs /dev/sda1', {})], {}), # btrfs (info_df_btrfs, [(u'/dev/sda1 btrfs /dev/sda1', {})], { "include_volume_name" : True }), # btrfs w/ volume name option + (info_solaris_zfs, [], {}), # ignore filensystems without size ]) def test_df_discovery_with_parse(check_manager, info, expected_result, inventory_df_rules):

6 years, 2 months

← Newer
1
...
23
24
25
26
27
28
29
...
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