Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

6322 FIX Inventory painters: Allow dynamic table column width scaling

by Lars Michelsen

Module: check_mk Branch: master Commit: 6f4f8a82dd2e33376feae640e3b2496d5534b4a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f4f8a82dd2e33… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 3 17:04:50 2018 +0200 6322 FIX Inventory painters: Allow dynamic table column width scaling In previous versions inventory painter columns tried to consume as much width of the view tables as possible. This has been changed to allow automatic width scaling of all non-fixed-width columns in the table. Change-Id: Ibc27805dc1743396f5eb614ec7e2a34364d80f9c --- .werks/6322 | 13 +++++++++++++ web/plugins/views/inventory.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/6322 b/.werks/6322 new file mode 100644 index 0000000..29c4e08 --- /dev/null +++ b/.werks/6322 @@ -0,0 +1,13 @@ +Title: Inventory painters: Allow dynamic table column width scaling +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1530630169 + +In previous versions inventory painter columns tried to consume as much width +of the view tables as possible. This has been changed to allow automatic width +scaling of all non-fixed-width columns in the table. diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 0f7d9ed..2443205 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -81,7 +81,7 @@ def _paint_host_inventory_tree_value(struct_tree, parsed_path, tree_renderer, in tree_renderer.show_attribute(child.get_child_data().get(attributes_key), _inv_display_hint(invpath)) code = html.drain() - return "invtree", code + return "", code inv_filter_info = {

6 years, 2 months

6299 FIX mk_logwatch: If no MK_CONFDIR/ logwatch.cfg exists all configuration files below MK_CONFDIR/ logwatch.d were ignored. Fixed that!

by Simon Betz

Module: check_mk Branch: master Commit: 727e5c06275d1c86fcfd1f0a30f936edbda983a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=727e5c06275d1c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jul 2 14:48:47 2018 +0200 6299 FIX mk_logwatch: If no MK_CONFDIR/logwatch.cfg exists all configuration files below MK_CONFDIR/logwatch.d were ignored. Fixed that! Change-Id: I044f590cfaa8567587e37cc7e100eb79dd1682d4 --- .werks/6299 | 10 ++++++++++ agents/plugins/mk_logwatch | 8 +++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/6299 b/.werks/6299 new file mode 100644 index 0000000..6f7622e --- /dev/null +++ b/.werks/6299 @@ -0,0 +1,10 @@ +Title: mk_logwatch: If no MK_CONFDIR/logwatch.cfg exists all configuration files below MK_CONFDIR/logwatch.d were ignored. Fixed that! +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1530535554 +Class: fix + + diff --git a/agents/plugins/mk_logwatch b/agents/plugins/mk_logwatch index 0211325..db6a606 100755 --- a/agents/plugins/mk_logwatch +++ b/agents/plugins/mk_logwatch @@ -187,7 +187,13 @@ def parse_pattern(level, pattern, line): return (level, compiled) def read_config(): - config_lines = [ line.rstrip() for line in filter(is_not_comment, file(config_filename).readlines()) ] + config_lines = [] + try: + config_lines += [ line.rstrip() for line in filter(is_not_comment, file(config_filename).readlines()) ] + except IOError, e: + if debug: + raise + # Add config from a logwatch.d folder for config_file in glob.glob(config_dir): config_lines += [ line.rstrip() for line in filter(is_not_comment, file(config_file).readlines()) ]

6 years, 2 months

6302 FIX check_mk_agent.linux: Fixed 'oci runtime error: exec failed: container_linux.go:265: starting container process caused "exec: \" check_mk_agent\": executable file not found in $PATH"'

by Simon Betz

Module: check_mk Branch: master Commit: de0dac17b7062f226a9554120490bdbd658a0287 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de0dac17b7062f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jul 3 15:57:29 2018 +0200 6302 FIX check_mk_agent.linux: Fixed 'oci runtime error: exec failed: container_linux.go:265: starting container process caused "exec: \"check_mk_agent\": executable file not found in $PATH"' Change-Id: I66f2b68cfb6efc1c84808b6e1c158858be43950a --- .werks/6302 | 10 ++++++++++ agents/check_mk_agent.linux | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/6302 b/.werks/6302 new file mode 100644 index 0000000..9adc520 --- /dev/null +++ b/.werks/6302 @@ -0,0 +1,10 @@ +Title: check_mk_agent.linux: Fixed 'oci runtime error: exec failed: container_linux.go:265: starting container process caused "exec: \"check_mk_agent\": executable file not found in $PATH"' +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1530626219 +Class: fix + + diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index ac842d9..4b14d9a 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -1038,7 +1038,7 @@ if type docker > /dev/null 2>&1 && [ -z "$MK_IS_PIGGYBACKED" ]; then # the container. # Once it comes to plugins and custom configuration the user needs to use # a little more complex setup. Have a look at the documentation. - AGENT_PATH=$(docker container exec "$CONTAINER_ID" which check_mk_agent 2>/dev/null) + AGENT_PATH=$(docker container exec "$CONTAINER_ID" bash -c "type check_mk_agent" 2>/dev/null) if [ -n "$AGENT_PATH" ]; then docker container exec --env MK_IS_PIGGYBACKED=1 --env "REMOTE=$REMOTE" "$CONTAINER_ID" check_mk_agent elif docker container exec "$CONTAINER_ID" which bash >/dev/null 2>&1; then

6 years, 2 months

6118 Add a analyze configuration rule for flexible and plain email notifications

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 9d88d55cd0bb794d19eab9529eb992b035dd6004 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d88d55cd0bb79… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Jun 29 18:18:13 2018 +0200 6118 Add a analyze configuration rule for flexible and plain email notifications A deprecation warning will be shown if rulebased notifications are deactivated since flexible and plain email notifications are considered deprecated in version 1.5.0 and will be removed in version 1.6.0. Please consider to switch to rulebased notifications. Change-Id: Ibdb7d45eebdacec1cbb2c033aaef5f1b70e5cb70 --- .werks/6118 | 12 ++++++++++++ web/plugins/wato/ac_tests.py | 25 ++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/.werks/6118 b/.werks/6118 new file mode 100644 index 0000000..6653801 --- /dev/null +++ b/.werks/6118 @@ -0,0 +1,12 @@ +Title: Add a analyze configuration rule for flexible and plain email notifications +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1530288849 +Class: feature + +A deprecation warning will be shown if rulebased notifications are deactivated +since flexible and plain email notifications are considered deprecated and will +be removed in the next release. diff --git a/web/plugins/wato/ac_tests.py b/web/plugins/wato/ac_tests.py index f73b850..96db7a3 100644 --- a/web/plugins/wato/ac_tests.py +++ b/web/plugins/wato/ac_tests.py @@ -748,7 +748,30 @@ class ACTestESXDatasources(ACTest): in ['agent', 'hostsystem_agent']) if vsphere_queries_agent: all_rules_ok = False - yield ACResultCRIT("Rule %d in Folder %s is affected" % (rule_index + 1, folder.title())) + yield ACResultCRIT(_("Rule %d in Folder %s is affected") % (rule_index + 1, folder.title())) if all_rules_ok: yield ACResultOK(_("No configured rules are affected")) + + +class ACTestRulebasedNotifications(ACTest): + def category(self): + return ACTestCategories.deprecations + + def title(self): + return _("Flexible and plain email notifications") + + def help(self): + return _("Flexible and plain email notifications are considered deprecated in version 1.5.0 and " + " will be removed in Check_MK version 1.6.0. Please consider to switch to rulebased " + "notifications.") + + def is_relevant(self): + return True + + def execute(self): + settings = watolib.load_configuration_settings() + if settings['enable_rulebased_notifications'] != True: + yield ACResultCRIT('Rulebased notifications are deactivated in the global settings') + else: + yield ACResultOK(_("Rulebased notifications are activated"))

6 years, 2 months

checktestlib: be more verbose in assertions

by Moritz Kiemer

Module: check_mk Branch: master Commit: 3bca050d2679e64ca78a733ccb357c52f3c85cc3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3bca050d2679e6… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Jul 3 13:18:34 2018 +0200 checktestlib: be more verbose in assertions Change-Id: Ifc6d0e138cbe43ae8154abb060a749d1a5ffc852 --- tests/unit/checks/checktestlib.py | 73 ++++++++++++++++++++++++--------------- 1 file changed, 45 insertions(+), 28 deletions(-) diff --git a/tests/unit/checks/checktestlib.py b/tests/unit/checks/checktestlib.py index a3fbc47..6a8f83f 100644 --- a/tests/unit/checks/checktestlib.py +++ b/tests/unit/checks/checktestlib.py @@ -29,31 +29,38 @@ class PerfValue(Tuploid): """Represents a single perf value""" def __init__(self, key, value, warn=None, crit=None, minimum=None, maximum=None): + self.key = key + self.value = value + self.warn = warn + self.crit = crit + self.minimum = minimum + self.maximum = maximum + # TODO: This is very basic. There is more way more magic involved # in what kind of values are allowed as metric names. # I'm not too sure unicode should be allowed, either. - assert type(key) in [str, unicode] - assert " " not in key # This leads to serious errors - assert "=" not in key # The parsing around this is way too funky and doesn't work properly + assert type(key) in [str, unicode],\ + "key %r must be of type str or unicode" % key + # Whitespace leads to serious errors + assert len(key.split()) == 1, \ + "key %r must not contain whitespaces" % key + # Parsing around this is way too funky and doesn't work properly + assert "=" not in key, "key %r must not contain '='" % key assert "\n" not in key - self.key = key - # NOTE: The CMC as well as all other Nagios-compatible cores do accept a # string value that may contain a unit, which is in turn available # for use in PNP4Nagios templates. Check_MK defines its own semantic # context for performance values using Check_MK metrics. It is therefore # preferred to return a "naked" scalar. - assert type(value) in [int, float] - self.value = value - - assert type(warn) in [int, float, types.NoneType] - self.warn = warn - assert type(crit) in [int, float, types.NoneType] - self.crit = crit - assert type(minimum) in [int, float, types.NoneType] - self.minimum = minimum - assert type(maximum) in [int, float, types.NoneType] - self.maximum = maximum + assert type(value) in [int, float],\ + "value %r must be of type int or float - not %r" % (value, type(value)) + msg = "%s parameter %r must be of type int, float or None - not %r" + assert type(warn) in [int, float, types.NoneType], msg % ('warn', warn, type(warn)) + assert type(crit) in [int, float, types.NoneType], msg % ('crit', crit, type(crit)) + assert type(minimum) in [int, float, types.NoneType], \ + msg % ('minimum', minimum, type(minimum)) + assert type(maximum) in [int, float, types.NoneType], \ + msg % ('maximum', maximum, type(maximum)) @property def tuple(self): @@ -75,10 +82,11 @@ class BasicCheckResult(Tuploid): def __init__(self, status, infotext, perfdata=None): """We perform some basic consistency checks during initialization""" - assert status in [0, 1, 2, 3] + assert status in [0, 1, 2, 3], "invalid status: %r" % status self.status = status - assert type(infotext) in [ str, unicode ] + assert type(infotext) in [str, unicode],\ + "infotext %r must be of type str or unicode" % infotext if "\n" in infotext: self.infotext, \ @@ -88,11 +96,13 @@ class BasicCheckResult(Tuploid): self.multiline = None if perfdata is not None: - assert type(perfdata) == list + assert type(perfdata) == list,\ + "perfdata %r must be of type list" % perfdata self.perfdata = [] for entry in perfdata: - assert type(entry) in [tuple, PerfValue] + assert type(entry) in [tuple, PerfValue],\ + "perfdata entry %r must be of type tuple or PerfValue" % entry if type(entry) is tuple: self.perfdata.append(PerfValue(*entry)) else: @@ -179,13 +189,17 @@ def assertCheckResultsEqual(actual, expected): This gives more helpful output than 'assert actual == expected' """ if isinstance(actual, BasicCheckResult): - assert isinstance(expected, BasicCheckResult) + assert isinstance(expected, BasicCheckResult), \ + "%r is not a BasicCheckResult instance" % expected assert actual == expected, "%s != %s" % (actual, expected) else: - assert isinstance(actual, CheckResult) - assert isinstance(expected, CheckResult) - assert len(actual.subresults) == len(expected.subresults) + assert isinstance(actual, CheckResult), \ + "%r is not a CheckResult instance" % actual + assert isinstance(expected, CheckResult), \ + "%r is not a CheckResult instance" % expected + assert len(actual.subresults) == len(expected.subresults), \ + "subresults not of equal length" for suba, sube in zip(actual.subresults, expected.subresults): assert suba == sube, "%r != %r" % (suba, sube) @@ -247,9 +261,12 @@ def assertDiscoveryResultsEqual(actual, expected): This gives more helpful output than 'assert actual == expected' """ - assert isinstance(actual, DiscoveryResult) - assert isinstance(expected, DiscoveryResult) - assert len(actual.entries) == len(expected.entries) + assert isinstance(actual, DiscoveryResult), \ + "%r is not a DiscoveryResult instance" % actual + assert isinstance(expected, DiscoveryResult), \ + "%r is not a DiscoveryResult instance" % expected + assert len(actual.entries) == len(expected.entries), \ + "DiscoveryResults are not of equal length" for enta, ente in zip(actual, expected): assert enta == ente, "%r != %r" % (enta, ente) @@ -272,7 +289,7 @@ class BasicItemState(object): msg = "time_diff should be of type float/int - not %r" assert time_diff_type in (float, int), msg % time_diff_type # We do allow negative time diffs. - # We want to ba able to test time anomalies. + # We want to be able to test time anomalies. class MockItemState(object):

6 years, 2 months

zfs_arc_cache: make perfdata float instead of str

by Moritz Kiemer

Module: check_mk Branch: master Commit: 81729b4498528290c55b7e2dadb52fbff3073ae3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81729b44985282… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Jul 3 14:05:31 2018 +0200 zfs_arc_cache: make perfdata float instead of str Change-Id: If0c7417f14e917cad9caf40067cf3ed0e2a89423 --- checks/zfs_arc_cache | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/checks/zfs_arc_cache b/checks/zfs_arc_cache index 07afa68..476d830 100644 --- a/checks/zfs_arc_cache +++ b/checks/zfs_arc_cache @@ -293,18 +293,18 @@ def check_zfs_arc_cache(_no_item, _no_params, parsed): if total_hits_misses: hit_ratio = float(parsed["%shits" % key]) / total_hits_misses * 100 yield 0, "%sHit Ratio: %0.2f%%" % (human_key.title(), hit_ratio), \ - [("%shit_ratio" % key, "%0.2f" % hit_ratio, '', '', 0, 100)] + [("%shit_ratio" % key, hit_ratio, None, None, 0, 100)] else: yield 0, "No %sHits or Misses" % human_key, \ - [("%shit_ratio" % key, 0, '', '', 0, 100)] + [("%shit_ratio" % key, 0, None, None, 0, 100)] # size if "size" in parsed.keys(): size_bytes = parsed["size"] size_readable = get_bytes_human_readable(size_bytes) yield 0, "Cache size: %s" % size_readable, \ - [("size", size_bytes, '', '', 0)] + [("size", float(size_bytes), None, None, 0)] # arc_meta # these values may be missing, this is ok too @@ -315,9 +315,9 @@ def check_zfs_arc_cache(_no_item, _no_params, parsed): (get_bytes_human_readable(parsed["arc_meta_used"]), get_bytes_human_readable(parsed["arc_meta_limit"]), get_bytes_human_readable(parsed["arc_meta_max"])), \ - [("arc_meta_used", parsed["arc_meta_used"], '', '', 0), - ("arc_meta_limit", parsed["arc_meta_limit"], '', '', 0), - ("arc_meta_max", parsed["arc_meta_max"], '', '', 0)] + [("arc_meta_used", float(parsed["arc_meta_used"]), None, None, 0), + ("arc_meta_limit", float(parsed["arc_meta_limit"]), None, None, 0), + ("arc_meta_max", float(parsed["arc_meta_max"]), None, None, 0)] check_info["zfs_arc_cache"] = { @@ -357,20 +357,20 @@ def check_zfs_arc_cache_l2(_no_item, _no_params, parsed): if "l2_hits" in parsed.keys() and "l2_misses" in parsed.keys(): l2_hit_ratio = float(parsed["l2_hits"]) / (parsed["l2_hits"] + parsed["l2_misses"]) * 100 message += " L2 hit ratio: %0.2f%%" % l2_hit_ratio - perfdata.append(("l2_hit_ratio", "%0.2f" % l2_hit_ratio, '', '', 0, 100)) + perfdata.append(("l2_hit_ratio", l2_hit_ratio, None, None, 0, 100)) else: message += " no info about L2 hit ratio available" - perfdata.append(("l2_hit_ratio", 0, '', '', 0, 100)) + perfdata.append(("l2_hit_ratio", 0, None, None, 0, 100)) status = 3 # size if "l2_size" in parsed.keys(): message += ", L2 size: %s" % get_bytes_human_readable(parsed["l2_size"]) - perfdata.append(("l2_size", parsed["l2_size"], '', '', 0)) + perfdata.append(("l2_size", float(parsed["l2_size"]), None, None, 0)) else: message += ", no info about L2 size available" - perfdata.append(("l2_size", 0, '', '', 0)) + perfdata.append(("l2_size", 0, None, None, 0)) status = 3 return status, message, perfdata

6 years, 2 months

6320 FIX Some services (e.g. Linux Memory) were using wrong perfometers

by Lars Michelsen

Module: check_mk Branch: master Commit: 22e180abfccd0461ac5906ff304b5ed29acc81ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22e180abfccd04… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 3 14:51:47 2018 +0200 6320 FIX Some services (e.g. Linux Memory) were using wrong perfometers Change-Id: Icdb9074f706e394a3dddd84a2b9733fd89755e84 --- .werks/6320 | 11 +++++++++++ web/htdocs/metrics.py | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/.werks/6320 b/.werks/6320 new file mode 100644 index 0000000..b648204 --- /dev/null +++ b/.werks/6320 @@ -0,0 +1,11 @@ +Title: Some services (e.g. Linux Memory) were using wrong perfometers +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1530622280 + + diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index bc6aa27..8cc4069 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -575,6 +575,12 @@ def parse_perf_data(perf_data_string, check_command=None): varname, values = part.split("=", 1) varname = cmk.utils.pnp_cleanup(varname.replace("\"", "").replace("\'", "")) + # Enforce varname to be a byte string for the moment. The plugins currently register + # the plugins with byte string varnames. In the long term this needs to be cleaned up + # to be unicode strings just like all internal strings. But for the moment the mixup + # would confuse e.g. dict lookups etc. + varname = varname.encode("utf-8") + value_parts = values.split(";") while len(value_parts) < 5: value_parts.append(None)

6 years, 2 months

Fixed and enabled invalid-encoded-data warnings.

by Sven Panne

Module: check_mk Branch: master Commit: e418636fbec79bb703aa43bc68332efc8b3aeda4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e418636fbec79b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 3 14:07:29 2018 +0200 Fixed and enabled invalid-encoded-data warnings. Change-Id: I84b3d6c37e810eb858046da7116455fdb7f055f7 --- tests/pylint/pylintrc | 1 - tests/pylint/test_pylint_bakery_plugins.py | 12 +++++------ tests/pylint/test_pylint_check_plugins.py | 19 +++++++++--------- tests/pylint/test_pylint_inventory_plugins.py | 29 +++++++++++++-------------- tests/pylint/test_pylint_web.py | 10 ++++----- tests/testlib/pylint_cmk.py | 2 +- web/htdocs/availability.py | 8 ++++---- 7 files changed, 37 insertions(+), 44 deletions(-) diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index f5e6fd4..3dc4418 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -40,7 +40,6 @@ disable= global-statement, global-variable-undefined, inconsistent-return-statements, - invalid-encoded-data, invalid-name, keyword-arg-before-vararg, len-as-condition, diff --git a/tests/pylint/test_pylint_bakery_plugins.py b/tests/pylint/test_pylint_bakery_plugins.py index 517095e..fa9a075 100755 --- a/tests/pylint/test_pylint_bakery_plugins.py +++ b/tests/pylint/test_pylint_bakery_plugins.py @@ -7,15 +7,13 @@ from testlib import repo_path, cmc_path import testlib.pylint_cmk as pylint_cmk def test_pylint_bakery_plugins(pylint_test_dir): - f = file(pylint_test_dir + "/cmk-bakery-plugins.py", "w") + with open(pylint_test_dir + "/cmk-bakery-plugins.py", "w") as f: - pylint_cmk.add_file(f, os.path.realpath(os.path.join(cmc_path(), "cmk_base/cee/agent_bakery_plugins.py"))) + pylint_cmk.add_file(f, os.path.realpath(os.path.join(cmc_path(), "cmk_base/cee/agent_bakery_plugins.py"))) - # Also add bakery plugins - for path in pylint_cmk.check_files(os.path.join(cmc_path(), "agents/bakery")): - pylint_cmk.add_file(f, path) - - f.close() + # Also add bakery plugins + for path in pylint_cmk.check_files(os.path.join(cmc_path(), "agents/bakery")): + pylint_cmk.add_file(f, path) exit_code = pylint_cmk.run_pylint(pylint_test_dir) assert exit_code == 0, "PyLint found an error in agent bakery plugins" diff --git a/tests/pylint/test_pylint_check_plugins.py b/tests/pylint/test_pylint_check_plugins.py index a259872..956f2ef 100755 --- a/tests/pylint/test_pylint_check_plugins.py +++ b/tests/pylint/test_pylint_check_plugins.py @@ -8,10 +8,11 @@ from testlib import repo_path, cmc_path import testlib.pylint_cmk as pylint_cmk def test_pylint_checks(pylint_test_dir): - f = file(pylint_test_dir + "/cmk-checks.py", "w") + with open(pylint_test_dir + "/cmk-checks.py", "w") as f: - # Fake data structures where checks register (See cmk_base/checks.py) - f.write(""" + # Fake data structures where checks register (See cmk_base/checks.py) + f.write(""" +# -*- encoding: utf-8 -*- check_info = {} check_includes = {} precompile_params = {} @@ -24,14 +25,12 @@ active_check_info = {} special_agent_info = {} """) - # add the modules - pylint_cmk.add_file(f, repo_path() + "/cmk_base/check_api.py") + # add the modules + pylint_cmk.add_file(f, repo_path() + "/cmk_base/check_api.py") - # Now add the checks - for path in pylint_cmk.check_files(repo_path() + "/checks"): - pylint_cmk.add_file(f, path) - - f.close() + # Now add the checks + for path in pylint_cmk.check_files(repo_path() + "/checks"): + pylint_cmk.add_file(f, path) exit_code = pylint_cmk.run_pylint(pylint_test_dir) assert exit_code == 0, "PyLint found an error in checks, inventory " \ diff --git a/tests/pylint/test_pylint_inventory_plugins.py b/tests/pylint/test_pylint_inventory_plugins.py index ed2b5c7..28b8e9c 100755 --- a/tests/pylint/test_pylint_inventory_plugins.py +++ b/tests/pylint/test_pylint_inventory_plugins.py @@ -7,10 +7,11 @@ from testlib import repo_path import testlib.pylint_cmk as pylint_cmk def test_pylint_inventory_plugins(pylint_test_dir): - f = file(pylint_test_dir + "/cmk-inventory-plugins.py", "w") + with open(pylint_test_dir + "/cmk-inventory-plugins.py", "w") as f: - # Fake data structures where checks register (See cmk_base/checks.py) - f.write(""" + # Fake data structures where checks register (See cmk_base/checks.py) + f.write(""" +# -*- encoding: utf-8 -*- check_info = {} check_includes = {} precompile_params = {} @@ -37,21 +38,19 @@ def inv_tree(path, default_value=None): return node """) - # add the modules - pylint_cmk.add_file(f, repo_path() + "/cmk_base/check_api.py") + # add the modules + pylint_cmk.add_file(f, repo_path() + "/cmk_base/check_api.py") - # add the modules - pylint_cmk.add_file(f, repo_path() + "/cmk_base/inventory_plugins.py") + # add the modules + pylint_cmk.add_file(f, repo_path() + "/cmk_base/inventory_plugins.py") - # Now add the checks - for path in pylint_cmk.check_files(repo_path() + "/checks"): - pylint_cmk.add_file(f, path) + # Now add the checks + for path in pylint_cmk.check_files(repo_path() + "/checks"): + pylint_cmk.add_file(f, path) - # Now add the inventory plugins - for path in pylint_cmk.check_files(repo_path() + "/inventory"): - pylint_cmk.add_file(f, path) - - f.close() + # Now add the inventory plugins + for path in pylint_cmk.check_files(repo_path() + "/inventory"): + pylint_cmk.add_file(f, path) exit_code = pylint_cmk.run_pylint(pylint_test_dir) assert exit_code == 0, "PyLint found an error in inventory plugins" diff --git a/tests/pylint/test_pylint_web.py b/tests/pylint/test_pylint_web.py index 50af9e3..f58b200 100755 --- a/tests/pylint/test_pylint_web.py +++ b/tests/pylint/test_pylint_web.py @@ -45,9 +45,8 @@ def test_pylint_web(pylint_test_dir): for module in modules: print("Copy %s to test directory" % module) - f = open(pylint_test_dir + "/" + os.path.basename(module), "w") - pylint_cmk.add_file(f, module) - f.close() + with open(pylint_test_dir + "/" + os.path.basename(module), "w") as f: + pylint_cmk.add_file(f, module) # Move the whole plugins code to their modules, then # run pylint only on the modules @@ -67,9 +66,8 @@ def test_pylint_web(pylint_test_dir): module_name = plugin_dir print("[%s] add %s" % (module_name, plugin_path)) - module = file(pylint_test_dir + "/" + module_name + ".py", "a") - pylint_cmk.add_file(module, plugin_path) - module.close() + with open(pylint_test_dir + "/" + module_name + ".py", "a") as module: + pylint_cmk.add_file(module, plugin_path) exit_code = pylint_cmk.run_pylint(pylint_test_dir) assert exit_code == 0, "PyLint found an error in the web code" diff --git a/tests/testlib/pylint_cmk.py b/tests/testlib/pylint_cmk.py index 3e278cf..6f3d524 100644 --- a/tests/testlib/pylint_cmk.py +++ b/tests/testlib/pylint_cmk.py @@ -29,7 +29,7 @@ def add_file(f, path): # in the build system. relpath = os.path.relpath(os.path.realpath(path), os.path.dirname(os.path.dirname(os.getcwd()))) - f.write("\n") + f.write("# -*- encoding: utf-8 -*-") f.write("#\n") f.write("# ORIG-FILE: " + relpath + "\n") f.write("#\n") diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index 6f17c8b..b106de1 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -1128,7 +1128,7 @@ def melt_short_intervals(entries, duration, dont_merge): # { # "from" : 1238288548, # "until" : 1238292845, -# "text" : u"Das ist ein Text über mehrere Zeilen, oder was weiß ich", +# "text" : u"Das ist ein Text ÃŒber mehrere Zeilen, oder was weiÃ ich", # "date" : 12348854885, # Time of entry # "author" : "mk", # "downtime" : True, # Can also be False or None or missing. None is like missing @@ -1204,9 +1204,9 @@ def delete_annotation(annotations, site_host_svc, fromtime, untiltime): # When grouping is enabled, this function is called once for each group # TODO: range_title sollte hier ueberfluessig sein # TODO: Hier jetzt nicht direkt HTML erzeugen, sondern eine saubere -# Datenstruktur füllen, welche die Daten so repräsentiert, dass sie -# nur noch 1:1 dargestellt werden müssen. -# Beispiel für einen Rückgabewert: +# Datenstruktur fÃŒllen, welche die Daten so reprÃ€sentiert, dass sie +# nur noch 1:1 dargestellt werden mÃŒssen. +# Beispiel fÃŒr einen RÃŒckgabewert: # { # "title" : "Hostgroup foobar", # "headers" : [ "OK, "CRIT", "Downtime" ],

6 years, 2 months

Unified check_mk sections

by Simon Betz

Module: check_mk Branch: master Commit: a5dcb9e90c51796c12f32c9b0dc4257ca0182584 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5dcb9e90c5179… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jul 3 12:12:11 2018 +0200 Unified check_mk sections Change-Id: I58804aa7f412f1422798b9fb665ddce53968cc2e --- agents/check_mk_agent.aix | 13 +++++++++---- agents/check_mk_agent.freebsd | 14 +++++++++----- agents/check_mk_agent.hpux | 15 +++++++++------ agents/check_mk_agent.linux | 6 +++--- agents/check_mk_agent.macosx | 12 +++++++++--- agents/check_mk_agent.netbsd | 12 +++++++++--- agents/check_mk_agent.openbsd | 12 +++++++++--- agents/check_mk_agent.openwrt | 18 +++++++++--------- agents/check_mk_agent.solaris | 12 +++++++++--- 9 files changed, 75 insertions(+), 39 deletions(-) diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 9ca376e..dc7ad5f 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -124,10 +124,15 @@ function run_cached { fi } -echo '<<<check_mk>>>' -echo Version: 1.6.0i1 -echo AgentOS: aix -echo Hostname: $(hostname) +echo "<<<check_mk>>>" +echo "Version: 1.6.0i1" +echo "AgentOS: aix" +echo "Hostname: $(hostname)" +echo "AgentDirectory: $MK_CONFDIR" +echo "DataDirectory: $MK_VARDIR" +echo "SpoolDirectory: $SPOOLDIR" +echo "PluginsDirectory: $PLUGINSDIR" +echo "LocalDirectory: $LOCALDIR" echo '<<<df>>>' if [ -x /usr/opt/freeware/bin/df ] ; then diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 7395601..1da6507 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -104,11 +104,15 @@ function run_cached() { fi } -echo '<<<check_mk>>>' -echo Version: 1.6.0i1 -echo AgentOS: freebsd - - +echo "<<<check_mk>>>" +echo "Version: 1.6.0i1" +echo "AgentOS: freebsd" +echo "Hostname: $(hostname)" +echo "AgentDirectory: $MK_CONFDIR" +echo "DataDirectory: $MK_VARDIR" +echo "SpoolDirectory: $SPOOLDIR" +echo "PluginsDirectory: $PLUGINSDIR" +echo "LocalDirectory: $LOCALDIR" osver="$(uname -r)" is_jailed="$(sysctl -n security.jail.jailed)" diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index 4c1e839..4fe3ddd 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -48,12 +48,15 @@ else fi -echo '<<<check_mk>>>' -echo Version: 1.6.0i1 -echo AgentOS: hpux -echo PluginsDirectory: $PLUGINSDIR -echo LocalDirectory: $LOCALDIR -echo AgentDirectory: $MK_CONFDIR +echo "<<<check_mk>>>" +echo "Version: 1.6.0i1" +echo "AgentOS: hpux" +echo "Hostname: $(hostname)" +echo "AgentDirectory: $MK_CONFDIR" +echo "DataDirectory: $MK_VARDIR" +echo "SpoolDirectory: $SPOOLDIR" +echo "PluginsDirectory: $PLUGINSDIR" +echo "LocalDirectory: $LOCALDIR" # Filesystems. HP-UX does not provide a filesystem type. We assume # modern systems with vxfs only here. The filesystem type is currently diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 6850015..ac842d9 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -344,10 +344,10 @@ function run_real_time_checks() done } -echo '<<<check_mk>>>' -echo Version: 1.6.0i1 +echo "<<<check_mk>>>" +echo "Version: 1.6.0i1" echo "AgentOS: linux" -echo "Hostname: $HOSTNAME" +echo "Hostname: $(hostname)" echo "AgentDirectory: $MK_CONFDIR" echo "DataDirectory: $MK_VARDIR" echo "SpoolDirectory: $SPOOLDIR" diff --git a/agents/check_mk_agent.macosx b/agents/check_mk_agent.macosx index 388a78a..4ece76c 100755 --- a/agents/check_mk_agent.macosx +++ b/agents/check_mk_agent.macosx @@ -43,9 +43,15 @@ else fi -echo '<<<check_mk>>>' -echo Version: 1.6.0i1 -echo AgentOS: macosx +echo "<<<check_mk>>>" +echo "Version: 1.6.0i1" +echo "AgentOS: macosx" +echo "Hostname: $(hostname)" +echo "AgentDirectory: $MK_CONFDIR" +echo "DataDirectory: $MK_VARDIR" +echo "SpoolDirectory: $SPOOLDIR" +echo "PluginsDirectory: $PLUGINSDIR" +echo "LocalDirectory: $LOCALDIR" osver="$(uname -r)" diff --git a/agents/check_mk_agent.netbsd b/agents/check_mk_agent.netbsd index f4e1820..bf60f7c 100755 --- a/agents/check_mk_agent.netbsd +++ b/agents/check_mk_agent.netbsd @@ -59,9 +59,15 @@ else exec <&- 2>/dev/null fi -echo '<<<check_mk>>>' -echo Version: 1.6.0i1 -echo AgentOS: netbsd +echo "<<<check_mk>>>" +echo "Version: 1.6.0i1" +echo "AgentOS: netbsd" +echo "Hostname: $(hostname)" +echo "AgentDirectory: $MK_CONFDIR" +echo "DataDirectory: $MK_VARDIR" +echo "SpoolDirectory: $SPOOLDIR" +echo "PluginsDirectory: $PLUGINSDIR" +echo "LocalDirectory: $LOCALDIR" osver="$(uname -r)" diff --git a/agents/check_mk_agent.openbsd b/agents/check_mk_agent.openbsd index 5e77954..b8263c5 100755 --- a/agents/check_mk_agent.openbsd +++ b/agents/check_mk_agent.openbsd @@ -59,9 +59,15 @@ else exec <&- 2>/dev/null fi -echo '<<<check_mk>>>' -echo Version: 1.6.0i1 -echo AgentOS: openbsd +echo "<<<check_mk>>>" +echo "Version: 1.6.0i1" +echo "AgentOS: openbsd" +echo "Hostname: $(hostname)" +echo "AgentDirectory: $MK_CONFDIR" +echo "DataDirectory: $MK_VARDIR" +echo "SpoolDirectory: $SPOOLDIR" +echo "PluginsDirectory: $PLUGINSDIR" +echo "LocalDirectory: $LOCALDIR" osver="$(uname -r)" diff --git a/agents/check_mk_agent.openwrt b/agents/check_mk_agent.openwrt index 94c3377..463e56a 100755 --- a/agents/check_mk_agent.openwrt +++ b/agents/check_mk_agent.openwrt @@ -220,15 +220,15 @@ run_real_time_checks() done } -echo '<<<check_mk>>>' -echo Version: 1.6.0i1 -echo AgentOS: openwrt -echo Hostname: $HOSTNAME -echo AgentDirectory: $MK_CONFDIR -echo DataDirectory: $MK_VARDIR -echo SpoolDirectory: $SPOOLDIR -echo PluginsDirectory: $PLUGINSDIR -echo LocalDirectory: $LOCALDIR +echo "<<<check_mk>>>" +echo "Version: 1.6.0i1" +echo "AgentOS: openwrt" +echo "Hostname: $(hostname)" +echo "AgentDirectory: $MK_CONFDIR" +echo "DataDirectory: $MK_VARDIR" +echo "SpoolDirectory: $SPOOLDIR" +echo "PluginsDirectory: $PLUGINSDIR" +echo "LocalDirectory: $LOCALDIR" # If we are called via xinetd, try to find only_from configuration if [ -n "$REMOTE_HOST" ] diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 87e5f24..e5fa784 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -131,9 +131,15 @@ function run_cached () { } -echo '<<<check_mk>>>' -echo Version: 1.6.0i1 -echo AgentOS: solaris +echo "<<<check_mk>>>" +echo "Version: 1.6.0i1" +echo "AgentOS: solaris" +echo "Hostname: $(hostname)" +echo "AgentDirectory: $MK_CONFDIR" +echo "DataDirectory: $MK_VARDIR" +echo "SpoolDirectory: $SPOOLDIR" +echo "PluginsDirectory: $PLUGINSDIR" +echo "LocalDirectory: $LOCALDIR" # Find out what zone we are running in

6 years, 2 months

oracle_dataguard_stats, oracle_recovery_status: make perfdata tuples.

by Moritz Kiemer

Module: check_mk Branch: master Commit: 48e010935056f248161f2b7caecfa0b6ab8ce963 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48e010935056f2… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Jul 3 12:41:30 2018 +0200 oracle_dataguard_stats, oracle_recovery_status: make perfdata tuples. Change-Id: I5f81df4603c9c8cb8aa55ce1845d0c76b8461793 --- checks/oracle_dataguard_stats | 4 ++-- checks/oracle_recovery_status | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/checks/oracle_dataguard_stats b/checks/oracle_dataguard_stats index 773a77c..6ff8dec 100644 --- a/checks/oracle_dataguard_stats +++ b/checks/oracle_dataguard_stats @@ -117,9 +117,9 @@ def check_oracle_dataguard_stats(item, params, info): infotext += state_marker - perfdata.append([parameter.replace(' ', '_'), seconds, warn, crit]) + perfdata.append((parameter.replace(' ', '_'), seconds, warn, crit)) else: - perfdata.append([parameter.replace(' ', '_'), seconds]) + perfdata.append((parameter.replace(' ', '_'), seconds)) if itemfound == True: return state, infotext, perfdata diff --git a/checks/oracle_recovery_status b/checks/oracle_recovery_status index 5cbf57a..54dd363 100644 --- a/checks/oracle_recovery_status +++ b/checks/oracle_recovery_status @@ -114,7 +114,7 @@ def check_oracle_recovery_status(item, params, info): or not params.get("levels"): # We ignore the state of the check when no parameters are known # _mgmtdb is new internal instance from 12.1.0.2 on Grid-Infrastructure - perfdata.append(['checkpoint_age', oldest_checkpoint_age]) + perfdata.append(('checkpoint_age', oldest_checkpoint_age)) else: if database_role == 'PRIMARY': # checkpoint age should not higher on primary as well @@ -125,9 +125,9 @@ def check_oracle_recovery_status(item, params, info): infotext += '(!)' state = max(1, state) - perfdata.append(['checkpoint_age', oldest_checkpoint_age, warn]) + perfdata.append(('checkpoint_age', oldest_checkpoint_age, warn)) else: - perfdata.append(['checkpoint_age', oldest_checkpoint_age, warn, crit]) + perfdata.append(('checkpoint_age', oldest_checkpoint_age, warn, crit)) # check the checkpoint age on a non primary database! if oldest_checkpoint_age >= crit: @@ -157,7 +157,7 @@ def check_oracle_recovery_status(item, params, info): warn, crit = params["backup_age"] infotext += " (warn/crit at %s/%s)" % (get_age_human_readable(warn), get_age_human_readable(crit)) - perfdata.append(['backup_age', oldest_backup_age, warn, crit]) + perfdata.append(('backup_age', oldest_backup_age, warn, crit)) if oldest_backup_age >= crit: infotext += '(!!)' @@ -166,12 +166,12 @@ def check_oracle_recovery_status(item, params, info): infotext += '(!)' state = max(1, state) else: - perfdata.append(['backup_age', oldest_backup_age]) + perfdata.append(('backup_age', oldest_backup_age)) else: # create a 'dummy' performance data with 0 # => The age from plugin is only valid when a datafile is in backup mode! - perfdata.append(['backup_age', 0]) + perfdata.append(('backup_age', 0)) return state, infotext, perfdata

6 years, 2 months

← Newer
1
...
40
41
42
43
44
45
46
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