Checkmk git commits January 2019

checkmk-commits@lists.checkmk.com

15 participants
490 discussions

Refactoring: Moved check parameters from unsorted.py to dedicated modules (CMK-1393)

by Kenneth Okoh

Module: check_mk Branch: master Commit: c8fcf08da1775ced490a94e2ab1c045f2cd199b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8fcf08da1775c… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Fri Jan 11 17:16:46 2019 +0100 Refactoring: Moved check parameters from unsorted.py to dedicated modules (CMK-1393) Change-Id: I11564fd47320a2ee631700de9d277c533a0630b2 --- cmk/gui/plugins/wato/check_parameters/bonding.py | 57 +++ .../plugins/wato/check_parameters/cisco_ip_sla.py | 159 ++++++ .../check_parameters/esx_hostystem_maintenance.py | 50 ++ .../check_parameters/esx_vsphere_datastores.py | 67 +++ cmk/gui/plugins/wato/check_parameters/fcp.py | 130 +++++ .../wato/check_parameters/ibm_svc_mdiskgrp.py | 60 +++ cmk/gui/plugins/wato/check_parameters/if.py | 304 +++++++++++ .../wato/check_parameters/signal_quality.py | 48 ++ cmk/gui/plugins/wato/check_parameters/sp_util.py | 49 ++ cmk/gui/plugins/wato/check_parameters/unsorted.py | 568 --------------------- .../plugins/wato/check_parameters/volume_groups.py | 65 +++ 11 files changed, 989 insertions(+), 568 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c8fcf08da1…

5 years, 8 months

Refactoring: Moved check parameters from unsorted.py to dedicated modules (CMK-1393)

by Kenneth Okoh

Module: check_mk Branch: master Commit: 37a87880895822b6dd9ad60bfbdc5901926eb572 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37a87880895822… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Fri Jan 11 17:35:34 2019 +0100 Refactoring: Moved check parameters from unsorted.py to dedicated modules (CMK-1393) Change-Id: Ifab53ff9fc24f90f167608e87e27bd76d598e881 --- .../wato/check_parameters/cisco_supervisor_mem.py | 49 +++ .../check_parameters/cpu_utilization_cluster.py | 59 +++ .../wato/check_parameters/general_flash_usage.py | 59 +++ .../plugins/wato/check_parameters/mem_cluster.py | 53 +++ cmk/gui/plugins/wato/check_parameters/memory.py | 131 +++++++ .../plugins/wato/check_parameters/memory_arbor.py | 133 +++++++ .../plugins/wato/check_parameters/memory_linux.py | 112 ++++++ .../wato/check_parameters/memory_multiitem.py | 77 ++++ .../wato/check_parameters/memory_relative.py | 48 +++ .../plugins/wato/check_parameters/memory_simple.py | 85 +++++ cmk/gui/plugins/wato/check_parameters/unsorted.py | 422 --------------------- 11 files changed, 806 insertions(+), 422 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=37a8788089…

5 years, 8 months

Refactoring: Moved check parameters from unsorted.py to dedicated modules (CMK-1393)

by Kenneth Okoh

Module: check_mk Branch: master Commit: 872964c4895dcf55dab6e5fdb6f74e4de950bd3b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=872964c4895dcf… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Fri Jan 11 17:21:03 2019 +0100 Refactoring: Moved check parameters from unsorted.py to dedicated modules (CMK-1393) Change-Id: I86b9a48da8237f6d28e435689a16a45fa1f46051 --- cmk/gui/plugins/wato/check_parameters/cisco_mem.py | 78 +++++++ cmk/gui/plugins/wato/check_parameters/cisco_qos.py | 116 ++++++++++ .../wato/check_parameters/innovaphone_mem.py | 44 ++++ .../wato/check_parameters/juniper_cpu_util.py | 64 ++++++ .../plugins/wato/check_parameters/juniper_mem.py | 53 +++++ .../wato/check_parameters/juniper_mem_modules.py | 61 +++++ cmk/gui/plugins/wato/check_parameters/mem_pages.py | 48 ++++ .../plugins/wato/check_parameters/netscaler_mem.py | 52 +++++ .../wato/check_parameters/netscaler_vserver.py | 49 ++++ .../plugins/wato/check_parameters/statgrab_mem.py | 60 +++++ cmk/gui/plugins/wato/check_parameters/unsorted.py | 255 --------------------- 11 files changed, 625 insertions(+), 255 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=872964c489…

