Checkmk git commits November 2018

checkmk-commits@lists.checkmk.com

15 participants
465 discussions

6653 Threshold Levels for steal cpu time in Linux/Unix

by Óscar Nájera

Module: check_mk Branch: master Commit: 5d6f5ccc344469f003db866ca9b3f947b3bfb432 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d6f5ccc344469… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Mon Nov 26 15:34:02 2018 +0100 6653 Threshold Levels for steal cpu time in Linux/Unix Steal CPU time is the percentage of time a virtual CPU waits for a real CPU while the hypervisor is servicing another virtual processor. Its presense can be now monitored by setting up threshold limits as a fraction of the total CPU utilization time. CMK-1282 Change-Id: Ic075684811867bd040f75f24c008d984c71beb20 --- .werks/6653 | 13 +++++++++++++ checks/cpu_util.include | 3 ++- cmk/gui/plugins/wato/check_parameters.py | 9 +++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/.werks/6653 b/.werks/6653 new file mode 100644 index 0000000..25a7cc3 --- /dev/null +++ b/.werks/6653 @@ -0,0 +1,13 @@ +Title: Threshold Levels for steal cpu time in Linux/Unix +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1543244373 +Class: feature + +Steal CPU time is the percentage of time a virtual CPU waits for a real CPU +while the hypervisor is servicing another virtual processor. Its presense +can be now monitored by setting up threshold limits as a fraction of the +total CPU utilization time. diff --git a/checks/cpu_util.include b/checks/cpu_util.include index 1e6cd10..f9deecd 100644 --- a/checks/cpu_util.include +++ b/checks/cpu_util.include @@ -159,7 +159,8 @@ def check_cpu_util_unix(values, params, cores=None): # where these counters are not being used steal = diff_values[7] steal_perc = 100.0 * float(steal) / float(sum_jiffies) - yield 0, "steal: %.1f%%" % steal_perc, [("steal", steal_perc)] + yield check_levels( + steal_perc, "steal", params.get('steal'), human_readable_func=get_percent_human_readable) guest = diff_values[8] + diff_values[9] guest_perc = 100.0 * float(guest) / float(sum_jiffies) diff --git a/cmk/gui/plugins/wato/check_parameters.py b/cmk/gui/plugins/wato/check_parameters.py index 0044b7b..12a07ed 100644 --- a/cmk/gui/plugins/wato/check_parameters.py +++ b/cmk/gui/plugins/wato/check_parameters.py @@ -9444,6 +9444,15 @@ register_check_parameters( "for data coming from or going to disk. If you have a significant disk wait " "the the bottleneck of your server is IO. Please note that depending on the " "applications being run this might or might not be totally normal."))), + ("steal", + Tuple( + title=_("Levels on steal CPU utilization"), + elements=[ + Percentage(title=_("Warning at a steal time of"), default_value=30.0), + Percentage(title=_("Critical at a steal time of"), default_value=50.0) + ], + help=_("Here you can set levels on the steal CPU utilization."), + )), ] + cpu_util_common_elements), forth=transform_cpu_iowait, ),

5 years, 10 months

6652 Predictive Levels for CPU utilization in Linux/Unix

by Óscar Nájera

