Checkmk git commits October 2018

checkmk-commits@lists.checkmk.com

15 participants
308 discussions

Check function decorator: Adjusted for item in parsed but parsed[item] empty

by Kenneth Okoh

Module: check_mk Branch: master Commit: eb3b46028dd8cfe365fc7eb206f43f51b1ef4f8b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb3b46028dd8cf… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Fri Oct 12 14:42:00 2018 +0200 Check function decorator: Adjusted for item in parsed but parsed[item] empty Change-Id: I18d97315821b349fb8bd398ef8e49eb0015b7db9 --- cmk_base/check_api.py | 9 +++++---- tests/unit/cmk_base/test_check_api.py | 5 ++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cmk_base/check_api.py b/cmk_base/check_api.py index 888edfa..721ffe5 100644 --- a/cmk_base/check_api.py +++ b/cmk_base/check_api.py @@ -492,15 +492,16 @@ def get_parsed_item_data(check_function): In case of parsed not being a dict the decorator returns 3 (UNKN state) with a wrong usage message. - In case of item not existing in parsed the decorator gives an - empty return leading to cmk_base returning 3 (UNKN state) with - an item not found message (see cmk_base/checking.py). + In case of item not existing as a key in parsed or parsed[item] + not existing the decorator gives an empty return leading to + cmk_base returning 3 (UNKN state) with an item not found message + (see cmk_base/checking.py). """ @_functools.wraps(check_function) def wrapped_check_function(item, params, parsed): if not isinstance(parsed, dict): return 3, "Wrong usage of decorator function 'get_parsed_item_data': parsed is not a dict" - if item not in parsed: + if item not in parsed or not parsed[item]: return return check_function(item, params, parsed[item]) return wrapped_check_function diff --git a/tests/unit/cmk_base/test_check_api.py b/tests/unit/cmk_base/test_check_api.py index 2222e31..a300832 100644 --- a/tests/unit/cmk_base/test_check_api.py +++ b/tests/unit/cmk_base/test_check_api.py @@ -12,10 +12,13 @@ def check_foo(item, params, parsed_item_data): def test_get_parsed_item_data(): params = {} - parsed = {1: "one"} + parsed = {1: "one", 3: {}, 4: [], 5: ""} info = [[1, "one"], [2, "two"]] assert check_foo(1, params, parsed) == (2, "bar") assert check_foo(2, params, parsed) == None + assert check_foo(3, params, parsed) == None + assert check_foo(4, params, parsed) == None + assert check_foo(5, params, parsed) == None assert check_foo(1, params, info) == (3, "Wrong usage of decorator function 'get_parsed_item_data': parsed is not a dict") assert check_foo.__name__ == "check_foo"

5 years, 11 months

Check function decorator: Implemented for second set of checks + unit tests

by Kenneth Okoh

Module: check_mk Branch: master Commit: 46c6c1f7dabcb72dbc94522408df061785f6edef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46c6c1f7dabcb7… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Mon Oct 15 08:17:26 2018 +0200 Check function decorator: Implemented for second set of checks + unit tests Change-Id: I11c82e9be18dd050ddb5da84b77aecb6367295f6 --- checks/netapp_api_aggr | 7 +- checks/netapp_api_qtree_quota | 8 +- checks/ucs_bladecenter_psu | 15 +- .../datasets/netapp_api_aggr_regression.py | 42 +++++ .../datasets/netapp_api_qtree_quota_regression.py | 192 +++++++++++++++++++++ .../datasets/ucs_bladecenter_psu_regression.py | 80 +++++++++ 6 files changed, 322 insertions(+), 22 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=46c6c1f7da…

5 years, 11 months

i18n.py: Cleaned up use of "html" object

by Lars Michelsen

Module: check_mk Branch: master Commit: 8640d27c52cd67e1904327b92cd0833d454923f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8640d27c52cd67… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 12 16:30:14 2018 +0200 i18n.py: Cleaned up use of "html" object This is needed to prevent circular dependencies. The i18n module should be one of the low level modules with a small set of dependencies. Change-Id: I2704d7d5f9727ea98a44adc04c664c2f7c6bdbcf --- cmk/gui/htmllib.py | 14 ++++++++++++++ cmk/gui/i18n.py | 22 ---------------------- cmk/gui/login.py | 2 +- cmk/gui/wato/__init__.py | 2 +- web/app/index.wsgi | 5 ++++- 5 files changed, 20 insertions(+), 25 deletions(-) diff --git a/cmk/gui/htmllib.py b/cmk/gui/htmllib.py index c5a4619..17fc4e5 100644 --- a/cmk/gui/htmllib.py +++ b/cmk/gui/htmllib.py @@ -1704,6 +1704,20 @@ class html(HTMLGenerator): % self.render_a("in the global settings", href=url)) + def del_language_cookie(self): + self.response.del_cookie("language") + + + def set_language_cookie(self, lang): + # type: (str) -> None + cookie_lang = self.request.cookie("language") + if cookie_lang != lang: + if lang != None: + self.response.set_cookie("language", lang) + else: + self.del_language_cookie() + + def help(self, text): self.write_html(self.render_help(text)) diff --git a/cmk/gui/i18n.py b/cmk/gui/i18n.py index 5a46b50..4950c5a 100644 --- a/cmk/gui/i18n.py +++ b/cmk/gui/i18n.py @@ -30,8 +30,6 @@ from typing import NamedTuple, Optional, List, Tuple # pylint: disable=unused-i import cmk.paths -from cmk.gui.globals import html - #. # .--Gettext i18n--------------------------------------------------------. # | ____ _ _ _ _ _ ___ | @@ -112,12 +110,6 @@ def unlocalize(): def localize(lang): # type: (str) -> None - set_language_cookie(lang) - _do_localize(lang) - - -def _do_localize(lang): - # type: (str) -> None global _translation if lang is None: unlocalize() @@ -155,20 +147,6 @@ def initialize(): unlocalize() -def del_language_cookie(): - html.response.del_cookie("language") - - -def set_language_cookie(lang): - # type: (str) -> None - cookie_lang = html.request.cookie("language") - if cookie_lang != lang: - if lang != None: - html.response.set_cookie("language", lang) - else: - del_language_cookie() - - #. # .--User i18n-----------------------------------------------------------. # | _ _ _ _ ___ | diff --git a/cmk/gui/login.py b/cmk/gui/login.py index b23ffab..c23f067 100644 --- a/cmk/gui/login.py +++ b/cmk/gui/login.py @@ -152,7 +152,7 @@ def invalidate_auth_session(): userdb.invalidate_session(config.user.id) del_auth_cookie() - cmk.gui.i18n.del_language_cookie() + html.del_language_cookie() def renew_auth_session(username): diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index 09f171e..2185fef 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -12370,7 +12370,7 @@ def page_user_profile(change_pw=False): # Set custom language users[config.user.id]['language'] = language config.user.set_attribute("language", language) - cmk.gui.i18n.set_language_cookie(language) + html.set_language_cookie(language) else: # Remove the customized language diff --git a/web/app/index.wsgi b/web/app/index.wsgi index 563b236..c1230e0 100644 --- a/web/app/index.wsgi +++ b/web/app/index.wsgi @@ -235,7 +235,10 @@ class Application(object): def _localize_request(self): previous_language = cmk.gui.i18n.get_current_language() - cmk.gui.i18n.localize(html.var("lang", config.user.language())) + user_language = html.get_ascii_input("lang", config.user.language()) + + html.set_language_cookie(user_language) + cmk.gui.i18n.localize(user_language) # All plugins might have to be reloaded due to a language change. Only trigger # a second plugin loading when the user is really using a custom localized GUI.

5 years, 11 months

Prevent circular import

by Lars Michelsen

Module: check_mk Branch: master Commit: e2094532e28fb4abd8920b9ce62a144b6c8231d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2094532e28fb4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Oct 13 14:54:46 2018 +0200 Prevent circular import The circular import was caused by view helper functions in cmk.gui.utils needing the global html object. Moved these functions to cmk.gui.view_utils. Change-Id: I8aefffa4c418987e630722a96e4b98c498393584 --- cmk/gui/bi.py | 7 +-- cmk/gui/log.py | 2 +- cmk/gui/mobile.py | 10 ++-- cmk/gui/plugins/views/utils.py | 5 +- cmk/gui/utils.py | 86 ------------------------------- cmk/gui/view_utils.py | 114 +++++++++++++++++++++++++++++++++++++++++ cmk/gui/views.py | 3 +- cmk/gui/wato/__init__.py | 3 +- 8 files changed, 131 insertions(+), 99 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e2094532e2…

5 years, 11 months

Add typing info to fix jedi completion of and mypy validation of html object

by Lars Michelsen

Module: check_mk Branch: master Commit: e3cbd03d72131a8661099f4a22ab68f6fad8fd52 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3cbd03d72131a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Oct 13 15:00:55 2018 +0200 Add typing info to fix jedi completion of and mypy validation of html object Change-Id: I59f6f27492ce06c00e0f9e9dd8125610ca0a6ea6 --- cmk/gui/globals.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmk/gui/globals.py b/cmk/gui/globals.py index a44cfb4..a4821e7 100644 --- a/cmk/gui/globals.py +++ b/cmk/gui/globals.py @@ -24,10 +24,10 @@ # 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. +# Imports are needed for type hints. These type hints are useful for +# editors completion of "html" object methods and for mypy. +from typing import Union # pylint: disable=unused-import +import cmk.gui.htmllib # pylint: disable=unused-import class HTMLProxy(object): def __init__(self): @@ -61,4 +61,4 @@ class HTMLProxy(object): return repr(self._current_html) -html = HTMLProxy() +html = HTMLProxy() # type: Union[cmk.gui.htmllib.html, HTMLProxy]

5 years, 11 months

6795 msexch_database: plugin now runs on german client systems

by Moritz Kiemer

Module: check_mk Branch: master Commit: 8584b711d859f354ff74495b0f045f0fd2bae1fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8584b711d859f3… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Sep 3 15:20:59 2018 +0200 6795 msexch_database: plugin now runs on german client systems Previously the msexch_database plugin could not be used on german windows systems. Change-Id: Ie3ea89efee49d4f42ac1b63974d1229aa5e068a3 --- .werks/6795 | 13 ++ agents/windows/plugins/msexch_database.ps1 | 11 +- checks/msexch_database | 99 ++++++++--- .../datasets/msexch_database_de_regression.py | 191 +++++++++++++++++++++ 4 files changed, 286 insertions(+), 28 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8584b711d8…

5 years, 11 months

6792 docker_node_disk_usage: Support older Docker versions

by Moritz Kiemer

Module: check_mk Branch: master Commit: 157eca243987e65a2cf7d12ef4b18363cf19008a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=157eca243987e6… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Oct 12 11:02:39 2018 +0200 6792 docker_node_disk_usage: Support older Docker versions Some old Docker verions do not supprt the "--format" option, which resulted in faulty or missing agent data. This has been fixed. CMK-1031 Change-Id: I1e6ae5f8750c895b88f63d6d19aa8f224ebd9ff1 --- .werks/6792 | 12 ++++ agents/check_mk_agent.linux | 4 +- checks/docker.include | 11 +++- .../datasets/docker_node_disk_usage_raw_text.py | 56 ++++++++++++++++++ .../datasets/docker_node_disk_usage_regression.py | 69 ++++++++++++++++++++++ 5 files changed, 147 insertions(+), 5 deletions(-) diff --git a/.werks/6792 b/.werks/6792 new file mode 100644 index 0000000..d26dd82 --- /dev/null +++ b/.werks/6792 @@ -0,0 +1,12 @@ +Title: docker_node_disk_usage: Support older Docker versions +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1539334871 +Class: feature + +Some old Docker verions do not supprt the "--format" option, +which resulted in faulty or missing agent data. +This has been fixed. diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index b348007..3c3f342 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -1032,8 +1032,8 @@ if type docker > /dev/null 2>&1 && [ -z "$MK_IS_PIGGYBACKED" ]; then # sed: protect leading whitespace docker info | sed 's/^/|/' - echo "<<<docker_node_disk_usage>>>" - docker system df --format "{{json .}}" || docker system df + echo "<<<docker_node_disk_usage:sep(0)>>>" + docker system df echo "<<<docker_node_images>>>" echo "[[[images]]]" diff --git a/checks/docker.include b/checks/docker.include index dcd77b5..2a76f74 100644 --- a/checks/docker.include +++ b/checks/docker.include @@ -160,12 +160,17 @@ def parse_docker_node_info(info): def parse_docker_system_df(info): - parsed = {} - header = ('TYPE', 'TOTAL', 'ACTIVE', 'SIZE', 'RECLAIMABLE') + keys = ('Type', 'TotalCount', 'Active', 'Size', 'Reclaimable') types = (str, int, int, _docker_get_bytes, _docker_get_bytes) - table = _docker_parse_table(info, header, keys) + try: # parse legacy json output: from 1.5.0 - 1.5.0p6 + table = [json.loads(",".join(row)) for row in info if row] + except ValueError: + header = ('TYPE', 'TOTAL', 'ACTIVE', 'SIZE', 'RECLAIMABLE') + table = _docker_parse_table(info, header, keys) + + parsed = {} for line in table: for key, type_ in zip(keys, types): v = line.get(key) diff --git a/tests/unit/checks/generictests/datasets/docker_node_disk_usage_raw_text.py b/tests/unit/checks/generictests/datasets/docker_node_disk_usage_raw_text.py new file mode 100644 index 0000000..7b6a758 --- /dev/null +++ b/tests/unit/checks/generictests/datasets/docker_node_disk_usage_raw_text.py @@ -0,0 +1,56 @@ + + +checkname = 'docker_node_disk_usage' + + +info = [ + ['TYPE TOTAL ACTIVE SIZE RECLAIMABLE'], + ['Images 15 2 9.57GB 8.674GB (90%)'], + ['Containers 2 1 1.226GB 1.224GB (99%)'], + ['Local Volumes 1 1 9.323MB 0B (0%)'], + ['Build Cache 0 0 0B 0B'], +] + + +discovery = {'': [('build cache', {}), + ('containers', {}), + ('images', {}), + ('local volumes', {})]} + + +checks = {'': [('build cache', + 'default', + [(0, 'size: 0 B', [('size', 0, None, None, None, None)]), + (0, + 'reclaimable: 0 B', + [('reclaimable', 0, None, None, None, None)]), + (0, 'count: 0', [('count', 0, None, None, None, None)]), + (0, 'active: 0', [('active', 0, None, None, None, None)])]), + ('containers', + 'default', + [(0, + 'size: 1169.20 MB', + [('size', 1226000000, None, None, None, None)]), + (0, + 'reclaimable: 1167.30 MB', + [('reclaimable', 1224000000, None, None, None, None)]), + (0, 'count: 2', [('count', 2, None, None, None, None)]), + (0, 'active: 1', [('active', 1, None, None, None, None)])]), + ('images', + 'default', + [(0, + 'size: 8.91 GB', + [('size', 9570000000, None, None, None, None)]), + (0, + 'reclaimable: 8.08 GB', + [('reclaimable', 8674000000, None, None, None, None)]), + (0, 'count: 15', [('count', 15, None, None, None, None)]), + (0, 'active: 2', [('active', 2, None, None, None, None)])]), + ('local volumes', + 'default', + [(0, 'size: 8.89 MB', [('size', 9323000, None, None, None, None)]), + (0, + 'reclaimable: 0 B', + [('reclaimable', 0, None, None, None, None)]), + (0, 'count: 1', [('count', 1, None, None, None, None)]), + (0, 'active: 1', [('active', 1, None, None, None, None)])])]} diff --git a/tests/unit/checks/generictests/datasets/docker_node_disk_usage_regression.py b/tests/unit/checks/generictests/datasets/docker_node_disk_usage_regression.py new file mode 100644 index 0000000..d2d246a --- /dev/null +++ b/tests/unit/checks/generictests/datasets/docker_node_disk_usage_regression.py @@ -0,0 +1,69 @@ + + +checkname = 'docker_node_disk_usage' + + +info = [['{"Active":"2"', + '"Reclaimable":"8.674GB (90%)"', + '"Size":"9.57GB"', + '"TotalCount":"15"', + '"Type":"Images"}'], + ['{"Active":"1"', + '"Reclaimable":"1.224GB (99%)"', + '"Size":"1.226GB"', + '"TotalCount":"2"', + '"Type":"Containers"}'], + ['{"Active":"1"', + '"Reclaimable":"0B (0%)"', + '"Size":"9.323MB"', + '"TotalCount":"1"', + '"Type":"Local Volumes"}'], + ['{"Active":"0"', + '"Reclaimable":"0B"', + '"Size":"0B"', + '"TotalCount":"0"', + '"Type":"Build Cache"}']] + + +discovery = {'': [('build cache', {}), + ('containers', {}), + ('images', {}), + ('local volumes', {})]} + + +checks = {'': [('build cache', + 'default', + [(0, 'size: 0 B', [('size', 0, None, None, None, None)]), + (0, + 'reclaimable: 0 B', + [('reclaimable', 0, None, None, None, None)]), + (0, 'count: 0', [('count', 0, None, None, None, None)]), + (0, 'active: 0', [('active', 0, None, None, None, None)])]), + ('containers', + 'default', + [(0, + 'size: 1169.20 MB', + [('size', 1226000000, None, None, None, None)]), + (0, + 'reclaimable: 1167.30 MB', + [('reclaimable', 1224000000, None, None, None, None)]), + (0, 'count: 2', [('count', 2, None, None, None, None)]), + (0, 'active: 1', [('active', 1, None, None, None, None)])]), + ('images', + 'default', + [(0, + 'size: 8.91 GB', + [('size', 9570000000, None, None, None, None)]), + (0, + 'reclaimable: 8.08 GB', + [('reclaimable', 8674000000, None, None, None, None)]), + (0, 'count: 15', [('count', 15, None, None, None, None)]), + (0, 'active: 2', [('active', 2, None, None, None, None)])]), + ('local volumes', + 'default', + [(0, 'size: 8.89 MB', [('size', 9323000, None, None, None, None)]), + (0, + 'reclaimable: 0 B', + [('reclaimable', 0, None, None, None, None)]), + (0, 'count: 1', [('count', 1, None, None, None, None)]), + (0, 'active: 1', [('active', 1, None, None, None, None)])])]} \ No newline at end of file

5 years, 11 months

pylint: Automatically use all CPUs instead of 1 by default

by Lars Michelsen

Module: check_mk Branch: master Commit: 496c3ac626141b263359b5a82114781f8fefd168 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=496c3ac626141b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 15 10:50:40 2018 +0200 pylint: Automatically use all CPUs instead of 1 by default Change-Id: Id659d74a21ec7298b34a18b4846c1ae345e16e61 --- .pylintrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.pylintrc b/.pylintrc index 54a8788..ea57d35 100644 --- a/.pylintrc +++ b/.pylintrc @@ -15,6 +15,7 @@ init-hook= sys.path.insert(0, os.environ.get("TEST_PATH", tests_dir)) import conftest load-plugins=testlib.pylint_cmk,testlib.pylint_checker_localization +jobs=0 # TODO: Why do we need persistence? persistent=yes extension-pkg-whitelist=rrdtool,_ldap,netifaces,pymssql

5 years, 11 months

mgmt_dell_poweredge_temp: Add missing check file

by Simon Betz

Module: check_mk Branch: master Commit: 4617b957d8ac09c336ef7fb686677dd9125eed83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4617b957d8ac09… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Oct 15 10:48:16 2018 +0200 mgmt_dell_poweredge_temp: Add missing check file Change-Id: I69d4bf2bff7b44fc1e6b2f53b7aa76f57dc6daed --- checks/mgmt_dell_poweredge_temp | 54 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/checks/mgmt_dell_poweredge_temp b/checks/mgmt_dell_poweredge_temp new file mode 100644 index 0000000..41356dc --- /dev/null +++ b/checks/mgmt_dell_poweredge_temp @@ -0,0 +1,54 @@ +#!/usr/bin/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. + + +check_info["mgmt_dell_poweredge_temp"] = { + "check_function" : check_dell_poweredge_temp, + "inventory_function" : inventory_dell_poweredge_temp, + "service_description" : "Management Interface: Temperature %s", + "has_perfdata" : True, + "snmp_info" : ( ".1.3.6.1.4.1.674.10892.5.4.700.20.1", [ + "1", # temperatureProbechassisIndex + "2", # temperatureProbeIndex + "4", # temperatureProbeStateSettings + "5", # temperatureProbeStatus + "6", # temperatureProbeReading + #"7", # temperatureProbeType + "8", # temperatureProbeLocationName + #"9", # temperatureProbeUpperNonRecoverableThreshold + "10", # temperatureProbeUpperCriticalThreshold + "11", # temperatureProbeUpperNonCriticalThreshold + "12", # temperatureProbeLowerNonCriticalThreshold + "13", # temperatureProbeLowerCriticalThreshold + #"14", # temperatureProbeLowerNonRecoverableThreshold + #"15", # temperatureProbeCapabilities + #"16", # temperatureProbeDiscreteReading + ]), + "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.2.0') == ".1.3.6.1.4.1.674.10892.5", + "includes" : ["temperature.include", "dell_poweredge.include"], + "group" : "temperature", + "management_board" : MGMT_ONLY, +}

5 years, 11 months

Fixed pytest creating tmp/var dir in git path

by Lars Michelsen

Module: check_mk Branch: master Commit: 7bda840a4623fccda968a0bb127b68d586a3e9c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7bda840a4623fc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Oct 14 15:39:53 2018 +0200 Fixed pytest creating tmp/var dir in git path Change-Id: I96611ed0407d353297df34084bfd5b97e4093f1f --- tests/conftest.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/conftest.py b/tests/conftest.py index 1b1f08c..265dfbc 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -105,6 +105,8 @@ def fake_version_and_paths(): monkeypatch.setattr("cmk.paths.inventory_dir", "%s/inventory" % cmk_path()) monkeypatch.setattr("cmk.paths.check_manpages_dir", "%s/checkman" % cmk_path()) monkeypatch.setattr("cmk.paths.tmp_dir", tmp_dir) + monkeypatch.setattr("cmk.paths.precompiled_checks_dir", os.path.join(tmp_dir, "var/check_mk/precompiled_checks")) + monkeypatch.setattr("cmk.paths.include_cache_dir", os.path.join(tmp_dir, "check_mk/check_includes")) # Cleanup temporary directory created above

5 years, 11 months

← Newer
1
...
15
16
17
18
19
20
21
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2018