5 years, 8 months

Refactoring: Moved check parameters from unsorted.py to dedicated modules (CMK-1393)

by Kenneth Okoh

Module: check_mk Branch: master Commit: bab73f4cf143c81f31b8c505f2e0f835e851c9db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bab73f4cf143c8… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Fri Jan 11 16:31:08 2019 +0100 Refactoring: Moved check parameters from unsorted.py to dedicated modules (CMK-1393) Change-Id: I0d153cc86f9c5578a4cb53b789a109e26523a7ab --- cmk/gui/plugins/wato/check_parameters/cisco_wlc.py | 58 +++ .../wato/check_parameters/mongodb_collections.py | 44 +++ .../wato/check_parameters/msexch_copyqueue.py | 50 +++ .../plugins/wato/check_parameters/msx_database.py | 80 ++++ .../wato/check_parameters/msx_info_store.py | 71 ++++ .../plugins/wato/check_parameters/msx_queues.py | 75 ++++ .../wato/check_parameters/msx_rpcclientaccess.py | 61 ++++ .../wato/check_parameters/tcp_conn_stats.py | 159 ++++++++ .../wato/check_parameters/tcp_connections.py | 111 ++++++ cmk/gui/plugins/wato/check_parameters/unsorted.py | 406 --------------------- .../plugins/wato/check_parameters/wlc_clients.py | 71 ++++ 11 files changed, 780 insertions(+), 406 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bab73f4cf1…

5 years, 8 months

Refactoring: Moved printer and OS check parameters from unsorted.py to dedicated modules (CMK-1393)

by Kenneth Okoh

Module: check_mk Branch: master Commit: 24d8cb2af045c25d6b8134f305efe6c9b1b317a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24d8cb2af045c2… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Fri Jan 11 14:07:48 2019 +0100 Refactoring: Moved printer and OS check parameters from unsorted.py to dedicated modules (CMK-1393) Change-Id: I84535240c6c091a175e33fba2938eccf9f7ee0e1 --- .../plugins/wato/check_parameters/cups_queues.py | 75 +++++++ .../plugins/wato/check_parameters/printer_input.py | 58 +++++ .../wato/check_parameters/printer_output.py | 58 +++++ .../wato/check_parameters/printer_supply.py | 99 +++++++++ .../plugins/wato/check_parameters/systemtime.py | 44 ++++ cmk/gui/plugins/wato/check_parameters/unsorted.py | 233 --------------------- cmk/gui/plugins/wato/check_parameters/uptime.py | 60 ++++++ 7 files changed, 394 insertions(+), 233 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=24d8cb2af0…

5 years, 8 months

Refactoring: Moved last environment and storage check parameters from unsorted.py to dedicated modules (CMK-1393)

by Kenneth Okoh

Module: check_mk Branch: master Commit: 25f08da9f80393e2d542dd977068a803d76f8748 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25f08da9f80393… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Fri Jan 11 13:53:10 2019 +0100 Refactoring: Moved last environment and storage check parameters from unsorted.py to dedicated modules (CMK-1393) Change-Id: I48ad6331770839342639d77e4d1834da44b519ad --- .../wato/check_parameters/ocprot_current.py | 49 +++++ .../check_parameters/openhardwaremonitor_smart.py | 58 ++++++ .../wato/check_parameters/pll_lock_voltage.py | 82 ++++++++ .../wato/check_parameters/prism_container.py | 71 +++++++ .../plugins/wato/check_parameters/ps_voltage.py | 50 +++++ .../check_parameters/quantum_storage_status.py | 59 ++++++ cmk/gui/plugins/wato/check_parameters/read_hits.py | 45 +++++ cmk/gui/plugins/wato/check_parameters/unsorted.py | 220 --------------------- .../wato/check_parameters/veeam_tapejobs.py | 51 +++++ cmk/gui/plugins/wato/check_parameters/voltage.py | 64 ++++++ 10 files changed, 529 insertions(+), 220 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=25f08da9f8…

5 years, 8 months

test_ps: Added match_groups scenario

by Simon Betz

