Checkmk git commits December 2018

checkmk-commits@lists.checkmk.com

15 participants
342 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 6ebe49cf52113d9af57eef7e72cf0a64e9eb558e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ebe49cf52113d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Dec 14 11:19:58 2018 +0100 Centralize parse_check_mk_version(). Change-Id: If66ca16f1ce2f7dcde3a39cce3b5f0c52b0644d2 --- cmk_base/data_sources/tcp.py | 5 +++-- cmk_base/packaging.py | 10 +++++----- cmk_base/utils.py | 46 -------------------------------------------- 3 files changed, 8 insertions(+), 53 deletions(-) diff --git a/cmk_base/data_sources/tcp.py b/cmk_base/data_sources/tcp.py index 97c65c5..ad9b683 100644 --- a/cmk_base/data_sources/tcp.py +++ b/cmk_base/data_sources/tcp.py @@ -28,6 +28,7 @@ import socket import cmk.debug from cmk.exceptions import MKTerminate, MKGeneralException +import cmk.werks import cmk_base.utils as utils import cmk_base.config as config @@ -274,8 +275,8 @@ class TCPDataSource(CheckMKAgentDataSource): if utils.is_daily_build_version(agent_version): return False - if utils.parse_check_mk_version(agent_version) \ - < utils.parse_check_mk_version(spec['release']): + if cmk.werks.parse_check_mk_version(agent_version) \ + < cmk.werks.parse_check_mk_version(spec['release']): return False return True diff --git a/cmk_base/packaging.py b/cmk_base/packaging.py index ae55be4..6542c71 100644 --- a/cmk_base/packaging.py +++ b/cmk_base/packaging.py @@ -34,11 +34,11 @@ import subprocess import json from cStringIO import StringIO -import cmk.tty as tty -import cmk.paths import cmk.ec.export - import cmk.log +import cmk.paths +import cmk.tty as tty +import cmk.werks import cmk_base.utils logger = cmk.log.get_logger(__name__) @@ -634,8 +634,8 @@ def verify_check_mk_version(package): compatible = True try: - compatible = cmk_base.utils.parse_check_mk_version(min_version) \ - <= cmk_base.utils.parse_check_mk_version(cmk_version) + compatible = cmk.werks.parse_check_mk_version(min_version) \ + <= cmk.werks.parse_check_mk_version(cmk_version) except: # Be compatible: When a version can not be parsed, then skip this check if cmk.debug.enabled(): diff --git a/cmk_base/utils.py b/cmk_base/utils.py index b5139a2..fc3be54 100644 --- a/cmk_base/utils.py +++ b/cmk_base/utils.py @@ -61,52 +61,6 @@ def branch_of_daily_build(v): return v.split('-')[0] -# Parses versions of Check_MK and converts them into comparable integers. -# This does not handle daily build numbers, only official release numbers. -# 1.2.4p1 -> 01020450001 -# 1.2.4 -> 01020450000 -# 1.2.4b1 -> 01020420100 -# 1.2.3i1p1 -> 01020310101 -# 1.2.3i1 -> 01020310100 -# TODO: Copied to werks.py - find location for common code. -def parse_check_mk_version(v): - def extract_number(s): - number = '' - for i, c in enumerate(s): - try: - int(c) - number += c - except ValueError: - s = s[i:] - return number and int(number) or 0, s - return number and int(number) or 0, '' - - parts = v.split('.') - while len(parts) < 3: - parts.append("0") - - major, minor, rest = parts - sub, rest = extract_number(rest) - - if not rest: - val = 50000 - elif rest[0] == 'p': - num, rest = extract_number(rest[1:]) - val = 50000 + num - elif rest[0] == 'i': - num, rest = extract_number(rest[1:]) - val = 10000 + num * 100 - - if rest and rest[0] == 'p': - num, rest = extract_number(rest[1:]) - val += num - elif rest[0] == 'b': - num, rest = extract_number(rest[1:]) - val = 20000 + num * 100 - - return int('%02d%02d%02d%05d' % (int(major), int(minor), sub, val)) - - def total_size(o, handlers=None): """ Returns the approximate memory footprint an object and all of its contents.