Module: check_mk Branch: master Commit: da9ca35d2a2d6b89ef05ac88928be399ff393431 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da9ca35d2a2d6b… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Mon Nov 19 15:31:10 2018 +0100 6652 Predictive Levels for CPU utilization in Linux/Unix Linux CPU utilization can now be monitored using predictive levels for the thresholds to warning and critical states. This confiruration is directly accessible in WATO. CKM-1284 Change-Id: Ie6d4cfb55541e3a9ea7794d7e867806d8b080b4f --- .werks/6652 | 12 +++ checks/kernel | 1 - cmk/gui/plugins/wato/check_parameters.py | 112 ++++++++++----------- .../cmk/gui/plugins/wato/test_check_parameters.py | 24 ++++- 4 files changed, 90 insertions(+), 59 deletions(-) diff --git a/.werks/6652 b/.werks/6652 new file mode 100644 index 0000000..8933212 --- /dev/null +++ b/.werks/6652 @@ -0,0 +1,12 @@ +Title: Predictive Levels for CPU utilization in Linux/Unix +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1543243736 +Class: feature + +Linux CPU utilization can now be monitored using predictive levels for the +thresholds to warning and critical states. This confiruration is directly +accessible in WATO. diff --git a/checks/kernel b/checks/kernel index 1edc2c0..06ffad7 100644 --- a/checks/kernel +++ b/checks/kernel @@ -85,7 +85,6 @@ check_info["kernel"] = { 'group': 'vm_counter', } -#. # .--kernel.util--CPU Utilization----------------------------------------. # | _ _ _ _ _ _ _ _ | # | | | | | |_(_) (_)______ _| |_(_) ___ _ __ | diff --git a/cmk/gui/plugins/wato/check_parameters.py b/cmk/gui/plugins/wato/check_parameters.py index c416dce..0044b7b 100644 --- a/cmk/gui/plugins/wato/check_parameters.py +++ b/cmk/gui/plugins/wato/check_parameters.py @@ -9358,18 +9358,16 @@ cpu_util_common_elements = [ "exceeding a utilization threshold over an extended period of time." "This is currently only supported on linux and windows agents " "as well as devices monitored through the host-resource mib"))), - ( - "core_util_graph", - Checkbox( - title=_("Graphs for individual cores"), - label=_("Enable performance graph for utilization of individual cores"), - help=_("This adds another graph to the performance CPU utilization " - "details page, showing utilization of individual cores. " - "Please note that this graph may be impractical on " - "device with very many cores. " - "This is currently only supported on linux and windows agents " - "as well as devices monitored through the host-resource mib")), - ), + ("core_util_graph", + Checkbox( + title=_("Graphs for individual cores"), + label=_("Enable performance graph for utilization of individual cores"), + help=_("This adds another graph to the performance CPU utilization " + "details page, showing utilization of individual cores. " + "Please note that this graph may be impractical on " + "device with very many cores. " + "This is currently only supported on linux and windows agents " + "as well as devices monitored through the host-resource mib"))), ] register_check_parameters( @@ -9392,62 +9390,62 @@ register_check_parameters( default_value=15, label=_("Compute average over last "), )), - ( - "levels", - Levels( - title=_("Levels on total CPU utilization"), - unit="%", - default_levels=(85, 90), - default_difference=(5, 8), - default_value=None, - ), - ), + ("levels", + Levels( + title=_("Levels on total CPU utilization"), + unit="%", + default_levels=(85, 90), + default_difference=(5, 8), + default_value=None, + )), ] + cpu_util_common_elements, ), None, match_type="dict", ) + +def transform_cpu_iowait(params): + if isinstance(params, tuple): + return {"iowait": params} + + return params + + register_check_parameters( subgroup_os, "cpu_iowait", _("CPU utilization on Linux/UNIX"), Transform( - Dictionary( - elements=[ - ( - "iowait", - Tuple( - title=_("Levels on disk wait (IO wait)"), - elements=[ - Percentage(title=_("Warning at a disk wait of"), default_value=30.0), - Percentage(title=_("Critical at a disk wait of"), default_value=50.0) - ], - help= - _("The CPU utilization sums up the percentages of CPU time that is used " - "for user processes, kernel routines (system), disk wait (sometimes also " - "called IO wait) or nothing (idle). " - "Currently you can only set warning/critical levels to the disk wait. This " - "is the total percentage of time all CPUs have nothing else to do then waiting " - "for data coming from or going to disk. If you have a significant disk wait " - "the the bottleneck of your server is IO. Please note that depending on the " - "applications being run this might or might not be totally normal.")), - ), - ("util", - Tuple( - title=_("Levels on total CPU utilization"), - elements=[ - Percentage(title=_("Warning at a utilization of"), default_value=90.0), - Percentage(title=_("Critical at a utilization of"), default_value=95.0) - ], - help= - _("Here you can set levels on the total CPU utilization, i.e. the sum of " - "system, user and iowait. The levels are always applied " - "on the average utiliazation since the last check - which is usually one minute." - ), - )), - ] + cpu_util_common_elements,), - forth=lambda old: not isinstance(old, dict) and {"iowait": old} or old, + Dictionary(elements=[ + ("util", + Levels( + title=_("Levels on total CPU utilization"), + unit="%", + default_levels=(90, 95), + default_difference=(5, 8), + default_value=None, + help= + _("The CPU utilization sums up the percentages of CPU time that is used " + "for user processes, kernel routines (system), disk wait (sometimes also " + "called IO wait) or nothing (idle). The levels are always applied " + "on the average utiliazation since the last check - which is usually one minute." + ), + )), + ("iowait", + Tuple( + title=_("Levels on disk wait (IO wait)"), + elements=[ + Percentage(title=_("Warning at a disk wait of"), default_value=30.0), + Percentage(title=_("Critical at a disk wait of"), default_value=50.0) + ], + help= + _("The disk wait is the total percentage of time all CPUs have nothing else to do but waiting " + "for data coming from or going to disk. If you have a significant disk wait " + "the the bottleneck of your server is IO. Please note that depending on the " + "applications being run this might or might not be totally normal."))), + ] + cpu_util_common_elements), + forth=transform_cpu_iowait, ), None, "dict", diff --git a/tests/unit/cmk/gui/plugins/wato/test_check_parameters.py b/tests/unit/cmk/gui/plugins/wato/test_check_parameters.py index afe72e3..e4f666c 100644 --- a/tests/unit/cmk/gui/plugins/wato/test_check_parameters.py +++ b/tests/unit/cmk/gui/plugins/wato/test_check_parameters.py @@ -1,6 +1,7 @@ import pytest from cmk.gui.exceptions import MKUserError -from cmk.gui.plugins.wato.check_parameters import forbid_re_delimiters_inside_groups +from cmk.gui.plugins.wato.check_parameters import (forbid_re_delimiters_inside_groups, + transform_cpu_iowait) @pytest.mark.parametrize('pattern', ["(test)$", 'foo\\b', '^bar', '\\bfoo\\b', '(a)\\b']) @@ -12,3 +13,24 @@ def test_validate_ps_allowed_regex(pattern): def test_validate_ps_forbidden_regex(pattern): with pytest.raises(MKUserError): forbid_re_delimiters_inside_groups(pattern, '') + + +(a)pytest.mark.parametrize('params, result', [ + ( + (10, 20), + { + 'iowait': (10, 20) + }, + ), + ({}, {}), + ( + { + 'util': (50, 60) + }, + { + 'util': (50, 60) + }, + ), +]) +def test_transform_cpu_iowait(params, result): + assert transform_cpu_iowait(params) == result