Module: check_mk Branch: master Commit: 8b68b02c62d66f66df8449d00f6b20330a90f0ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b68b02c62d66f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jan 17 11:41:50 2019 +0100 test_ps: Added match_groups scenario Change-Id: I6de6a86b8920a35447fafdd3d537129c8c580fb8 --- tests/unit/checks/test_ps.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tests/unit/checks/test_ps.py b/tests/unit/checks/test_ps.py index b929185..986f66b 100644 --- a/tests/unit/checks/test_ps.py +++ b/tests/unit/checks/test_ps.py @@ -330,6 +330,19 @@ def test_process_matches(check_manager, ps_line, ps_pattern, user_pattern, resul ps_pattern, user_pattern) == result +(a)pytest.mark.parametrize("ps_line, ps_pattern, user_pattern, match_groups, result", [ + (["test", "ps"], "", None, None, True), + (["test", "123_foo"], "~.*/(.*)_foo", None, ['123'], False), + (["test", "/a/b/123_foo"], "~.*/(.*)_foo", None, ['123'], True), + (["test", "123_foo"], "~.*\\\\(.*)_foo", None, ['123'], False), + (["test", "c:\\a\\b\\123_foo"], "~.*\\\\(.*)_foo", None, ['123'], True), +]) +def test_process_matches_match_groups(check_manager, ps_line, ps_pattern, user_pattern, match_groups, result): + check = check_manager.get_check("ps") + assert check.context["process_matches"]([check.context["ps_info"](ps_line[0])] + ps_line[1:], + ps_pattern, user_pattern, match_groups) == result + + @pytest.mark.parametrize("text, result", [ ("12:17", 737), ("55:12:17", 198737),

5 years, 8 months

CMK-14671467146714671467146714671467146714671467: Build legacy windows agent in Docker container

by Alex Zurhake

Module: check_mk Branch: master Commit: dba3b8b1b29c90a9a5f9897f6832f2093ccd69ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dba3b8b1b29c90… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Wed Jan 16 11:36:55 2019 +0100 CMK-14671467146714671467146714671467146714671467: Build legacy windows agent in Docker container Change-Id: I0ad6c0ddc7def6fc9b72f5ce26da1df5c1faa12f --- .../agent-builder/build-image-windows.sh | 188 +++++++++++++++++++++ buildscripts/scripts/nightly-build.jenkins | 67 +++++--- 2 files changed, 234 insertions(+), 21 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=dba3b8b1b2…

5 years, 8 months

Removed print statement

by Simon Betz

Module: check_mk Branch: master Commit: 3ad58c07abdd3f6181d4609f84bb2ade7f9db044 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ad58c07abdd3f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jan 17 11:22:25 2019 +0100 Removed print statement Change-Id: I7ed6a7bd2dce766da369903856cd278c5b665b5e --- tests/unit/checks/test_ps.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/unit/checks/test_ps.py b/tests/unit/checks/test_ps.py index 4e93605..b929185 100644 --- a/tests/unit/checks/test_ps.py +++ b/tests/unit/checks/test_ps.py @@ -430,10 +430,6 @@ def test_inventory_common(check_manager): check = check_manager.get_check("ps") info = sum(generate_inputs(), []) parsed = check.run_parse(info)[1] - - import pprint - pprint.pprint(check.context["inventory_ps_common"]([], PS_DISCOVERY_WATO_RULES, parsed)) - assert check.context["inventory_ps_common"]([], PS_DISCOVERY_WATO_RULES, parsed) == PS_DISCOVERED_ITEMS

5 years, 8 months

agent_kubernetes: add the option to specify a URL path prefix

by Tom Baerwinkel

Module: check_mk Branch: master Commit: ff0c84dd2e56c3937a930c0cfdc068238b3660d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff0c84dd2e56c3… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Jan 16 15:39:58 2019 +0100 agent_kubernetes: add the option to specify a URL path prefix The path prefix is prepended to all Kubernetes API calls. This e.g. useful for Kubernetes setups that are managed by Rancher. CMK-1478 Change-Id: I15fd9ddb89670271aab1431cc7c8ea9635a1164d --- checks/agent_kubernetes | 3 +++ cmk/gui/plugins/wato/datasource_programs.py | 24 +++++++++++++++++++++--- cmk/special_agents/agent_kubernetes.py | 18 ++++++++++++++++-- 3 files changed, 40 insertions(+), 5 deletions(-) diff --git a/checks/agent_kubernetes b/checks/agent_kubernetes index ff039c0..9497ce1 100644 --- a/checks/agent_kubernetes +++ b/checks/agent_kubernetes @@ -37,6 +37,9 @@ def agent_kubernetes_arguments(params, _hostname, ipaddress): if "url-prefix" in params: args += ["--url-prefix", params["url-prefix"]] + if "path-prefix" in params: + args += ["--path-prefix", params["path-prefix"]] + args += [ipaddress] return args diff --git a/cmk/gui/plugins/wato/datasource_programs.py b/cmk/gui/plugins/wato/datasource_programs.py index b2dd7b9..c67ee48 100644 --- a/cmk/gui/plugins/wato/datasource_programs.py +++ b/cmk/gui/plugins/wato/datasource_programs.py @@ -113,8 +113,26 @@ register_rule( title=_("Token"), allow_empty=False, )), - ("port", Integer(title=_(u"Port"), default_value=443)), - ("url-prefix", HTTPUrl(title=_("Custom URL prefix"), allow_empty=False)), + ("port", + Integer( + title=_(u"Port"), + help=_("If no port is given a default value of 443 will be used."), + default_value=443)), + ("url-prefix", + HTTPUrl( + title=_("Custom URL prefix"), + help=_("Defines the scheme (either HTTP or HTTPS) and host part " + "of Kubernetes API calls like e.g. \"https://example.com\". " + "If no prefix is specified HTTPS together with the IP of " + "the host will be used."), + allow_empty=False)), + ("path-prefix", + TextAscii( + title=_("Custom path prefix"), + help=_("Specifies a URL path prefix which is prepended to the path in calls " + "to the Kubernetes API. This is e.g. useful if Rancher is used to " + "manage Kubernetes clusters. If no prefix is given \"/\" will be used."), + allow_empty=False)), ("no-cert-check", Alternative( title=_("Disable certificate verification"), @@ -124,7 +142,7 @@ register_rule( ], default_value=False)), ], - optional_keys=["port", "url-prefix", "no-cert-check"], + optional_keys=["port", "url-prefix", "path-prefix", "no-cert-check"], ), match="first", title=_(u"Kubernetes"), diff --git a/cmk/special_agents/agent_kubernetes.py b/cmk/special_agents/agent_kubernetes.py index 03951d3..e689e92 100644 --- a/cmk/special_agents/agent_kubernetes.py +++ b/cmk/special_agents/agent_kubernetes.py @@ -54,6 +54,14 @@ import cmk.utils.profile import cmk.utils.password_store +class PathPrefixAction(argparse.Action): + def __call__(self, parser, namespace, values, option_string=None): + if not values: + return '' + path_prefix = '/' + values.strip('/') + setattr(namespace, self.dest, path_prefix) + + def parse(args): # type: (List[str]) -> argparse.Namespace p = argparse.ArgumentParser(description=__doc__) @@ -68,6 +76,11 @@ def parse(args): p.add_argument('--port', type=int, default=443, help='Port to connect to') p.add_argument('--token', required=True, help='Token for that user') p.add_argument('--url-prefix', help='Custom URL prefix for Kubernetes API calls') + p.add_argument( + '--path-prefix', + default='', + action=PathPrefixAction, + help='Optional URL path prefix to prepend to Kubernetes API calls') p.add_argument('--no-cert-check', action='store_true', help='Disable certificate verification') p.add_argument( '--profile', @@ -736,9 +749,10 @@ def get_api_client(arguments): config = client.Configuration() if arguments.url_prefix: - config.host = '%s:%s' % (arguments.url_prefix, arguments.port) + config.host = '%s:%s%s' % (arguments.url_prefix, arguments.port, arguments.path_prefix) else: - config.host = 'https://%s:%s' % (arguments.host, arguments.port) + config.host = 'https://%s:%s%s' % (arguments.host, arguments.port, arguments.path_prefix) + config.api_key_prefix['authorization'] = 'Bearer' config.api_key['authorization'] = arguments.token

5 years, 8 months

← Newer
1
...
20
21
22
23
24
25
26
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2019