5 years, 9 months

Cleaned up werk sorting, no functional changes.

by Sven Panne

Module: check_mk Branch: master Commit: 4079c36a15c15e3cd05fb18c5a801aafefc4416e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4079c36a15c15e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Dec 14 09:56:01 2018 +0100 Cleaned up werk sorting, no functional changes. Change-Id: I573fd45448c985520ec4fb17b31225ac895c4744 --- cmk/gui/werks.py | 11 ++++------- cmk/werks.py | 15 +++++++++++---- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/cmk/gui/werks.py b/cmk/gui/werks.py index b34b576..d9244f8 100644 --- a/cmk/gui/werks.py +++ b/cmk/gui/werks.py @@ -196,8 +196,9 @@ def load_acknowledgements(): def unacknowledged_incompatible_werks(): - return werks_sorted_by_date( - [werk for werk in g_werks.values() if werk["compatible"] == "incomp_unack"]) + return cmk.werks.sort_by_date(werk # + for werk in g_werks.values() + if werk["compatible"] == "incomp_unack") def num_unacknowledged_incompatible_werks(): @@ -328,7 +329,7 @@ def render_werks_table(): if werk_table_options["grouping"] == "version": werklist = cmk.werks.sort_by_version_and_component(g_werks.values()) else: - werklist = werks_sorted_by_date(g_werks.values()) + werklist = cmk.werks.sort_by_date(g_werks.values()) for werk in werklist: if werk_matches_options(werk, werk_table_options): @@ -546,7 +547,3 @@ def insert_manpage_links(text): part = '<a href="wato.py?mode=check_manpage&check_type=%s">%s</a>' % (part, part) new_parts.append(part) return " ".join(new_parts) - - -def werks_sorted_by_date(werks): - return sorted(werks, cmp=lambda a, b: -cmp(a["date"], b["date"])) diff --git a/cmk/werks.py b/cmk/werks.py index 9e0b7e2..9025336 100644 --- a/cmk/werks.py +++ b/cmk/werks.py @@ -206,10 +206,17 @@ def write_werk_as_text(f, werk): # sort by version and within one version by component def sort_by_version_and_component(werks): - return sorted(werks, key=lambda x: \ - (parse_check_mk_version(x["version"]), werk_components().get(x["component"], x["component"]), - x["class"] != "fix", x["class"] != "sec", x["title"]), - reverse=True) + return sorted(werks, + key=lambda w: (parse_check_mk_version(w["version"]), + werk_components().get(w["component"], w["component"]), + w["class"] != "fix", + w["class"] != "sec", + w["title"]), + reverse=True) + + +def sort_by_date(werks): + return sorted(werks, key=lambda w: w["date"], reverse=True) # Parses versions of Check_MK and converts them into comparable integers.

5 years, 9 months

Format regression.py and run.py

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 69c2b72105b30c6a23d9824a34fbea843527521b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69c2b72105b30c… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue Dec 11 13:28:20 2018 +0100 Format regression.py and run.py Change-Id: If4ae7a1850a0d4d009c70b1ce4c347f63246fc44 --- tests/unit/checks/generictests/regression.py | 30 +++++++++++++++++----------- tests/unit/checks/generictests/run.py | 27 +++++++++---------------- 2 files changed, 27 insertions(+), 30 deletions(-) diff --git a/tests/unit/checks/generictests/regression.py b/tests/unit/checks/generictests/regression.py index 0b2cbe0..2f58550 100644 --- a/tests/unit/checks/generictests/regression.py +++ b/tests/unit/checks/generictests/regression.py @@ -48,15 +48,23 @@ class WritableDataset(object): def __init__(self, filename, init_dict={}): self.comments = [''] self.filename = filename - self.writelist = ('checkname', 'info', 'parsed', 'discovery', - 'checks', 'extra_sections', 'mock_host_conf', 'mock_item_state') - self.checkname = init_dict.get('checkname', None) - self.info = init_dict.get('info', None) - self.parsed = init_dict.get('parsed', None) - self.discovery = init_dict.get('discovery', {}) - self.checks = {} - self.extra_sections = init_dict.get('extra_sections', {}) - self.mock_host_conf = init_dict.get('mock_host_conf', {}) + self.writelist = ( + 'checkname', + 'info', + 'parsed', + 'discovery', + 'checks', + 'extra_sections', + 'mock_host_conf', + 'mock_item_state', + ) + self.checkname = init_dict.get('checkname', None) + self.info = init_dict.get('info', None) + self.parsed = init_dict.get('parsed', None) + self.discovery = init_dict.get('discovery', {}) + self.checks = {} + self.extra_sections = init_dict.get('extra_sections', {}) + self.mock_host_conf = init_dict.get('mock_host_conf', {}) self.mock_item_state = init_dict.get('mock_item_state', {}) def write(self): @@ -88,11 +96,9 @@ def test_main(check_manager, datasetfile): input_data = import_module(os.path.splitext(modn)[0]) sys.path.pop(0) - regression = WritableDataset(datasetfile.replace('.py', '_regression.py'), - vars(input_data)) + regression = WritableDataset(datasetfile.replace('.py', '_regression.py'), vars(input_data)) generictests.run(check_manager, regression, write=True) regression.write() return - diff --git a/tests/unit/checks/generictests/run.py b/tests/unit/checks/generictests/run.py index e70bf96..b45ff6d 100644 --- a/tests/unit/checks/generictests/run.py +++ b/tests/unit/checks/generictests/run.py @@ -11,7 +11,7 @@ class DiscoveryParameterTypeError(AssertionError): pass -def get_info_argument(dataset, subcheck, fallback_parsed=None):# . +def get_info_argument(dataset, subcheck, fallback_parsed=None): """Get the argument to the discovery/check function This may be the info variable, the parsed variable, @@ -29,8 +29,7 @@ def get_info_argument(dataset, subcheck, fallback_parsed=None):# . try: arg = [dataset.info] except AttributeError: - raise AttributeError("dataset has neither of the attributes " - "'info' or 'parsed'") + raise AttributeError("dataset has neither of the attributes " "'info' or 'parsed'") es_dict = getattr(dataset, 'extra_sections', {}) for es in es_dict.get(subcheck, []): @@ -39,10 +38,9 @@ def get_info_argument(dataset, subcheck, fallback_parsed=None):# . if len(arg) == 1: return arg[0] return arg -#. -def get_merged_parameters(default_p, provided_p):# . +def get_merged_parameters(default_p, provided_p): """return (merged_params, description_string) I think this is a mess. @@ -60,17 +58,15 @@ def get_merged_parameters(default_p, provided_p):# . raise DiscoveryParameterTypeError("unhandled: %r/%r" \ % (default_p, provided_p)) -#. -def get_mock_values(dataset, subcheck):# . +def get_mock_values(dataset, subcheck): mock_is_d = getattr(dataset, 'mock_item_state', {}) mock_hc_d = getattr(dataset, 'mock_host_conf', {}) return mock_is_d.get(subcheck, {}), mock_hc_d.get(subcheck, {}) -#. -def parse(check_manager, dataset):# . +def parse(check_manager, dataset): """Test parse function If dataset has .info attribute and the check has parse function defined, @@ -96,17 +92,16 @@ def parse(check_manager, dataset):# . # we *must* have a parse function in this case! assert parse_function, "%s has no parse function!" \ % dataset.checkname - elif not parse_function: # we may not have one: + elif not parse_function: # we may not have one: return None parsed = main_check.run_parse(info) if parsed_expected is not None: assertEqual(parsed, parsed_expected, ' parsed result ') return parsed -#. -def discovery(check, subcheck, dataset, info_arg, immu):# . +def discovery(check, subcheck, dataset, info_arg, immu): """Test discovery funciton, return discovery result""" print("discovery: %r" % check.name) @@ -129,10 +124,9 @@ def discovery(check, subcheck, dataset, info_arg, immu):# . assertDiscoveryResultsEqual(d_result, d_result_expected) return d_result -#. -def check_discovered_result(check, discovery_result, info_arg, immu):# . +def check_discovered_result(check, discovery_result, info_arg, immu): """Run the check on all discovered items with the default parameters. We cannot validate the results, @@ -154,10 +148,9 @@ def check_discovered_result(check, discovery_result, info_arg, immu):# . cr = CheckResult(raw_checkresult) return (item, par_str, cr.raw_repr()) -#. -def check_listed_result(check, list_entry, info_arg, immu):# . +def check_listed_result(check, list_entry, info_arg, immu): """Run check for all results listed in dataset""" item, params, results_expected_raw = list_entry print("Dataset item %r in check %r" % (item, check.name)) @@ -173,7 +166,6 @@ def check_listed_result(check, list_entry, info_arg, immu):# . result = CheckResult(result_raw) result_expected = CheckResult(results_expected_raw) assertCheckResultsEqual(result, result_expected) -#. def run(check_manager, dataset, write=False): @@ -190,7 +182,6 @@ def run(check_manager, dataset, write=False): # get the expected check results, if present checks_expected = getattr(dataset, 'checks', {}) - # LOOP OVER ALL (SUB)CHECKS for sname in checklist: subcheck = (sname + '.').split('.')[1]

5 years, 9 months

Split get_merged_parameters function

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 3e4c66f74cfffe84bcf1c20c752a381804540992 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e4c66f74cfffe… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Dec 14 08:55:55 2018 +0100 Split get_merged_parameters function Change-Id: I4ed04d550d44cffdddf517c8a3887d611363bfff --- tests/unit/checks/generictests/run.py | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/tests/unit/checks/generictests/run.py b/tests/unit/checks/generictests/run.py index a820c67..7b5c17c 100644 --- a/tests/unit/checks/generictests/run.py +++ b/tests/unit/checks/generictests/run.py @@ -40,23 +40,28 @@ def get_info_argument(dataset, subcheck, fallback_parsed=None): return arg -def get_merged_parameters(check, provided_p): - """return (merged_params, description_string) - - I think this is a mess. - I'm trying to do the right thing, any ideas wellcome. - """ +def get_discovered_merged_parameters(check, provided_p): default_p = check.default_parameters() if not provided_p: return default_p, "default" if isinstance(provided_p, str): + # TODO: this is not correct since it may be the name of a variable defined in + # the check or the repr of a dict as e.g. in winperf_if return default_p, "default" + raise DiscoveryParameterTypeError("unhandled: %r/%r" % (default_p, provided_p)) + + +def get_check_merged_parameters(check, provided_p): + default_p = check.default_parameters() + + if provided_p == 'default': + return default_p if isinstance(default_p, dict) and isinstance(provided_p, dict): default_p.update(provided_p) - return default_p, repr(default_p) - if not default_p: - return provided_p, repr(provided_p) + return default_p + if isinstance(provided_p, tuple): + return provided_p raise DiscoveryParameterTypeError("unhandled: %r/%r" % (default_p, provided_p)) @@ -134,7 +139,7 @@ def check_discovered_result(check, discovery_result, info_arg, immu): item = discovery_result.item - params, par_str = get_merged_parameters(check, discovery_result.default_params) + params, par_str = get_discovered_merged_parameters(check, discovery_result.default_params) immu.register(params, 'params') raw_checkresult = check.run_check(item, params, info_arg) @@ -151,7 +156,7 @@ def check_listed_result(check, list_entry, info_arg, immu): item, params, results_expected_raw = list_entry print("Dataset item %r in check %r" % (item, check.name)) - params, __ = get_merged_parameters(check, params) + params = get_check_merged_parameters(check, params) immu.register(params, 'params') result_raw = check.run_check(item, params, info_arg)

5 years, 9 months

Minor fix and some cleanups in generictests

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 04f422ecf6baaff7b204f15960cf0d66a6bbfdeb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04f422ecf6baaf… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue Dec 11 13:41:09 2018 +0100 Minor fix and some cleanups in generictests * only expect a discovery function if services were discovered in run.py * move check.default_parameters() into get_merged_parameters in run.py * remove mutable default argument from WritableDataset in regression.py * remove unused pytest import in regression.py * reorder imports in checkhandler.py Change-Id: I233539816f5562626ac690ab71391e5e04c3e303 --- tests/unit/checks/generictests/checkhandler.py | 5 ++++- tests/unit/checks/generictests/regression.py | 4 ++-- tests/unit/checks/generictests/run.py | 31 +++++++++++--------------- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/tests/unit/checks/generictests/checkhandler.py b/tests/unit/checks/generictests/checkhandler.py index 03792c2..bd27d5a 100644 --- a/tests/unit/checks/generictests/checkhandler.py +++ b/tests/unit/checks/generictests/checkhandler.py @@ -1,9 +1,12 @@ +import copy + import cmk_base.config as config import cmk_base.check_api as check_api -import copy + class CheckHandler(object): """Collect the info on all checks""" + def __init__(self): config.load_all_checks(check_api.get_check_api_context) self.info = copy.deepcopy(config.check_info) diff --git a/tests/unit/checks/generictests/regression.py b/tests/unit/checks/generictests/regression.py index 2f58550..003100d 100644 --- a/tests/unit/checks/generictests/regression.py +++ b/tests/unit/checks/generictests/regression.py @@ -36,16 +36,16 @@ Make sure the file(s name) is a valid python module: ~/git/check_mk/tests/unit/checks/generictests/datasets/nfsmounts_1.py """ -import pytest import os import sys import pprint from importlib import import_module + import generictests.run class WritableDataset(object): - def __init__(self, filename, init_dict={}): + def __init__(self, filename, init_dict): self.comments = [''] self.filename = filename self.writelist = ( diff --git a/tests/unit/checks/generictests/run.py b/tests/unit/checks/generictests/run.py index b45ff6d..a820c67 100644 --- a/tests/unit/checks/generictests/run.py +++ b/tests/unit/checks/generictests/run.py @@ -17,7 +17,7 @@ def get_info_argument(dataset, subcheck, fallback_parsed=None): This may be the info variable, the parsed variable, and/or including extra sections. """ - # see i fwe have a parsed result defined + # see if we have a parsed result defined tmp = getattr(dataset, 'parsed', None) if tmp is not None: arg = [tmp] @@ -40,24 +40,24 @@ def get_info_argument(dataset, subcheck, fallback_parsed=None): return arg -def get_merged_parameters(default_p, provided_p): +def get_merged_parameters(check, provided_p): """return (merged_params, description_string) I think this is a mess. I'm trying to do the right thing, any ideas wellcome. """ + default_p = check.default_parameters() + if not provided_p: return default_p, "default" - elif isinstance(provided_p, str): + if isinstance(provided_p, str): return default_p, "default" - elif type(default_p) == type(provided_p) == dict: + if isinstance(default_p, dict) and isinstance(provided_p, dict): default_p.update(provided_p) return default_p, repr(default_p) - elif not default_p: + if not default_p: return provided_p, repr(provided_p) - - raise DiscoveryParameterTypeError("unhandled: %r/%r" \ - % (default_p, provided_p)) + raise DiscoveryParameterTypeError("unhandled: %r/%r" % (default_p, provided_p)) def get_mock_values(dataset, subcheck): @@ -108,7 +108,7 @@ def discovery(check, subcheck, dataset, info_arg, immu): discov_expected = getattr(dataset, 'discovery', {}) disco_func = check.info.get("inventory_function") - if subcheck in discov_expected: + if discov_expected.get(subcheck): # we *must* have a discovery function in this case! assert disco_func, "%r has no discovery function!" \ % check.name @@ -127,18 +127,14 @@ def discovery(check, subcheck, dataset, info_arg, immu): def check_discovered_result(check, discovery_result, info_arg, immu): - """Run the check on all discovered items - - with the default parameters. We cannot validate the results, - but at least make sure we don't crash. + """Run the check on all discovered items with the default parameters. + We cannot validate the results, but at least make sure we don't crash. """ print("Check %r in check %r" % (discovery_result, check.name)) item = discovery_result.item - disco_params = discovery_result.default_params - def_params = check.default_parameters() - params, par_str = get_merged_parameters(def_params, disco_params) + params, par_str = get_merged_parameters(check, discovery_result.default_params) immu.register(params, 'params') raw_checkresult = check.run_check(item, params, info_arg) @@ -155,8 +151,7 @@ def check_listed_result(check, list_entry, info_arg, immu): item, params, results_expected_raw = list_entry print("Dataset item %r in check %r" % (item, check.name)) - default_params = check.default_parameters() - params, __ = get_merged_parameters(default_params, params) + params, __ = get_merged_parameters(check, params) immu.register(params, 'params') result_raw = check.run_check(item, params, info_arg)

5 years, 9 months

mk_filestats: Add bakelet and WATO rule

by Moritz Kiemer

Module: check_mk Branch: master Commit: 28064ccf5f5efce5e3dab9f3a82a348261204659 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28064ccf5f5efc… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Dec 13 15:09:55 2018 +0100 mk_filestats: Add bakelet and WATO rule Change-Id: I240ce97c3bc77a8881383241b6605eccf2327832 --- agents/cfg_examples/{mk_filestats.cfg => filestats.cfg} | 0 agents/plugins/mk_filestats.py | 7 ++++--- tests/unit/cmk/gui/test_watolib.py | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/agents/cfg_examples/mk_filestats.cfg b/agents/cfg_examples/filestats.cfg similarity index 100% rename from agents/cfg_examples/mk_filestats.cfg rename to agents/cfg_examples/filestats.cfg diff --git a/agents/plugins/mk_filestats.py b/agents/plugins/mk_filestats.py index 9e4923d..79df6d6 100755 --- a/agents/plugins/mk_filestats.py +++ b/agents/plugins/mk_filestats.py @@ -34,7 +34,7 @@ Options: -h, --help Show this help message and exit -v, -vv Increase verbosity -c, --config-file Read config file - (default: $MK_CONFDIR/mk_filestats.cfg) + (default: $MK_CONFDIR/filestats.cfg) Details: @@ -111,7 +111,7 @@ try: except NameError: # Python3 import configparser -DEFAULT_CFG_FILE = os.path.join(os.getenv('MK_CONFDIR', ''), "mk_filestats.cfg") +DEFAULT_CFG_FILE = os.path.join(os.getenv('MK_CONFDIR', ''), "filestats.cfg") DEFAULT_CFG_SECTION = {"output": "file_stats"} @@ -465,7 +465,6 @@ def get_output_aggregator(config): def write_output(groups, output_aggregator): - sys.stdout.write('<<<mk_filestats:sep(0)>>>\n') for group_name, group_files_iter in groups: for line in output_aggregator(group_name, group_files_iter): sys.stdout.write("%s\n" % line) @@ -488,6 +487,7 @@ def iter_config_section_dicts(cfg_file=None): if cfg_file is None: cfg_file = DEFAULT_CFG_FILE config = configparser.ConfigParser(DEFAULT_CFG_SECTION) + LOGGER.debug("trying to read %r", cfg_file) files_read = config.read(cfg_file) LOGGER.info("read configration file(s): %r", files_read) @@ -500,6 +500,7 @@ def main(): args = parse_arguments() + sys.stdout.write('<<<filestats:sep(0)>>>\n') for section_name, config in iter_config_section_dicts(args['cfg_file']): #1 input diff --git a/tests/unit/cmk/gui/test_watolib.py b/tests/unit/cmk/gui/test_watolib.py index 0cb6d36..1a71640 100644 --- a/tests/unit/cmk/gui/test_watolib.py +++ b/tests/unit/cmk/gui/test_watolib.py @@ -1369,6 +1369,7 @@ def test_grouped_rulespecs(): 'agent_config:mk_saprouter', 'agent_config:mk_sap', 'agent_config:mk_logwatch', + 'agent_config:mk_filestats', 'agent_config:nginx_status', 'agent_config:apache_status', 'agent_config:mk_oracle',

5 years, 9 months

6983 FIX lnx_thermal: Fix GUI warning about wrong parameter data type

by Konstantin Büttner

Module: check_mk Branch: master Commit: 3b49a6b796c27b60f9743ee327e67d537da606c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b49a6b796c27b… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Dec 14 10:30:12 2018 +0100 6983 FIX lnx_thermal: Fix GUI warning about wrong parameter data type This was a purely cosmetical error and did not affect the check logic in any way. CMK-1428 Change-Id: Idc6f7fa9c80b98a786520fc82655f5e0ed21b3b3 --- .werks/6983 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.werks/6983 b/.werks/6983 new file mode 100644 index 0000000..ae939a5 --- /dev/null +++ b/.werks/6983 @@ -0,0 +1,14 @@ +Title: lnx_thermal: Fix GUI warning about wrong parameter data type +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1544779738 + +This was a purely cosmetical error and did not affect the check logic +in any way. + +CMK-1428

5 years, 9 months

DCD: Connection executions can be triggered manually

by Lars Michelsen

Module: check_mk Branch: master Commit: c681900629c9c6d10e9b10b9d376c1119edde0bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c681900629c9c6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 6 18:07:44 2018 +0100 DCD: Connection executions can be triggered manually There is an action button shown on the DCD connection WATO page for each connection to trigger it's next execution as soon as possible. In addition: * Moved DCD GUI tests to tests/unit/cmk/gui where they belong to prevent issues with missing GUI specific fixtures * Moved DCD specific fixtures to testlib.cee.dcd_tests to make them available for the DCD and DCD GUI tests Change-Id: I7663855b5ee6f491a9236d0fcbc01f10e9ad72bc --- cmk/gui/plugins/wato/utils/simple_modes.py | 33 +++++++++++++++++---- web/htdocs/images/icon_dcd_execute.png | Bin 0 -> 4083 bytes .../themes/facelift/images/icon_dcd_execute.png | Bin 0 -> 1338 bytes 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/cmk/gui/plugins/wato/utils/simple_modes.py b/cmk/gui/plugins/wato/utils/simple_modes.py index ac595de..685c5fb 100644 --- a/cmk/gui/plugins/wato/utils/simple_modes.py +++ b/cmk/gui/plugins/wato/utils/simple_modes.py @@ -33,7 +33,7 @@ b) A edit mode which can be used to create and edit an object. """ import abc -from typing import Optional, List, Type # pylint: disable=unused-import +from typing import Optional, List, Type, Union, Text, Tuple # pylint: disable=unused-import import cmk.gui.table as table import cmk.gui.watolib as watolib @@ -164,6 +164,19 @@ class SimpleListMode(SimpleWatoModeBase): """Shows the HTML code for the cells of an object row""" raise NotImplementedError() + def _handle_custom_action(self, action): + # type: (str) -> Optional[Union[bool, Tuple[Optional[str], Text]]] + """Gives the mode the option to implement custom actions + + This function is called when the action phase is triggered. The action name is given + with the _action HTTP variable. It is handed over as first argument to this function. + + NOTE: The implementation needs to invalidate the transaction ID on it's own. + + The "delete" action is automatically handled by the SimpleListMode implementation. + """ + raise MKUserError("_action", _("The action '%s' is not implemented") % action) + def buttons(self): global_buttons() html.context_button( @@ -174,9 +187,12 @@ class SimpleListMode(SimpleWatoModeBase): if not html.transaction_valid(): return - if not html.has_var("_delete"): + if not html.has_var("_action"): return + if html.var("_action") != "delete": + return self._handle_custom_action(html.var("_action")) + confirm = wato_confirm(_("Confirm deletion"), self._delete_confirm_message()) if confirm is False: return False @@ -223,12 +239,17 @@ class SimpleListMode(SimpleWatoModeBase): def _show_action_cell(self, ident): table.cell(_("Actions"), css="buttons") - edit_url = html.makeuri_contextless([("mode", self._mode_type.edit_mode_name()), - ("ident", ident)]) + edit_url = html.makeuri_contextless([ + ("mode", self._mode_type.edit_mode_name()), + ("ident", ident), + ]) html.icon_button(edit_url, _("Edit this %s") % self._mode_type.name_singular(), "edit") - delete_url = watolib.make_action_link([("mode", self._mode_type.list_mode_name()), - ("_delete", ident)]) + delete_url = watolib.make_action_link([ + ("mode", self._mode_type.list_mode_name()), + ("_action", "delete"), + ("_delete", ident), + ]) html.icon_button(delete_url, _("Delete this %s") % self._mode_type.name_singular(), "delete") diff --git a/web/htdocs/images/icon_dcd_execute.png b/web/htdocs/images/icon_dcd_execute.png new file mode 100644 index 0000000..5d4b3b5 Binary files /dev/null and b/web/htdocs/images/icon_dcd_execute.png differ diff --git a/web/htdocs/themes/facelift/images/icon_dcd_execute.png b/web/htdocs/themes/facelift/images/icon_dcd_execute.png new file mode 100644 index 0000000..358c3fd Binary files /dev/null and b/web/htdocs/themes/facelift/images/icon_dcd_execute.png differ

5 years, 9 months

Fixed wrong type declaration of MKUserError() message

by Lars Michelsen

Module: check_mk Branch: master Commit: 51cdb44cea3eb5431059f911b3f1a7c7b3784f49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51cdb44cea3eb5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 13 11:41:29 2018 +0100 Fixed wrong type declaration of MKUserError() message Change-Id: Id652add4b0c9848180c14c783205977bcd724f96 --- cmk/gui/exceptions.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/cmk/gui/exceptions.py b/cmk/gui/exceptions.py index cf991ce..403c46a 100644 --- a/cmk/gui/exceptions.py +++ b/cmk/gui/exceptions.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -from typing import Optional # pylint: disable=unused-import +from typing import Optional, Text # pylint: disable=unused-import import cmk.gui.http_status from cmk.gui.i18n import _ @@ -105,21 +105,20 @@ class MKConfigError(MKException): class MKUserError(MKException): def __init__(self, varname, message): - # type: (str, str) -> None + # type: (str, Text) -> None self.varname = varname # type: str - self.message = message # type: str + self.message = message # type: Text super(MKUserError, self).__init__(varname, message) def __str__(self): - # type: () -> str return self.message def title(self): - # type: () -> unicode + # type: () -> Text return _("Invalid User Input") def plain_title(self): - # type: () -> unicode + # type: () -> Text return _("User error")

5 years, 9 months

Cleaned up default local path definitions (for type detection)

by Lars Michelsen

Module: check_mk Branch: master Commit: bf30f144eff0e0aee6daf715ed02db3c13a4a24c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf30f144eff0e0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 13 20:58:06 2018 +0100 Cleaned up default local path definitions (for type detection) Change-Id: Ie0e86111d003250791b133939870d32951edf6d4 --- cmk/paths.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/cmk/paths.py b/cmk/paths.py index 6431fc0..df8689e 100644 --- a/cmk/paths.py +++ b/cmk/paths.py @@ -84,22 +84,22 @@ mib_dir = None # TODO: Add active_checks_dir and make it used in code local_share_dir = '' -local_checks_dir = None -local_notifications_dir = None -local_inventory_dir = None -local_check_manpages_dir = None -local_agents_dir = None -local_mibs_dir = None -local_web_dir = None -local_pnp_templates_dir = None -local_doc_dir = None -local_locale_dir = '' # type: str -local_bin_dir = None +local_checks_dir = '' +local_notifications_dir = '' +local_inventory_dir = '' +local_check_manpages_dir = '' +local_agents_dir = '' +local_mibs_dir = '' +local_web_dir = '' +local_pnp_templates_dir = '' +local_doc_dir = '' +local_locale_dir = '' +local_bin_dir = '' local_lib_dir = '' -local_mib_dir = None -inventory_output_dir = None -inventory_archive_dir = None -status_data_dir = None +local_mib_dir = '' +inventory_output_dir = '' +inventory_archive_dir = '' +status_data_dir = '' def _set_paths():

5 years, 9 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2018