Checkmk git commits January 2019

checkmk-commits@lists.checkmk.com

15 participants
490 discussions

by Mathias Kettner

Module: check_mk Branch: master Commit: 3c03182c531f934d8dc92e3d7e8c71db578a01f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c03182c531f93… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 30 10:21:35 2019 +0100 Fix {{...}} -> {...} in aws_* man pages --- checkman/aws_costs_and_usage | 2 +- checkman/aws_costs_and_usage.per_service | 2 +- checkman/aws_ebs | 2 +- checkman/aws_ebs_summary | 2 +- checkman/aws_ebs_summary.health | 2 +- checkman/aws_ec2 | 2 +- checkman/aws_ec2.cpu_credits | 2 +- checkman/aws_ec2.cpu_util | 2 +- checkman/aws_ec2.disk_io | 2 +- checkman/aws_ec2.network_io | 2 +- checkman/aws_ec2_summary | 2 +- checkman/aws_elb_health | 2 +- checkman/aws_elb_summary | 2 +- checkman/aws_exceptions | 2 +- checkman/aws_s3_summary | 2 +- checkman/aws_s3_summary.objects | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/checkman/aws_costs_and_usage b/checkman/aws_costs_and_usage index d65d6b6..d7d21eb 100644 --- a/checkman/aws_costs_and_usage +++ b/checkman/aws_costs_and_usage @@ -7,7 +7,7 @@ description: This check gives an overview over the unblended costs of AWS accounts and shows the costs of the last day. To make this check work you have to configure the related special agent - {{Amazon Web Services (AWS)}}. + {Amazon Web Services (AWS)}. Upper levels are configurable; no default levels are set. inventory: diff --git a/checkman/aws_costs_and_usage.per_service b/checkman/aws_costs_and_usage.per_service index 450125a..935cac9 100644 --- a/checkman/aws_costs_and_usage.per_service +++ b/checkman/aws_costs_and_usage.per_service @@ -7,7 +7,7 @@ description: This check gives an overview over the unblended costs of each service configured in AWS accounts and shows the costs of the last day. To make this check work you have to configure the related special agent - {{Amazon Web Services (AWS)}}. + {Amazon Web Services (AWS)}. Upper levels are configurable; no default levels are set. inventory: diff --git a/checkman/aws_ebs b/checkman/aws_ebs index 44e8fdf..b12107b 100644 --- a/checkman/aws_ebs +++ b/checkman/aws_ebs @@ -6,7 +6,7 @@ distribution: check_mk description: This check monitors disk IO of AWS EBS. To make this check work you have to configure the related - special agent {{Amazon Web Services (AWS)}}. + special agent {Amazon Web Services (AWS)}. inventory: One service per volume is created. diff --git a/checkman/aws_ebs_summary b/checkman/aws_ebs_summary index 156dd99..11c9897 100644 --- a/checkman/aws_ebs_summary +++ b/checkman/aws_ebs_summary @@ -7,7 +7,7 @@ description: This check monitors all AWS EBS and reports a summary of their states. To make this check work you have to configure the related - special agent {{Amazon Web Services (AWS)}}. + special agent {Amazon Web Services (AWS)}. inventory: One summary service is created. diff --git a/checkman/aws_ebs_summary.health b/checkman/aws_ebs_summary.health index eda447e..9062702 100644 --- a/checkman/aws_ebs_summary.health +++ b/checkman/aws_ebs_summary.health @@ -6,7 +6,7 @@ distribution: check_mk description: This check monitors health of AWS elastic block storages. To make this check work you have to configure the related - special agent {{Amazon Web Services (AWS)}}. + special agent {Amazon Web Services (AWS)}. If the EBS status is OK the check returns OK otherwise CRIT. Details of the single status checks are also reported. diff --git a/checkman/aws_ec2 b/checkman/aws_ec2 index 49c0b1e..910a17d 100644 --- a/checkman/aws_ec2 +++ b/checkman/aws_ec2 @@ -6,7 +6,7 @@ distribution: check_mk description: This check monitors the instance and system status. To make this check work you have to configure the related - special agent {{Amazon Web Services (AWS)}}. + special agent {Amazon Web Services (AWS)}. If both tests have passed the check is OK otherwise CRIT. inventory: diff --git a/checkman/aws_ec2.cpu_credits b/checkman/aws_ec2.cpu_credits index 4d218bf..312fbbb 100644 --- a/checkman/aws_ec2.cpu_credits +++ b/checkman/aws_ec2.cpu_credits @@ -8,7 +8,7 @@ description: utilization and the number of earned CPU credits that an instance has accrued since it was launched or started. To make this check work you have to configure the related - special agent {{Amazon Web Services (AWS)}}. + special agent {Amazon Web Services (AWS)}. inventory: One service will be created. diff --git a/checkman/aws_ec2.cpu_util b/checkman/aws_ec2.cpu_util index a5ae8b5..05aff3a 100644 --- a/checkman/aws_ec2.cpu_util +++ b/checkman/aws_ec2.cpu_util @@ -7,7 +7,7 @@ description: This check monitors the percentage of allocated EC2 compute units that are currently in use on the AWS EC2 instance. To make this check work you have to configure the related - special agent {{Amazon Web Services (AWS)}}. + special agent {Amazon Web Services (AWS)}. inventory: One service will be created. diff --git a/checkman/aws_ec2.disk_io b/checkman/aws_ec2.disk_io index 458e1dc..7332cdd 100644 --- a/checkman/aws_ec2.disk_io +++ b/checkman/aws_ec2.disk_io @@ -7,7 +7,7 @@ description: This check monitors completed read and write operations and bytes to all instance store volumes available to the instance. To make this check work you have to configure the related - special agent {{Amazon Web Services (AWS)}}. + special agent {Amazon Web Services (AWS)}. inventory: One service will be created. diff --git a/checkman/aws_ec2.network_io b/checkman/aws_ec2.network_io index 1904aed..6f063aa 100644 --- a/checkman/aws_ec2.network_io +++ b/checkman/aws_ec2.network_io @@ -7,7 +7,7 @@ description: This check monitors the number of bytes/packets received and transmitted on all network interfaces by the instance. To make this check work you have to configure the related - special agent {{Amazon Web Services (AWS)}}. + special agent {Amazon Web Services (AWS)}. inventory: One service will be created. diff --git a/checkman/aws_ec2_summary b/checkman/aws_ec2_summary index 1371aa3..5d4511b 100644 --- a/checkman/aws_ec2_summary +++ b/checkman/aws_ec2_summary @@ -7,7 +7,7 @@ description: This check monitors all AWS EC2 instances and reports a summary of their states. To make this check work you have to configure the related - special agent {{Amazon Web Services (AWS)}}. + special agent {Amazon Web Services (AWS)}. If at least one instance is not running the state is WARN otherwise it is OK. diff --git a/checkman/aws_elb_health b/checkman/aws_elb_health index e8dc160..715ca82 100644 --- a/checkman/aws_elb_health +++ b/checkman/aws_elb_health @@ -6,7 +6,7 @@ distribution: check_mk description: This check monitors all AWS ELB and reports a summary of their states. To make this check work you have to configure the related special agent - {{Amazon Web Services (AWS)}}. + {Amazon Web Services (AWS)}. If the elastic load balancer is "in service" the check stats is OK, if it is "out of service" the check state is WARN, otherwise UNKNOWN. diff --git a/checkman/aws_elb_summary b/checkman/aws_elb_summary index d5a2596..2558231 100644 --- a/checkman/aws_elb_summary +++ b/checkman/aws_elb_summary @@ -6,7 +6,7 @@ distribution: check_mk description: This check monitors all AWS ELB and reports a summary of their states. To make this check work you have to configure the related special agent - {{Amazon Web Services (AWS)}}. + {Amazon Web Services (AWS)}. inventory: One summary service is created. diff --git a/checkman/aws_exceptions b/checkman/aws_exceptions index 8d559d2..8d9bdb9 100644 --- a/checkman/aws_exceptions +++ b/checkman/aws_exceptions @@ -5,7 +5,7 @@ license: GPL distribution: check_mk description: This check collects all exceptions during the execution of the - special agent {{agent_aws}} for monitoring Amazon Web Service. + special agent {agent_aws} for monitoring Amazon Web Service. If no exceptions occur the check is OK, otherwise CRIT. inventory: diff --git a/checkman/aws_s3_summary b/checkman/aws_s3_summary index 531a082..b7aa661 100644 --- a/checkman/aws_s3_summary +++ b/checkman/aws_s3_summary @@ -7,7 +7,7 @@ description: This check monitors all AWS S3 buckets and reports a summary of their states. To make this check work you have to configure the related - special agent {{Amazon Web Services (AWS)}}. + special agent {Amazon Web Services (AWS)}. inventory: One summary service is created. diff --git a/checkman/aws_s3_summary.objects b/checkman/aws_s3_summary.objects index 8d1d781..d470566 100644 --- a/checkman/aws_s3_summary.objects +++ b/checkman/aws_s3_summary.objects @@ -8,7 +8,7 @@ description: the number of objects, the summarized size and the largest object of a bucket. To make this check work you have to configure the related - special agent {{Amazon Web Services (AWS)}}. + special agent {Amazon Web Services (AWS)}. inventory: One service per bucket will be created.