5 years, 10 months

Check_API refactoring, Refactor checks using cpu_util.include

by Óscar Nájera

Module: check_mk Branch: master Commit: 18cb27b36d053b8166bbb168042828223f098968 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18cb27b36d053b… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Fri Nov 23 12:22:17 2018 +0100 Check_API refactoring, Refactor checks using cpu_util.include Check API - Return a complete check output - Use infoname - Edit checks and test for new checkapi levels check Refactoring linux check_cpu_util_unix Adapt cpu_iowait group checks to util params - lparstat_aix - vms_cpu - ucd_cpu_util - statgrab CMK-1284 Change-Id: Iaf04fa6fd1bbce07efa5cb455f75156d10702ba5 --- checks/cpu_load.include | 8 +- checks/cpu_util.include | 241 ++++++++------------- checks/diskstat.include | 51 +++-- checks/f5_bigip_conns | 31 +-- checks/f5_bigip_snat | 13 +- checks/f5_bigip_vserver | 13 +- checks/firewall_if.include | 15 +- checks/ibm_svc_systemstats | 6 +- checks/kernel | 25 +-- checks/lparstat_aix | 28 +-- checks/netapp_api_fcp | 16 +- checks/safenet_hsm | 7 +- checks/safenet_ntls | 12 +- checks/statgrab_cpu | 7 +- checks/tinkerforge | 5 +- checks/transforms.include | 34 +++ checks/ucd_cpu_util | 5 +- checks/vms_cpu | 8 +- cmk_base/check_api.py | 119 +++++----- cmk_base/prediction.py | 6 +- .../generictests/datasets/azure_databases.py | 2 +- .../datasets/hp_msa_volume_regression.py | 8 +- .../datasets/lparstat_aix_regression.py | 32 +++ .../generictests/datasets/vms_cpu_regression.py | 18 ++ .../wmi_cpuload_hp_proliant_win_5_regression.py | 6 +- tests/unit/checks/test_hp_msa_volume.py | 7 +- tests/unit/checks/test_kernel_check.py | 53 +++-- tests/unit/checks/test_statgrab_cpu_check.py | 69 +++--- tests/unit/cmk_base/test_check_api.py | 40 +++- tests/unit/cmk_base/test_prediction.py | 8 +- 30 files changed, 466 insertions(+), 427 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=18cb27b36d…