5 years, 8 months

Removed even more Icinga traces.

by Sven Panne

Module: check_mk Branch: master Commit: 535bd44e3d66f07e92d3454a64689ff3cec51801 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=535bd44e3d66f0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jan 30 10:01:35 2019 +0100 Removed even more Icinga traces. Change-Id: Ied38bf5ecc501050c03e2d2b0e44b1480c2c1ec4 --- cmk/utils/paths.py | 61 ++++++------------------------- cmk_base/core_nagios.py | 2 +- cmk_base/packaging.py | 7 +--- omd/packages/check_multi/check_multi.make | 2 +- omd/packages/omd/hooks/CORE | 2 + 5 files changed, 16 insertions(+), 58 deletions(-) diff --git a/cmk/utils/paths.py b/cmk/utils/paths.py index c65e878..98746c1 100644 --- a/cmk/utils/paths.py +++ b/cmk/utils/paths.py @@ -66,6 +66,9 @@ htpasswd_file = None livestatus_unix_socket = None pnp_rraconf_dir = None livebackendsdir = None +inventory_output_dir = '' +inventory_archive_dir = '' +status_data_dir = '' share_dir = '' checks_dir = None @@ -97,14 +100,11 @@ local_locale_dir = '' local_bin_dir = '' local_lib_dir = '' local_mib_dir = '' -inventory_output_dir = '' -inventory_archive_dir = '' -status_data_dir = '' def _set_paths(): global omd_root - omd_root = _omd_root() + omd_root = os.environ.get("OMD_ROOT", "") globals().update({ "default_config_dir": os.path.join(omd_root, "etc/check_mk"), @@ -126,13 +126,14 @@ def _set_paths(): "include_cache_dir": os.path.join(omd_root, "tmp/check_mk/check_includes"), "tmp_dir": os.path.join(omd_root, "tmp/check_mk"), "logwatch_dir": os.path.join(omd_root, "var/check_mk/logwatch"), - "nagios_startscript": os.path.join(omd_root, "etc/init.d/core"), - - # Switched via symlinks on icinga/nagios change - "nagios_conf_dir": os.path.join(omd_root, "etc/nagios/conf.d"), "nagios_objects_file": os.path.join(omd_root, "etc/nagios/conf.d/check_mk_objects.cfg"), + "nagios_command_pipe_path": os.path.join(omd_root, "tmp/run/nagios.cmd"), "check_result_path": os.path.join(omd_root, "tmp/nagios/checkresults"), "nagios_status_file": os.path.join(omd_root, "tmp/nagios/status.dat"), + "nagios_conf_dir": os.path.join(omd_root, "etc/nagios/conf.d"), + "nagios_config_file": os.path.join(omd_root, "tmp/nagios/nagios.cfg"), + "nagios_startscript": os.path.join(omd_root, "etc/init.d/core"), + "nagios_binary": os.path.join(omd_root, "bin/nagios"), "apache_config_dir": os.path.join(omd_root, "etc/apache"), "htpasswd_file": os.path.join(omd_root, "etc/htpasswd"), "livestatus_unix_socket": os.path.join(omd_root, "tmp/run/live"), @@ -143,48 +144,6 @@ def _set_paths(): "status_data_dir": os.path.join(omd_root, "tmp/check_mk/status_data"), }) - _set_core_specific_paths() - _set_overridable_paths() - _set_overridable_paths(local=True) - - -def _omd_root(): - return os.environ.get("OMD_ROOT", "") - - -def _set_core_specific_paths(): - core = _get_core_name() - - if core == "icinga": - globals().update({ - "nagios_binary": os.path.join(omd_root, "bin/icinga"), - "nagios_config_file": os.path.join(omd_root, "tmp/icinga/icinga.cfg"), - "nagios_command_pipe_path": os.path.join(omd_root, "tmp/run/icinga.cmd"), - }) - else: - globals().update({ - "nagios_binary": os.path.join(omd_root, "bin/nagios"), - "nagios_config_file": os.path.join(omd_root, "tmp/nagios/nagios.cfg"), - "nagios_command_pipe_path": os.path.join(omd_root, "tmp/run/nagios.cmd"), - }) - - -# TODO: Find a better way to determine the currently configured core. -# For example generalize the etc/check_mk/conf.d/microcore.mk which is written by the CORE -# hook -> Change the name to core.mk and write it for all configured cores. -def _get_core_name(): - try: - for l in open(os.path.join(omd_root, "etc/omd/site.conf")): - if l.startswith("CONFIG_CORE='"): - return l.split("'")[1] - except IOError as e: - # At least in test environment the file is not available. We only added this try/except for - # this case. This should better be solved in a cleaner way. - if e.errno == 2: - pass - else: - raise - def _set_overridable_paths(local=False): rel_base = "local" if local else "" @@ -212,3 +171,5 @@ def _set_overridable_paths(local=False): _set_paths() +_set_overridable_paths() +_set_overridable_paths(local=True) diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py index 20127d4..409352c 100644 --- a/cmk_base/core_nagios.py +++ b/cmk_base/core_nagios.py @@ -123,7 +123,7 @@ def create_config(outfile, hostnames): "service_notification_periods is not longer supported. Please use extra_service_conf['notification_period'] instead." ) - # Map service_period to _SERVICE_PERIOD. This field das not exist in Nagios/Icinga. + # Map service_period to _SERVICE_PERIOD. This field das not exist in Nagios. # The CMC has this field natively. if "service_period" in config.extra_host_conf: config.extra_host_conf["_SERVICE_PERIOD"] = config.extra_host_conf["service_period"] diff --git a/cmk_base/packaging.py b/cmk_base/packaging.py index 6dd0709..db6e67c 100644 --- a/cmk_base/packaging.py +++ b/cmk_base/packaging.py @@ -132,12 +132,7 @@ config_parts = [ ] package_ignored_files = { - "lib": [ - "nagios/plugins/README.txt", - # it's a symlink to the nagios directory. All files would be doubled. - # So better ignore this directory to prevent confusions. - "icinga/plugins", - ], + "lib": ["nagios/plugins/README.txt"], } diff --git a/omd/packages/check_multi/check_multi.make b/omd/packages/check_multi/check_multi.make index 856cd9b..d03d709 100644 --- a/omd/packages/check_multi/check_multi.make +++ b/omd/packages/check_multi/check_multi.make @@ -19,7 +19,7 @@ $(CHECK_MULTI)-install: $(CHECK_MULTI_INSTALL) $(CHECK_MULTI)-skel: # TODO -#--with-nagios-name=<nagios|icinga> set nagios name (there might be some clones ;)) (default:nagios) +#--with-nagios-name=<nagios> set nagios name (there might be some clones ;)) (default:nagios) #--with-action_url="$(OMD_SITE)/pnp4nagios/index.php/graph?host=\\\$$HOSTNAME\\\$$&srv=\\\$$SERVICEDESC\\\$$" CHECK_MULTI_CONFIGUREOPTS := \ --libexecdir="$(ROOTDIR)/lib/nagios/plugins" \ diff --git a/omd/packages/omd/hooks/CORE b/omd/packages/omd/hooks/CORE index a1ef91d..1942129 100755 --- a/omd/packages/omd/hooks/CORE +++ b/omd/packages/omd/hooks/CORE @@ -38,6 +38,8 @@ case "$1" in if [ -e $OMD_ROOT/etc/apache/conf.d/nagios.conf ] ; then rm -f $OMD_ROOT/etc/apache/conf.d/nagios.conf fi + # NOTE: Although we don't ship Icinga anymore, we leave this to make + # sure there is no dangling symlink and keep Apache happy. if [ -e $OMD_ROOT/etc/apache/conf.d/icinga.conf ] ; then rm -f $OMD_ROOT/etc/apache/conf.d/icinga.conf fi

5 years, 8 months

7134 FIX mk_jolokia: now requires requests library

by Moritz Kiemer

Module: check_mk Branch: master Commit: 30c3d3b0f0fe1c9b003417c47b25b0c770793261 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30c3d3b0f0fe1c… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Jan 28 14:08:50 2019 +0100 7134 FIX mk_jolokia: now requires requests library The mk_jolokia plugin has been rewritten to make use of the python requests libgrary. If you encounter an error, please install it on the monitored system using 'pip install requests'. Change-Id: Ie1de2b756eeb9c1e2fb4b80db3e9a9c05fc7b27a --- .werks/7134 | 12 ++ agents/plugins/mk_jolokia.py | 218 ++++++++++----------------- tests/unit/cmk/gui/watolib/test_rulespecs.py | 2 +- 3 files changed, 93 insertions(+), 139 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=30c3d3b0f0…

5 years, 8 months

Fixed globals() hack related bug

by Lars Michelsen

Module: check_mk Branch: master Commit: 7c71d2a86c0b045cecf9ec65c06fde1042ce2be3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c71d2a86c0b04… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 29 23:09:51 2019 +0100 Fixed globals() hack related bug Change-Id: I18560971ddaa33f44b8a0c8fdd4deef84341eeee --- cmk/gui/watolib/host_attributes.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmk/gui/watolib/host_attributes.py b/cmk/gui/watolib/host_attributes.py index 0a28548..5c5b49f 100644 --- a/cmk/gui/watolib/host_attributes.py +++ b/cmk/gui/watolib/host_attributes.py @@ -34,6 +34,7 @@ from cmk.gui.globals import html from cmk.gui.i18n import _, _u from cmk.gui.exceptions import MKUserError from cmk.gui.valuespec import ( + TextAscii, DualListChoice, Checkbox, DropdownChoice, @@ -202,7 +203,10 @@ def _declare_host_tag_attributes(): def declare_custom_host_attrs(): for attr in config.wato_host_attrs: - vs = globals()[attr['type']](title=attr['title'], help=attr['help']) + if attr['type'] == "TextAscii": + vs = TextAscii(title=attr['title'], help=attr['help']) + else: + raise NotImplementedError() if attr['add_custom_macro']: a = NagiosValueSpecAttribute(attr["name"], "_" + attr["name"], vs)

5 years, 8 months

Removed some Icinga traces, hopefully fixing our CI.

by Sven Panne

Module: check_mk Branch: master Commit: a045a2ed8b46df85ffcedefc2c19066a1f2fd1c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a045a2ed8b46df… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jan 30 08:35:23 2019 +0100 Removed some Icinga traces, hopefully fixing our CI. Change-Id: Iceeda70d56a48121078de0a8d5da4314b0de4c84 --- omd/Licenses.csv | 1 - omd/Makefile | 1 - 2 files changed, 2 deletions(-) diff --git a/omd/Licenses.csv b/omd/Licenses.csv index 42e26a1..5fa1b96 100644 --- a/omd/Licenses.csv +++ b/omd/Licenses.csv @@ -8,7 +8,6 @@ GNU patch,2.7.6,GPL-3.0,https://opensource.org/licenses/GPL-3.0,omd/packages/pat googletest,1.8.0,BSD-3-Clause,https://opensource.org/licenses/BSD-3-Clause,…,,,, Heirloom Packaging Tools,070227,CDDL-1.0,https://opensource.org/licenses/CDDL-1.0,omd/packages…,"Unless otherwise noted, all files in this distribution are released under the Common Development and Distribution License (CDDL), Version 1.0 only. Exceptions are noted within the associated source files. BSD-4-Clause also partially applies",,, Heirloom-mailx,12.5,MPL-1.1,https://opensource.org/licenses/MPL-1.1,omd/pac…,,,, -icinga,1.13.3,GPL-2.0,https://opensource.org/licenses/GPL-2.0,omd/packages/icinga/icinga-1.13.3.tar.gz,,,, jmx4perl,1.11,GPL-2.0,https://opensource.org/licenses/GPL-2.0,omd/packages/…,,,, lcab,1.0b12,GPL-2.0,https://opensource.org/licenses/GPL-2.0,omd/packages/ms…,,,, mod_fcgid,2.3.9,Apache-2.0,https://opensource.org/licenses/Apache-2.0,omd/p…,,,, diff --git a/omd/Makefile b/omd/Makefile index c38f102..61cd32f 100644 --- a/omd/Makefile +++ b/omd/Makefile @@ -42,7 +42,6 @@ PACKAGES := \ dokuwiki \ jmx4perl \ mk-livestatus \ - icinga \ nagios \ monitoring-plugins \ nagvis \

5 years, 8 months

Do not test for dead script.

by Sven Panne

Module: check_mk Branch: master Commit: 245292445f356f9641f2e087b9ead9a5ece37701 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=245292445f356f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jan 30 08:37:43 2019 +0100 Do not test for dead script. Change-Id: I55cdbd7efd6fa39640436f03f59c8fbd9fc16a54 --- tests/integration/omd/test_init_scripts.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/integration/omd/test_init_scripts.py b/tests/integration/omd/test_init_scripts.py index 74a0a4a..617051b 100644 --- a/tests/integration/omd/test_init_scripts.py +++ b/tests/integration/omd/test_init_scripts.py @@ -10,7 +10,6 @@ def test_init_scripts(site): "apache", "core", "crontab", - "icinga", "mkeventd", "nagios", "npcd",

5 years, 8 months

fixed another integration test: HOSTTAGS sorting

by Andreas Boesl

Module: check_mk Branch: master Commit: 8b3454133f22bb6f4596064e25eee6092487141d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b3454133f22bb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jan 29 18:10:44 2019 +0100 fixed another integration test: HOSTTAGS sorting Change-Id: If4a4367d5de94e0de3d1a9a2d9b876c4b64cee5a --- tests/integration/core/test_active_checks.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/integration/core/test_active_checks.py b/tests/integration/core/test_active_checks.py index ba38195..c9da994 100644 --- a/tests/integration/core/test_active_checks.py +++ b/tests/integration/core/test_active_checks.py @@ -76,7 +76,9 @@ def test_active_check_macros(test_cfg, site, web, core): macros = { "$HOSTADDRESS$": "127.0.0.1", "$HOSTNAME$": "test-host", - "$_HOSTTAGS$": "/wato/ ip-v4 ip-v4-only lan no-agent no-snmp ping prod site:%s wato" % site.id, + "$_HOSTTAGS$": " ".join(sorted(["/wato/", "ip-v4", "ip-v4-only", "lan", + "no-agent", "no-snmp", "ping", + "prod", "site:%s" % site.id, "wato"])), "$_HOSTADDRESS_4$": "127.0.0.1", "$_HOSTADDRESS_6$": "", "$_HOSTADDRESS_FAMILY$": "4", @@ -132,6 +134,10 @@ def test_active_check_macros(test_cfg, site, web, core): # TODO: Cleanup difference between nagios/cmc if core == "nagios": expected_output = expected_output.strip() + if var == "$_HOSTTAGS$": + splitted_output = plugin_output.split(" ") + plugin_output = splitted_output[0] + " " + " ".join(sorted(splitted_output[1:])) + assert expected_output == plugin_output, \ "Macro %s has wrong value (%r instead of %r)" % (var, plugin_output, expected_output)

5 years, 8 months

WATO rules for k8s network interfaces

by Óscar Nájera

Module: check_mk Branch: master Commit: 688610983aaf6d29ea57de323a0c142967d16fec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=688610983aaf6d… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Wed Jan 23 18:11:16 2019 +0100 WATO rules for k8s network interfaces CMK-1542 Change-Id: I9dd74194a09e96822dbfa473b751bb21fc9c559d --- checks/k8s_stats | 64 +++++++++++++++++++++------- cmk/gui/plugins/wato/check_parameters/if.py | 47 ++++++++++++++++++++ tests/unit/cmk/gui/watolib/test_rulespecs.py | 33 +++++++++++++- 3 files changed, 128 insertions(+), 16 deletions(-) diff --git a/checks/k8s_stats b/checks/k8s_stats index d07b0c3..fe3c5ed 100644 --- a/checks/k8s_stats +++ b/checks/k8s_stats @@ -39,6 +39,29 @@ def discover_k8s_stats_fs(key, value): return [x for x in devices if x not in ignore_fs] +def k8s_network_err_pac(device, params, now): + for name, mway, pway in [('Input', 'rx', 'in'), ('Output', 'tx', 'out')]: + pac_rate = get_rate('if.%s.if_%s_pkts' % (device['name'], pway), now, + device['%s_packets' % mway]) + err_rate = get_rate('if.%s.if_%s_errors' % (device['name'], pway), now, + device['%s_errors' % mway]) + warn, crit = params.get('errors', (None, None)) + perf_data = [('if_%s_pkts' % pway, pac_rate), ('if_%s_errors' % pway, err_rate)] + if isinstance(warn, float): + try: + err_perc = 100.0 * err_rate / (err_rate + pac_rate) + except ZeroDivisionError: + err_perc = 0 + + status, infotext, _perf = check_levels( + err_perc, 'err_perc', (warn, crit), unit='%', infoname=name + " errors percentage") + else: # absolute levels or no levels + status, infotext, _perf = check_levels( + err_rate, 'if_errors', (warn, crit), unit='/s', infoname=name + " error rate") + + yield status, infotext, perf_data + + def check_k8s_stats_network(item, params, metrics): def get_if(): for device in metrics['network']['interfaces']: @@ -46,21 +69,31 @@ def check_k8s_stats_network(item, params, metrics): return device device = get_if() - - perf_names = [ - ('In', 'rx_bytes', 'in', lambda x: "%s/s" % get_bytes_human_readable(x)), - ('Out', 'tx_bytes', 'out', lambda x: "%s/s" % get_bytes_human_readable(x)), - ('Input Packets', 'rx_packets', 'if_in_pkts', None), - ('Output Packets', 'tx_packets', 'if_out_pkts', None), - ('Input Errors', 'rx_errors', 'if_in_errors', None), - ('Output Errors', 'tx_errors', 'if_out_errors', None), - ('Input Discards', 'rx_dropped', 'if_in_discards', None), - ('Output Discards', 'tx_dropped', 'if_out_discards', None), - ] - - for name, met, dsname, hrf in perf_names: - rate = get_rate('if.%s.%s' % (item, dsname), time.time(), device[met]) - yield check_levels(rate, dsname, params, unit='/s', human_readable_func=hrf, infoname=name) + now = time.strptime(metrics['timestamp'][:-4], "%Y-%m-%dT%H:%M:%S.%f") + now = time.mktime(now) - time.timezone + + # Bandwidth + for name, met, dsname in [('In', 'rx_bytes', 'in'), ('Out', 'tx_bytes', 'out')]: + rate = get_rate('if.%s.%s' % (item, dsname), now, device[met]) + yield check_levels( + rate, + dsname, + None, + unit='/s', + human_readable_func=lambda x: "%s/s" % get_bytes_human_readable(x), + infoname=name) + + # Errors / Packets + for check_result in k8s_network_err_pac(device, params, now): + yield check_result + + # Discards + for name, met, dsname in [ + ('Input Discards', 'rx_dropped', 'if_in_discards'), + ('Output Discards', 'tx_dropped', 'if_out_discards'), + ]: + rate = get_rate('if.%s.%s' % (item, dsname), now, device[met]) + yield check_levels(rate, dsname, params.get('discards'), unit='/s', infoname=name) def check_k8s_stats_fs(item, params, metrics): @@ -91,6 +124,7 @@ check_info['k8s_stats.network'] = { 'check_function': check_k8s_stats_network, 'service_description': 'Interface %s', "has_perfdata": True, + "group": "k8s_if", 'includes': ['k8s.include'], } diff --git a/cmk/gui/plugins/wato/check_parameters/if.py b/cmk/gui/plugins/wato/check_parameters/if.py index e11e369..7a9647d 100644 --- a/cmk/gui/plugins/wato/check_parameters/if.py +++ b/cmk/gui/plugins/wato/check_parameters/if.py @@ -583,3 +583,50 @@ register_check_parameters( TextAscii(title=_("port specification"), allow_empty=False), "dict", ) + +register_check_parameters( + RulespecGroupCheckParametersNetworking, + "k8s_if", + _("Kubernetes Network interfaces"), + Dictionary(elements=[ + ("errors", + Alternative( + title=_("Levels for error rates"), + help= + _("These levels make the check go warning or critical whenever the " + "<b>percentual error rate</b> or the <b>absolute error rate</b> of the monitored interface reaches " + "the given bounds. The percentual error rate is computed by dividing number of " + "errors by the total number of packets (successful plus errors)."), + elements=[ + Tuple( + title=_("Percentual levels for error rates"), + elements=[ + Percentage( + title=_("Warning at"), + unit=_("percent errors"), + default_value=0.01, + display_format='%.3f'), + Percentage( + title=_("Critical at"), + unit=_("percent errors"), + default_value=0.1, + display_format='%.3f') + ]), + Tuple( + title=_("Absolute levels for error rates"), + elements=[ + Integer(title=_("Warning at"), unit=_("errors")), + Integer(title=_("Critical at"), unit=_("errors")) + ]) + ])), + ("discards", + Tuple( + title=_("Absolute levels for discards rates"), + elements=[ + Integer(title=_("Warning at"), unit=_("discards")), + Integer(title=_("Critical at"), unit=_("discards")) + ])), + ]), + TextAscii(title=_("port specification"), allow_empty=False), + "dict", +) diff --git a/tests/unit/cmk/gui/watolib/test_rulespecs.py b/tests/unit/cmk/gui/watolib/test_rulespecs.py index fd35786..a6f662d 100644 --- a/tests/unit/cmk/gui/watolib/test_rulespecs.py +++ b/tests/unit/cmk/gui/watolib/test_rulespecs.py @@ -31,7 +31,6 @@ from cmk.gui.plugins.wato.utils import ( ) - def test_rulespec_sub_group(): class TestGroup(RulespecGroup): @property @@ -143,6 +142,7 @@ def test_grouped_rulespecs(): 'static_checks:bluecat_dns', 'static_checks:bluecat_ha', 'static_checks:steelhead_connections', + 'static_checks:k8s_if', ], 'eventconsole': [ 'extra_host_conf:_ec_event_limit', @@ -242,6 +242,7 @@ def test_grouped_rulespecs(): 'checkgroup_parameters:cisco_qos', 'if_groups', 'if_disable_if64_hosts', + 'checkgroup_parameters:k8s_if', 'checkgroup_parameters:adva_ifs', 'checkgroup_parameters:bluecat_ntp', 'checkgroup_parameters:bluecat_dhcp', @@ -6079,6 +6080,21 @@ expected_rulespecs = { 'title': u'JVM uptime (since last reboot)', 'valuespec_class_name': 'TimeperiodValuespec' }, + 'checkgroup_parameters:k8s_if': { + 'factory_default': [], + 'group_name': 'checkparams/networking', + 'help': None, + 'is_deprecated': False, + 'is_optional': False, + 'item_enum': None, + 'item_help': None, + 'item_name': u'port specification', + 'item_spec_class_name': 'TextAscii', + 'item_type': 'item', + 'match_type': 'dict', + 'title': u'Kubernetes Network interfaces', + 'valuespec_class_name': 'TimeperiodValuespec' + }, 'checkgroup_parameters:k8s_pods_cpu': { 'factory_default': [], 'group_name': 'checkparams/applications', @@ -14154,6 +14170,21 @@ expected_rulespecs = { 'title': u'JVM uptime (since last reboot)', 'valuespec_class_name': 'Tuple' }, + 'static_checks:k8s_if': { + 'factory_default': [], + 'group_name': 'static/networking', + 'help': None, + 'is_deprecated': False, + 'is_optional': False, + 'item_enum': None, + 'item_help': None, + 'item_name': None, + 'item_spec_class_name': 'TextAscii', + 'item_type': None, + 'match_type': 'all', + 'title': u'Kubernetes Network interfaces', + 'valuespec_class_name': 'Tuple' + }, 'static_checks:k8s_pods_cpu': { 'factory_default': [], 'group_name': 'static/applications',

5 years, 8 months

further config ruleset tests: host_extra_conf, host_extra_conf_merged,

by Andreas Boesl

Module: check_mk Branch: master Commit: 5de65c74ca4c9178e2c4718333b72a5ecd838d7a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5de65c74ca4c91… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jan 29 14:54:46 2019 +0100 further config ruleset tests: host_extra_conf, host_extra_conf_merged, in_boolean_serviceconf_list Change-Id: Ia45bfd158c3688d51350d3d0cc97c0ec1c2270d8 --- tests/unit/cmk_base/test_rulesets.py | 126 ++++++++++++++++++++++++++++++----- 1 file changed, 109 insertions(+), 17 deletions(-) diff --git a/tests/unit/cmk_base/test_rulesets.py b/tests/unit/cmk_base/test_rulesets.py index b35f373..967c6e4 100644 --- a/tests/unit/cmk_base/test_rulesets.py +++ b/tests/unit/cmk_base/test_rulesets.py @@ -20,17 +20,19 @@ def clear_config_caches(monkeypatch): monkeypatch.setattr(cmk_base, "runtime_cache", cmk_base.caching.CacheManager()) -# TODO: Test the negations + def test_service_extra_conf(monkeypatch): import cmk_base.config as config monkeypatch.setattr(config, "all_hosts", ["host1|tag1|tag2", "host2|tag1"]) monkeypatch.setattr(config, "host_paths", {"host1": "/", "host2": "/"}) monkeypatch.setattr(config, "clusters", {}) - config.get_config_cache().initialize() + + config_cache = config.get_config_cache() + config_cache.initialize() ruleset = [ ("1", [], config.ALL_HOSTS, config.ALL_SERVICES, {}), - ("2", [], config.ALL_HOSTS, config.ALL_SERVICES, {}), + ("2", [], config.ALL_HOSTS, config.ALL_SERVICES, {}), # Duplicate test to detect caching issues ("3", ["tag1"], config.ALL_HOSTS, config.ALL_SERVICES, {}), ("4", ["tag2"], config.ALL_HOSTS, config.ALL_SERVICES, {}), ("5", ["tag3"], config.ALL_HOSTS, config.ALL_SERVICES, {}), @@ -39,28 +41,118 @@ def test_service_extra_conf(monkeypatch): ("8", [], ["host1"], ["service1$"], {}), ("9", [], ["host1"], ["ser$"], {}), ("10", [], ["host1"], ["^serv$"], {}), - ("11", [], ["~host"], config.ALL_SERVICES, {}), - # TODO: Is it really OK that this does not match "host1" below? Maybe a bug?! - ("12", [], ["!host2"], config.ALL_SERVICES, {}), + ("11", [], ["~host"] + config.ALL_HOSTS, config.ALL_SERVICES, {}), + ("12", [], ["!host2"] + config.ALL_HOSTS, config.ALL_SERVICES, {}), ] - assert config.service_extra_conf("host1", "service1", ruleset) == \ - [ "1", "2", "3", "4", "7", "8", "11" ] + assert config_cache.service_extra_conf("host1", "service1", ruleset) == \ + [ "1", "2", "3", "4", "7", "8", "11", "12" ] - assert config.service_extra_conf("host1", "serv", ruleset) == \ - [ "1", "2", "3", "4", "7", "10", "11" ] + assert config_cache.service_extra_conf("host1", "serv", ruleset) == \ + [ "1", "2", "3", "4", "7", "10", "11", "12" ] - assert config.service_extra_conf("host2", "service1", ruleset) == \ + assert config_cache.service_extra_conf("host2", "service1", ruleset) == \ [ "1", "2", "3", "11" ] -# TODO: _convert_service_ruleset -# TODO: in_boolean_serviceconf_list -# TODO: _convert_boolean_service_ruleset -# TODO: host_extra_conf -# TODO: _convert_host_ruleset -# TODO: host_extra_conf_merged +(a)pytest.fixture(scope="function") +def host_ruleset(): + return [ + ({"1": True}, [], config.ALL_HOSTS, {}), + ({"2": True}, ["tag1"], config.ALL_HOSTS, {}), + ({"3": True}, ["tag2"], config.ALL_HOSTS, {}), + ({"4": True}, ["tag3"], config.ALL_HOSTS, {}), + ({"5": True}, ["tag1"], ["host1"], {}), + ({"6": True}, ["tag3"], ["host1"], {}), + ({"7": True}, [], ["host1"], {}), + ({"8": True}, [], ["~host"] + config.ALL_HOSTS, {}), + ({"9": True}, [], ["!host2"] + config.ALL_HOSTS, {}), + ] + + +def test_host_extra_conf(monkeypatch, host_ruleset): + import cmk_base.config as config + monkeypatch.setattr(config, "all_hosts", ["host1|tag1|tag2", "host2|tag1"]) + monkeypatch.setattr(config, "host_paths", {"host1": "/", "host2": "/"}) + monkeypatch.setattr(config, "clusters", {}) + + config_cache = config.get_config_cache() + config_cache.initialize() + + assert config_cache.host_extra_conf("host1", host_ruleset) == \ + [{"1": True}, + {"2": True}, + {"3": True}, + {"5": True}, + {"7": True}, + {"8": True}, + {"9": True}] + + + assert config_cache.host_extra_conf("host2", host_ruleset) == \ + [{"1": True}, + {"2": True}, + {"8": True}] + + +def test_host_extra_conf_merged(monkeypatch, host_ruleset): + import cmk_base.config as config + monkeypatch.setattr(config, "all_hosts", ["host1|tag1|tag2", "host2|tag1"]) + monkeypatch.setattr(config, "host_paths", {"host1": "/", "host2": "/"}) + monkeypatch.setattr(config, "clusters", {}) + + config_cache = config.get_config_cache() + config_cache.initialize() + + assert config_cache.host_extra_conf_merged("host1", host_ruleset) == \ + {"1": True, + "2": True, + "3": True, + "5": True, + "7": True, + "8": True, + "9": True} + + + assert config_cache.host_extra_conf_merged("host2", host_ruleset) == \ + {"1": True, + "2": True, + "8": True} + + +(a)pytest.mark.parametrize("parameters", [ + # ruleset, outcome host1, outcome host2 + [[], False, False], + [[(config.NEGATE, [], config.ALL_HOSTS, config.ALL_SERVICES, {})], False, False], + [[([], config.ALL_HOSTS, config.ALL_SERVICES, {})], True, True], + [[([], ["!host1"] + config.ALL_HOSTS, config.ALL_SERVICES, {})], False, True], + [[([], ["!host1", "!host2"] + config.ALL_HOSTS, config.ALL_SERVICES, {})], False, False], + [[(["tag2"], config.ALL_HOSTS, config.ALL_SERVICES, {})], True, False], + [[(["tag2"], ["!host1"] + config.ALL_HOSTS, config.ALL_SERVICES, {})], False, False], + [[([], ["!host1"] + config.ALL_HOSTS, config.ALL_SERVICES, {})], False, True], + [[(config.NEGATE, [], ["!host1"] + config.ALL_HOSTS, config.ALL_SERVICES, {})], False, False], + [[(config.NEGATE, ["tag2"], ["!host1"] + config.ALL_HOSTS, config.ALL_SERVICES, {})], False, False], + [[([], config.ALL_HOSTS, ["serv"], {})], True, True], + [[(config.NEGATE, [], config.ALL_HOSTS, ["serv"], {})], False, False], + [[(config.NEGATE, [], config.ALL_HOSTS, ["service1"], {})], False, False], + # Dual rule test, first rule matches host1 - negates -> False + # second rule matches host2 -> True + [[(config.NEGATE, [], config.ALL_HOSTS, ["service1"], {}), + ([], config.ALL_HOSTS, config.ALL_SERVICES, {})], False, True]]) + +def test_in_boolean_serviceconf_list(monkeypatch, parameters): + monkeypatch.setattr(config, "all_hosts", ["host1|tag1|tag2", "host2|tag1"]) + monkeypatch.setattr(config, "host_paths", {"host1": "/", "host2": "/"}) + monkeypatch.setattr(config, "clusters", {}) + + config_cache = config.get_config_cache() + config_cache.initialize() + + ruleset, outcome_host1, outcome_host2 = parameters + + assert config_cache.in_boolean_serviceconf_list("host1", "service1", ruleset) == outcome_host1 + assert config_cache.in_boolean_serviceconf_list("host2", "service2", ruleset) == outcome_host2 def test_all_matching_hosts(monkeypatch): import cmk_base.config as config

5 years, 8 months

7079 FIX check_http: Remove problematic "verbose" option from the GUI

by Lars Michelsen

Module: check_mk Branch: master Commit: 3bf3c462e04279691cd96992c4314f1ae16fb222 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3bf3c462e04279… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 29 17:37:08 2019 +0100 7079 FIX check_http: Remove problematic "verbose" option from the GUI Since werk #5224 (1.5.0i1) it was possible to configure the HTTP active check to print out verbose output. The intention was to let it write it's information to the long output. The problem is that the verbose output of the check_http active check does not work this way. Instead of producing long output, it prints out it's verbose output before the regular check result output. For this reason the verbose output will be treated as regular plugin output. This can result in random performance data which is then processed by the core and results in garbage RRD data filling up the disk space. Change-Id: I1edb08d05f758a6cccfcfd05e45ff17858a4e706 --- .werks/7079 | 20 ++ checks/check_http | 3 - cmk/gui/plugins/wato/active_checks.py | 503 +++++++++++++++++----------------- 3 files changed, 279 insertions(+), 247 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3bf3c462e0…

5 years, 8 months

← Newer
1
2
3
4
5
6
7
...
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