5 years, 10 months

Dynamic configuration: Add distributed WATO support

by Lars Michelsen

Module: check_mk Branch: master Commit: 7bd0362b5d01852ecdf0cb40aa4f0f08503a8046 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7bd0362b5d0185… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 15 22:43:05 2018 +0100 Dynamic configuration: Add distributed WATO support In distributed WATO setups there is only one site where changes to the Check_MK configuration can be made. This is the central site. However, there are a lot of situations where the source for the dynamic configuration, e.g. a Kubernetes instance, is only reachable from a remote Check_MK site. This means that we need to split up the DCD connection logic into two phases. In phase 1 the connection on the remote site talks to the source system, e.g. the Kubernetes instance, and creates some kind of "configuration snapshot". This information may be a collection of Pods, containers and so on which will be used to update the Check_MK configuration in the next step. The DCD on the central site is communicating with the DCD on the remote site to get the latest "configuration snapshot". With this knowledge the phase 2 is launched. In this phase the connection is comparing the phase 1 information with data fetched from the Web API of the central WATO site and deciding to create, update or delete objects in the Check_MK configuration. These updates are made immediately to the configuration and activated once it's allowed. * The DCD now knows whether or not it's running in a distributed WATO remote site * Split connection execute() into two phases * Moved phase execution logic to the Connector() base class * Improved test coverage CMK-1140 Change-Id: I51e7f0dc1e9df7e9c8c25a0598c3cf94292666ed --- cmk/gui/plugins/wato/__init__.py | 1 + cmk/gui/plugins/wato/utils/__init__.py | 1 + cmk/gui/watolib.py | 4 ++-- tests/unit/cmk/gui/test_watolib.py | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmk/gui/plugins/wato/__init__.py b/cmk/gui/plugins/wato/__init__.py index fae2a3e..c7f150a 100644 --- a/cmk/gui/plugins/wato/__init__.py +++ b/cmk/gui/plugins/wato/__init__.py @@ -106,6 +106,7 @@ from cmk.gui.plugins.wato.utils import ( WatoBackgroundJob, wato_confirm, wato_fileheader, + register_hook, WatoMode, SimpleModeType, SimpleListMode, diff --git a/cmk/gui/plugins/wato/utils/__init__.py b/cmk/gui/plugins/wato/utils/__init__.py index 8a5c47b..0352822 100644 --- a/cmk/gui/plugins/wato/utils/__init__.py +++ b/cmk/gui/plugins/wato/utils/__init__.py @@ -99,6 +99,7 @@ from cmk.gui.watolib import ( add_change, log_audit, site_neutral_path, + register_hook, register_rulegroup, register_rule, declare_host_attribute, diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index 021f87f..d75909c 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -99,7 +99,7 @@ import cmk.gui.gui_background_job as gui_background_job import cmk.gui.weblib as weblib from cmk.gui.i18n import _u, _ from cmk.gui.globals import html -from cmk.gui.htmllib import HTML +from cmk.gui.htmllib import HTML, Encoder from cmk.gui.log import logger from cmk.gui.exceptions import MKGeneralException, MKAuthException, MKUserError, RequestTimeout from cmk.gui.valuespec import ( @@ -4661,7 +4661,7 @@ def do_remote_automation(site, command, vars_): raise MKAutomationException(_("You are not logged into the remote site.")) url = base_url + "automation.py?" + \ - html.urlencode_vars([ + Encoder().urlencode_vars([ ("command", command), ("secret", secret), ("debug", config.debug and '1' or '') diff --git a/tests/unit/cmk/gui/test_watolib.py b/tests/unit/cmk/gui/test_watolib.py index cb8a97f..3579145 100644 --- a/tests/unit/cmk/gui/test_watolib.py +++ b/tests/unit/cmk/gui/test_watolib.py @@ -61,6 +61,7 @@ def test_registered_automation_commands(): assert registered == sorted([ 'activate-changes', 'check-analyze-config', + 'execute-dcd-command', 'network-scan', 'push-snapshot', ])

5 years, 10 months

Dynamic configuration: Add command server and client

by Lars Michelsen

Module: check_mk Branch: master Commit: 5f747a2774c73e966d89724510d5eb2b0cdc1689 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f747a2774c73e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 14 17:42:49 2018 +0100 Dynamic configuration: Add command server and client * The CommandManager is listening locally on tmp/run/dcd.sock for external queries / commands to the DCD. * The API is only available to the local site in the first place. * This API will be contacted from the local WATO instance to serve status information and, in distributed setups, for replication from remote sites to the central WATO site. * For the moment we use the standard xmlrpc library for the API. This will be replaced with our new standard HTTP API stuff once that is ready. * Enabled mypy to scan the dcd files. CMK-1140 Change-Id: If6bb79747a2ca1c88f7d9ee7e1a1288a2015595a --- tests/static/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/static/Makefile b/tests/static/Makefile index 90e4577..c74e556 100644 --- a/tests/static/Makefile +++ b/tests/static/Makefile @@ -1,4 +1,6 @@ FILES_TO_CHECK := $(realpath $(addprefix ../../cmk/ec/,defaults.py export.py main.py settings.py)) \ + $(realpath $(addprefix ../../cmk/cee/dcd/,main.py Config.py Manager.py CommandManager.py)) \ + $(realpath $(addprefix ../../cmk/cee/dcd/connectors,piggyback.py utils.py)) \ $(realpath $(addprefix ../../cmk/,daemon.py i18n.py paths.py regex.py render.py structured_data.py)) \ $(realpath $(addprefix ../../cmk/gui/,dashboard.py exceptions.py globals.py htmllib.py http_status.py \ i18n.py sidebar.py sites.py table.py visuals.py)) \

5 years, 10 months

Improved ignorance.

by Sven Panne

Module: check_mk Branch: master Commit: fc6cc98181d19359d31404d141faec435f9c5517 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc6cc98181d193… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 27 09:03:06 2018 +0100 Improved ignorance. Change-Id: Ice60e44149ff41a44dacab90e912129a4cd8d4c5 --- omd/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/omd/.gitignore b/omd/.gitignore index 9aacbb5..89f98db 100644 --- a/omd/.gitignore +++ b/omd/.gitignore @@ -18,6 +18,7 @@ omd-*-*.rpm omd-*.deb omd-*.tar.gz omd.spec +openhardwaremonitor-[0-9].[0-9].[0-9]/ patch-stamp python-modules-1.6.0i1.cme/ re2-20[12][0-9]-[01][0-9]-[0-3][0-9]/

5 years, 10 months

remove generic diskstat tests

by Florian Kromer

Module: check_mk Branch: master Commit: 8fd511cac00c7d3fcfb4691a4d12c1af6ee82290 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fd511cac00c7d… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Mon Nov 26 15:25:25 2018 +0100 remove generic diskstat tests expected values are time dependent and tests do not lead to reproducable results Change-Id: I9984247cb8c41562a0f5b8bd9ab979fcf29bd67d --- checks/diskstat | 3 + .../generictests/datasets/diskstat_extended.py | 115 --------------- .../checks/generictests/datasets/diskstat_long.py | 157 --------------------- .../generictests/datasets/diskstat_regression.py | 145 ------------------- 4 files changed, 3 insertions(+), 417 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8fd511cac0…

5 years, 10 months

Fixed remote site activation after 45d73f79

by Lars Michelsen

Module: check_mk Branch: master Commit: 58606ca395eb2162aa8e2b005e18f32c7b2ab1df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58606ca395eb21… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 26 15:28:41 2018 +0100 Fixed remote site activation after 45d73f79 Change-Id: I3ee6f34930d5899526ec82f9df3ebba779cbd7b0 --- cmk/gui/wato/pages/automation.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmk/gui/wato/pages/automation.py b/cmk/gui/wato/pages/automation.py index 908715f..d458d03 100644 --- a/cmk/gui/wato/pages/automation.py +++ b/cmk/gui/wato/pages/automation.py @@ -163,7 +163,8 @@ class ModeAutomation(WatoWebApiMode): def _execute_automation_command(self, automation_command): try: # Don't use write_text() here (not needed, because no HTML document is rendered) - html.write(repr(automation_command().execute())) + automation = automation_command() + html.write(repr(automation.execute(automation.get_request()))) except Exception as e: logger.exception() if config.debug:

5 years, 10 months

Fix configuration input for f5_bigip_conns check

by Óscar Nájera

Module: check_mk Branch: master Commit: e1ad79bdae0d4e52d6ab73ae6f6eb259ecca3e50 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1ad79bdae0d4e… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Mon Nov 26 12:05:02 2018 +0100 Fix configuration input for f5_bigip_conns check In the F5 Loadbalance Connections there was an inconsistent use of configuration parameters being predictive levels but requiring for connection rates to use simple fixed levels tuples. This fix avoids the misconfiguration and warns the user at runtime. Change-Id: Iac99b51ab0e0bbc0d4f9ef27446e9ee9af2f823a --- checks/f5_bigip_conns | 33 ++++++++++++++----- cmk/gui/plugins/wato/check_parameters.py | 7 ++-- tests/unit/checks/test_f5_bigip_conns.py | 55 ++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+), 10 deletions(-) diff --git a/checks/f5_bigip_conns b/checks/f5_bigip_conns index f868d74..28e610d 100644 --- a/checks/f5_bigip_conns +++ b/checks/f5_bigip_conns @@ -36,6 +36,23 @@ def inventory_f5_bigip_conns(info): return [(None, {})] +def get_conn_rate_params(params): + # upper_bound is dict, tuple or None + upper_bound = params.get("connections_rate", (None, None)) + # lower_bound is tuple or None + lower_bound = params.get("connections_rate_lower", (None, None)) + if isinstance(upper_bound, tuple): + return upper_bound + lower_bound + + # Lower bound was not configured, all good + if isinstance(upper_bound, dict) and lower_bound == (None, None): + return upper_bound + raise ValueError("Can't configure minimum connections per second when the maximum " + "connections per second is setup in predictive levels. Please use the given " + "lower bound specified in the maximum connections, or set maximum " + "connections to use fixed levels.") + + def check_f5_bigip_conns(item, params, info): # Connection rate now = time.time() @@ -68,8 +85,11 @@ def check_f5_bigip_conns(item, params, info): conns_dict.setdefault("total_ssl", 0) conns_dict["total_ssl"] += int(line[1]) - conn_rate_params = params.get("connections_rate") or (None, None) - conn_rate_params += params.get("connections_rate_lower") or (None, None) + try: + conn_rate_params = get_conn_rate_params(params) + except ValueError as err: + yield 3, err.message + return # Current connections for val, dsname, params_values, perfkey, title in [ @@ -90,13 +110,10 @@ def check_f5_bigip_conns(item, params, info): if val is None: infotext += " not configured" else: - # The check_parameters are a bit tricky: If thresholds are disabled, - # the value is None; otherwise it's a Tuple. - # TODO: Refactor the check parameter f5_connections and this check plugin! - if params_values is None: - warn, crit = (None, None) - else: + if isinstance(params_values, tuple): warn, crit = params_values[:2] + else: + warn, crit = (None, None) perfdata.append((perfkey, val, warn, crit)) state, extrainfo, extraperf = check_levels(val, dsname, params_values) diff --git a/cmk/gui/plugins/wato/check_parameters.py b/cmk/gui/plugins/wato/check_parameters.py index ff04da8..c416dce 100644 --- a/cmk/gui/plugins/wato/check_parameters.py +++ b/cmk/gui/plugins/wato/check_parameters.py @@ -11111,9 +11111,12 @@ register_check_parameters( default_value=None, default_levels=(500, 1000))), ("connections_rate_lower", - Levels( + Tuple( title=_("Minimum connections per second"), - default_value=None, + elements=[ + Integer(title=_("Warning at")), + Integer(title=_("Critical at")), + ], )), ("http_req_rate", Levels( diff --git a/tests/unit/checks/test_f5_bigip_conns.py b/tests/unit/checks/test_f5_bigip_conns.py new file mode 100644 index 0000000..94e5061 --- /dev/null +++ b/tests/unit/checks/test_f5_bigip_conns.py @@ -0,0 +1,55 @@ +import pytest + +pytestmark = pytest.mark.checks + +from cmk_base.check_api import MKGeneralException +from checktestlib import CheckResult, assertCheckResultsEqual + + +(a)pytest.mark.parametrize("config, result", [ + ({}, (None, None, None, None)), + ({ + "connections_rate": (2, 5), + "connections_rate_lower": (1, 0), + }, (2, 5, 1, 0)), + ({ + "connections_rate_lower": (1, 0), + }, (None, None, 1, 0)), + ({ + "connections_rate": (2, 5), + }, (2, 5, None, None)), + ({ + 'connections_rate': { + 'levels_upper': ('absolute', (0.0, 0.0)), + 'levels_lower': ('stdev', (2.0, 4.0)), + 'period': 'wday', + 'horizon': 90 + }, + }, { + 'levels_upper': ('absolute', (0.0, 0.0)), + 'levels_lower': ('stdev', (2.0, 4.0)), + 'period': 'wday', + 'horizon': 90 + }), +]) +def test_get_conn_rate_params(check_manager, config, result): + check = check_manager.get_check("f5_bigip_conns") + assert check.context["get_conn_rate_params"](config) == result + + +(a)pytest.mark.parametrize("config, exception_msg", [({ + 'connections_rate': { + 'levels_upper': ('absolute', (0.0, 0.0)), + 'levels_lower': ('stdev', (2.0, 4.0)), + 'period': 'wday', + 'horizon': 90 + }, + "connections_rate_lower": (1, 0), +}, ("Can't configure minimum connections per second when the maximum " + "connections per second is setup in predictive levels. Please use the given " + "lower bound specified in the maximum connections, or set maximum " + "connections to use fixed levels."))]) +def test_get_conn_rate_params_exception(check_manager, config, exception_msg): + check = check_manager.get_check("f5_bigip_conns") + with pytest.raises(ValueError, message=exception_msg): + check.context["get_conn_rate_params"](config)

5 years, 10 months

Unbreak google.auth import.

by Sven Panne

Module: check_mk Branch: master Commit: 32ffe59246283df2401b65d540e54bdee2103e80 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32ffe59246283d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Nov 26 14:18:52 2018 +0100 Unbreak google.auth import. Change-Id: Iab1722fa0943e540d4c8b08e221f971e3c614f67 --- omd/packages/Python/sitecustomize.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/omd/packages/Python/sitecustomize.py b/omd/packages/Python/sitecustomize.py index 6a6e6d6..7a50788 100644 --- a/omd/packages/Python/sitecustomize.py +++ b/omd/packages/Python/sitecustomize.py @@ -1,12 +1,16 @@ #!/usr/bin/env python # Make the site python know about the Check_MK specific python module paths -import sys, os +import os +import site +import sys -# Set the Check_MK version specific python module directory. This is -# the location for the extra python modules shipped with Check_MK. +# Set the Check_MK version specific python module directory. This is the +# location for the extra python modules shipped with Check_MK. +# NOTE: Modifying sys.path alone is not enough, site.addsitedir makes sure that +# path configuration files (*.pth) are actually found! version_path = os.path.dirname(os.path.dirname(sys.executable)) -sys.path.insert(0, version_path + "/lib/python") +site.addsitedir(version_path + "/lib/python") # Regular use case: When "omd" is being executed as root, we don't know # anything about the site -> Only set the version specific directory.

5 years, 10 months

← Newer
1
2
3
4
5
6
7
8
9
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2018