Checkmk git commits April 2018

checkmk-commits@lists.checkmk.com

10 participants
287 discussions

5988 docker_container_diskstat: Check disk usage of docker containers

by Lars Michelsen

Module: check_mk Branch: master Commit: 4fe5cad19fe28d84dc6c744ae1f141aed26d0db5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4fe5cad19fe28d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 19 12:27:16 2018 +0200 5988 docker_container_diskstat: Check disk usage of docker containers Change-Id: I3fe1d5bf03fbe8760e3eeea7d73e6cd6a62bee92 --- .werks/5988 | 11 +++ agents/check_mk_agent.linux | 7 ++ checkman/docker_container_diskstat | 20 ++++++ checks/docker_container_diskstat | 136 +++++++++++++++++++++++++++++++++++++ 4 files changed, 174 insertions(+) diff --git a/.werks/5988 b/.werks/5988 new file mode 100644 index 0000000..5f41f30 --- /dev/null +++ b/.werks/5988 @@ -0,0 +1,11 @@ +Title: docker_container_diskstat: Check disk usage of docker containers +Level: 1 +Component: checks +Class: feature +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1524133606 + + diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index c4fbf40..b172403 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -489,10 +489,17 @@ if [ -z "$MK_IN_CONTAINER" ]; then fi else echo '<<<docker_container_diskstat>>>' + echo "[time]" + date +%s for F in io_service_bytes io_serviced; do echo "[$F]" cat "/sys/fs/cgroup/blkio/blkio.throttle.$F" done + echo "[names]" + for F in /sys/block/*; do + echo -n "${F##*/} " ; + cat "$F/dev"; + done fi diff --git a/checkman/docker_container_diskstat b/checkman/docker_container_diskstat new file mode 100644 index 0000000..6df80a0 --- /dev/null +++ b/checkman/docker_container_diskstat @@ -0,0 +1,20 @@ +title: Docker container disk throughput +agents: linux +catalog: app/docker +license: GPL +distribution: check_mk +description: + This check measures the throughput of block devices (disks) of docker + containers. You can either have a single check for every single disk or a + summary check (which is the default) summing up the throughput of all disks. + + This check measures the memory usage of a docker container respecting + either the memory limits of the docker node or the limit configured + for the container. + + Use the "Main memory usage (UNIX / Other Devices)" rule set to configure + thresholds on the memory usage. + +item: + Either {"SUMMARY"} for a summarized check of all disks or the name of the + disk device, e.g. {"sda"}. diff --git a/checks/docker_container_diskstat b/checks/docker_container_diskstat new file mode 100644 index 0000000..695ea2c --- /dev/null +++ b/checks/docker_container_diskstat @@ -0,0 +1,136 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +def parse_docker_container_diskstat(info): + node_sections = _parse_sub_sections(info) + + disks = {} + for node_name, node_info in node_sections.items(): + timestamp = node_info["time"] + + for device_id, device in node_info["devices"].items(): + # Filter out unwanted things + if device["name"].startswith("loop"): + continue + + # Skip devices without counts + if "ios" not in device or "bytes" not in device: + continue + + disks[(node_name, device["name"])] = timestamp, device + + return disks + + +def _parse_sub_sections(info): + node_sections = {} + + node = None + for line in info: + node = line[0] + + if line[1] == "[io_service_bytes]": + phase = "bytes" + elif line[1] == "[io_serviced]": + phase = "ios" + elif line[1] == '[names]': + phase = "names" + elif line[1] == '[time]': + phase = "time" + else: + if line[1] == "Total": + continue + + sections = node_sections.setdefault(node, {}) + + if phase == "time": + sections["time"] = int(line[1]) + continue + + devices = sections.setdefault("devices", {}) + + if phase == "names": + major, minor = map(int, line[2].split(":")) + else: + major, minor = map(int, line[1].split(":")) + + device_id = node, major, minor + device = devices.setdefault(device_id, {}) + + if phase == "names": + device["name"] = line[1] + else: + device_phase = device.setdefault(phase, {}) + device_phase[line[2]] = int(line[3]) + + return node_sections + + +def inventory_docker_container_diskstat(parsed): + return inventory_diskstat_generic(parsed.keys()) + + +def check_docker_container_diskstat(item, params, parsed): + disks = {} + for (node_name, device_name), (timestamp, device) in parsed.items(): + counter_base = "diskstat.%s." % device_name + + # Docker container information is provided via piggyback in the most cases. In case + # we got no new data simply skip this check + previous_timestamp = get_item_state(counter_base + "time") + if previous_timestamp == timestamp: + raise MKCounterWrapped('No time difference') + set_item_state(counter_base + "time", timestamp) + + read_ios_rate = get_rate(counter_base + "read_ios", timestamp, device["ios"]["Read"], onwrap=0.0) + write_ios_rate = get_rate(counter_base + "write_ios", timestamp, device["ios"]["Write"], onwrap=0.0) + total_ios_rate = read_ios_rate + write_ios_rate + read_bytes_rate = get_rate(counter_base + "read_bytes", timestamp, device["bytes"]["Read"], onwrap=0.0) + write_bytes_rate = get_rate(counter_base + "write_bytes", timestamp, device["bytes"]["Write"], onwrap=0.0) + total_bytes_rate = read_bytes_rate + write_bytes_rate + + disks[device_name] = { + "node" : node_name, + "read_ios" : read_ios_rate, + "write_ios" : write_ios_rate, + "read_throughput" : read_bytes_rate, + "write_throughput" : write_bytes_rate, + } + + return check_diskstat_dict(item, params, disks) + + +check_info["docker_container_diskstat"] = { + "parse_function" : parse_docker_container_diskstat, + "inventory_function" : inventory_docker_container_diskstat, + "check_function" : check_docker_container_diskstat, + "service_description" : "Disk IO %s", + "has_perfdata" : True, + "group" : "diskstat", + "node_info" : True, # add first column with actual host name + "includes" : [ "diskstat.include" ], +} +

6 years, 2 months

5840 FIX MSSQL plugin: fixed detecting of default instance MSSQLSERVER in AlwaysOn environments

by Marcel Schulte

Module: check_mk Branch: master Commit: a838fac5c2ba7a9a7622bd7828e5d08b4dbbf636 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a838fac5c2ba7a… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Thu Apr 19 10:53:17 2018 +0200 5840 FIX MSSQL plugin: fixed detecting of default instance MSSQLSERVER in AlwaysOn environments Change-Id: Id3d7976cc7d6827b1da12f2094976f800917e005 --- .werks/5840 | 10 ++++++++++ agents/windows/plugins/mssql.vbs | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/5840 b/.werks/5840 new file mode 100644 index 0000000..528940a --- /dev/null +++ b/.werks/5840 @@ -0,0 +1,10 @@ +Title: MSSQL plugin: fixed detecting of default instance MSSQLSERVER in AlwaysOn environments +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1524127879 +Class: fix + + diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index 92dfb92..e5a8d7d 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -183,7 +183,7 @@ For Each rk In regkeys ' Only collect results for instances which services are currently running Set service = WMI.ExecQuery("SELECT State FROM Win32_Service " & _ - "WHERE Name = 'MSSQL$" & instance_id & "' AND State = 'Running'") + "WHERE Name = 'MSSQL$" & instance_id & "' AND State = 'Running' OR Name = 'MSSQLSERVER' AND State = 'Running'") If Not IsNull(service) Then instances.add instance_id, cluster_name End If

6 years, 2 months

Win-agent: ensure regeneration of gcov coverage

by Jukka Aro

Module: check_mk Branch: master Commit: ead9c0f065f4610b8cbd34ed660be6c01c70d43d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ead9c0f065f461… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Apr 19 09:05:25 2018 +0200 Win-agent: ensure regeneration of gcov coverage Clean old gcda files as gcov does not guarantee to overwrite them. This is relevant at least when we only change tests but not the source under testing: otherwise gcov may not reproduce the coverage correctly after the changes. --- agents/windows/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/agents/windows/Makefile.am b/agents/windows/Makefile.am index 7af9563..7547084 100644 --- a/agents/windows/Makefile.am +++ b/agents/windows/Makefile.am @@ -65,7 +65,11 @@ integrationtest: install-strip fi ; \ cd - -coverage.info: WindowsAgentCoverage$(EXEEXT) +# Force regeneration of coverage data during test run. +clean-coverage: + rm -f $$(find . -name "*.gcda") + +coverage.info: WindowsAgentCoverage$(EXEEXT) clean-coverage DISPLAY="$$DISPLAY xterm" wine $< 2>/dev/null ; \ lcov -c --rc lcov_branch_coverage=1 --directory . -o $@

6 years, 2 months

5801 FIX Fixed incorrect check parameter assignment after tabula rasa

by Andreas Boesl

Module: check_mk Branch: master Commit: 5012cd62d45d4dd9b64459cc8c070b482be90f4e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5012cd62d45d4d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Apr 18 16:55:17 2018 +0200 5801 FIX Fixed incorrect check parameter assignment after tabula rasa The tabula rasa discovery could assign incorrect default parameters to the discovered service. Generally, if multiple rules provide check parameters, the most specific rule should win. For ps checks the least specific rule did win. This has been fixed. Change-Id: Id945afe730b6d3b9104945655fbf55e988f6452c --- .werks/5801 | 13 +++++++++++++ cmk_base/discovery.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/5801 b/.werks/5801 new file mode 100644 index 0000000..430e810 --- /dev/null +++ b/.werks/5801 @@ -0,0 +1,13 @@ +Title: Fixed incorrect check parameter assignment after tabula rasa +Level: 1 +Component: checks +Class: fix +Compatible: incomp +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1524062928 + +The tabula rasa discovery could assign incorrect default parameters to the discovered service. +Generally, if multiple rules provide check parameters, the most specific rule should win. +For ps checks the least specific rule did win. This has been fixed. diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index 882849a..fcaf2a9 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -979,7 +979,7 @@ def _get_discovered_services(hostname, ipaddress, sources, multi_host_sections, # Handle discovered services -> "new" new_items = _discover_services(hostname, ipaddress, sources, multi_host_sections, on_error) for check_plugin_name, item, paramstring in new_items: - services[(check_plugin_name, item)] = ("new", paramstring) + services.setdefault((check_plugin_name, item), ("new", paramstring)) # Match with existing items -> "old" and "vanished" old_items = parse_autochecks_file(hostname)

6 years, 2 months

5756 FIX check_mk_agent.linux, check_mk_agent.openwrt: specify message digest for encrypted agent output explicitly

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 1d5f61b2bc41944c83f97d454d4f022e0b5baa5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d5f61b2bc4194… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Apr 18 15:27:23 2018 +0200 5756 FIX check_mk_agent.linux, check_mk_agent.openwrt: specify message digest for encrypted agent output explicitly For encrypted agent output the default message digest algorithm of OpenSSL was used before. Prior to OpenSSL 1.1 the default is MD5 which is what the Check_MK server is expecting as well. Starting from OpenSSL 1.1. the default message digest algorithm changed to SHA-256 which leads to problems in the communication between hosts with a new OpenSSL version and the Check_MK server. Now the message digest algorithm is specified explicitly as MD5 to circumvent any ambiguity. Change-Id: I242678076d69da4cf150354a1d9a878ef8ad1e24 --- .werks/5756 | 16 ++++++++++++++++ agents/check_mk_agent.linux | 6 +++--- agents/check_mk_agent.openwrt | 2 +- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.werks/5756 b/.werks/5756 new file mode 100644 index 0000000..9f410b3 --- /dev/null +++ b/.werks/5756 @@ -0,0 +1,16 @@ +Title: check_mk_agent.linux, check_mk_agent.openwrt: specify message digest for encrypted agent output explicitly +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1524056834 +Class: fix + +For encrypted agent output the default message digest algorithm of OpenSSL was +used before. Prior to OpenSSL 1.1 the default is MD5 which is what the Check_MK +server is expecting as well. Starting from OpenSSL 1.1. the default message +digest algorithm changed to SHA-256 which leads to problems in the +communication between hosts with a new OpenSSL version and the Check_MK server. +Now the message digest algorithm is specified explicitly as MD5 to circumvent +any ambiguity. diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 98d4063..a3f5b04 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -93,7 +93,7 @@ fi if [ "$ENCRYPTED" == "yes" ] ; then echo -n "00" # protocol version - exec > >(openssl enc -aes-256-cbc -k "$PASSPHRASE" -nosalt) + exec > >(openssl enc -aes-256-cbc -md md5 -k "$PASSPHRASE" -nosalt) fi @@ -272,7 +272,7 @@ function run_real_time_checks() { echo -n $PROTOCOL ; date +%s | tr -d '\n' ; if [ "$ENCRYPTED_RT" != "no" ] ; then - export RTC_SECRET=$RTC_SECRET ; section_"$SECTION" | openssl enc -aes-256-cbc -pass env:RTC_SECRET -nosalt ; + export RTC_SECRET=$RTC_SECRET ; section_"$SECTION" | openssl enc -aes-256-cbc -md md5 -pass env:RTC_SECRET -nosalt ; else section_"$SECTION" ; fi @@ -294,7 +294,7 @@ function run_real_time_checks() { echo -n $PROTOCOL ; date +%s | tr -d '\n' ; if [ "$ENCRYPTED_RT" != "no" ] ; then - export RTC_SECRET=$RTC_SECRET ; ./$PLUGIN | openssl enc -aes-256-cbc -pass env:RTC_SECRET -nosalt ; + export RTC_SECRET=$RTC_SECRET ; ./$PLUGIN | openssl enc -aes-256-cbc -md md5 -pass env:RTC_SECRET -nosalt ; else ./"$PLUGIN"; fi diff --git a/agents/check_mk_agent.openwrt b/agents/check_mk_agent.openwrt index d4a1549..94c3377 100755 --- a/agents/check_mk_agent.openwrt +++ b/agents/check_mk_agent.openwrt @@ -208,7 +208,7 @@ run_real_time_checks() { echo -n $PROTOCOL ; date +%s | tr -d '\n' ; if [ "$ENCRYPTED_RT" != "no" ] ; then - export RTC_SECRET=$RTC_SECRET ; section_$SECTION | openssl enc -aes-256-cbc -pass env:RTC_SECRET -nosalt ; + export RTC_SECRET=$RTC_SECRET ; section_$SECTION | openssl enc -aes-256-cbc -md md5 -pass env:RTC_SECRET -nosalt ; else section_$SECTION ; fi

6 years, 2 months

Removed useless Transform.

by Sven Panne

Module: check_mk Branch: master Commit: e7c400ffd51c6a33974a1671379ccedb9c25c53d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7c400ffd51c6a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Apr 18 14:54:00 2018 +0200 Removed useless Transform. Change-Id: I555070748cc80fbefe706a0d3f66919adcfafe6b --- web/plugins/wato/mkeventd.py | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 67c7cc3..f080a75 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -351,29 +351,27 @@ def vs_mkeventd_rule(customer=None): help = _("The monitoring state that this event will trigger."), default_value = -1, )), - ( "sl", Transform( - Dictionary( - title = _("Service Level"), - optional_keys = False, - elements = [ - ( "value", DropdownChoice( - title = _("Value"), - choices = mkeventd.service_levels, - prefix_values = True, - help = _("The default/fixed service level to use for this rule."), - )), - ( "precedence", DropdownChoice( - title = _("Precedence"), - choices = [ - ( "message", _("Keep service level from message (if available)") ), - ( "rule", _("Always use service level from rule") ), - ], - help = _("Here you can specify which service level will be used when " - "the incoming message already carries a service level."), - default_value = "message", - )), - ] - ) + ( "sl", Dictionary( + title = _("Service Level"), + optional_keys = False, + elements = [ + ( "value", DropdownChoice( + title = _("Value"), + choices = mkeventd.service_levels, + prefix_values = True, + help = _("The default/fixed service level to use for this rule."), + )), + ( "precedence", DropdownChoice( + title = _("Precedence"), + choices = [ + ( "message", _("Keep service level from message (if available)") ), + ( "rule", _("Always use service level from rule") ), + ], + help = _("Here you can specify which service level will be used when " + "the incoming message already carries a service level."), + default_value = "message", + )), + ] )), ( "contact_groups", Dictionary( title = _("Contact Groups"),

6 years, 2 months

5800 FIX Availability: UNMONITORED timeperiods were incorrectly used in computation results in certain scenarios

by Andreas Boesl

Module: check_mk Branch: master Commit: 801372145fbc3001fa51d224ce1991c62349c79d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=801372145fbc30… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Apr 18 14:52:43 2018 +0200 5800 FIX Availability: UNMONITORED timeperiods were incorrectly used in computation results in certain scenarios When honoring host and service periods, UNMONITORED timeperiods outside of a service period were will still used in the computation. Change-Id: I329be6e96ec0de920954b512ef9e64d863a68879 --- .werks/5800 | 10 ++++++++++ web/htdocs/availability.py | 12 +++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.werks/5800 b/.werks/5800 new file mode 100644 index 0000000..e4f3a39 --- /dev/null +++ b/.werks/5800 @@ -0,0 +1,10 @@ +Title: Availability: UNMONITORED timeperiods were incorrectly used in computation results in certain scenarios +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1524055633 +Class: fix + +When honoring host and service periods, UNMONITORED timeperiods outside of a service period were will still used in the computation. diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index b9ffaaf..ad4cdf3 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -820,18 +820,16 @@ def compute_availability(what, av_rawdata, avoptions): host_alias = span.get("host_alias", site_host[1]) consider = True - if state == -1: - s = "unmonitored" - if not avoptions["consider"]["unmonitored"]: - consider = False - - elif avoptions["service_period"] != "ignore" and \ + if avoptions["service_period"] != "ignore" and \ (( span["in_service_period"] and avoptions["service_period"] != "honor" ) or \ ( not span["in_service_period"] and avoptions["service_period"] == "honor" )): s = "outof_service_period" consider = False - + elif state == -1: + s = "unmonitored" + if not avoptions["consider"]["unmonitored"]: + consider = False elif span["in_notification_period"] == 0 and avoptions["notification_period"] == "exclude": consider = False

6 years, 2 months

Fixed handling of old-skool service levels in EC rules.

by Sven Panne

Module: check_mk Branch: master Commit: 0cec880dd0a154c2a0ea26f531787e1beaea4641 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0cec880dd0a154… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Apr 18 13:51:56 2018 +0200 Fixed handling of old-skool service levels in EC rules. Change-Id: Ica9dff01587fde0c0f497e2a6b8ffe39896e523c --- cmk/ec/export.py | 5 ++++- web/plugins/wato/mkeventd.py | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cmk/ec/export.py b/cmk/ec/export.py index 2960367..b9e0a7d 100644 --- a/cmk/ec/export.py +++ b/cmk/ec/export.py @@ -228,15 +228,18 @@ def load_config(settings): cmk.ec.defaults.default_rule_pack(config["rules"])] config["rules"] = [] - # Convert old contact_groups config for rule_pack in config["rule_packs"]: for rule in rule_pack["rules"]: + # Convert old contact_groups config if isinstance(rule.get("contact_groups"), list): rule["contact_groups"] = { "groups": rule["contact_groups"], "notify": False, "precedence": "host", } + # Old configs only have a naked service level without a precedence. + if isinstance(rule["sl"], int): + rule["sl"] = {"value": rule["sl"], "precedence": "message"} # Convert old logging configurations levels = config["log_level"] diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 9fa5091..67c7cc3 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -373,8 +373,7 @@ def vs_mkeventd_rule(customer=None): default_value = "message", )), ] - ), - forth = lambda x: {"value": x, "precedence": "message"} if isinstance(x, int) else x + ) )), ( "contact_groups", Dictionary( title = _("Contact Groups"),

6 years, 2 months

Win-agent: improve test coverage for WritableFile

by Jukka Aro

Module: check_mk Branch: master Commit: 4d6f3693d608832fcaf85c7e8a27987183c56608 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d6f3693d60883… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Apr 18 13:42:42 2018 +0200 Win-agent: improve test coverage for WritableFile --- agents/windows/test/WritableFileTest.cc | 97 ++++++++++++++++++++++++++++++++- 1 file changed, 95 insertions(+), 2 deletions(-) diff --git a/agents/windows/test/WritableFileTest.cc b/agents/windows/test/WritableFileTest.cc index f0acf49..44602e0 100644 --- a/agents/windows/test/WritableFileTest.cc +++ b/agents/windows/test/WritableFileTest.cc @@ -1,6 +1,8 @@ #include <unordered_map> #include <unordered_set> #include "CustomActions.h" +#include "MockEnvironment.h" +#include "MockLogger.h" #include "MockWinApi.h" #include "WritableFile.h" #include "gmock/gmock.h" @@ -56,7 +58,7 @@ TEST_F(wa_WritableFileTest, constructor_failure) { FileError); } -TEST_F(wa_WritableFileTest, stream_operator_success) { +TEST_F(wa_WritableFileTest, stream_operator_string_success) { const std::string testPath{"foo"}; DWORD shareMode = 0x1; DWORD disposition = 0x2; @@ -79,7 +81,7 @@ TEST_F(wa_WritableFileTest, stream_operator_success) { } } -TEST_F(wa_WritableFileTest, stream_operator_failure) { +TEST_F(wa_WritableFileTest, stream_operator_string_failure) { const std::string testPath{"foo"}; DWORD shareMode = 0x1; DWORD disposition = 0x2; @@ -118,6 +120,97 @@ TEST_F(wa_WritableFileTest, stream_operator_failure) { } } +TEST_F(wa_WritableFileTest, stream_operator_bytes_success) { + const std::string testPath{"foo"}; + DWORD shareMode = 0x1; + DWORD disposition = 0x2; + HANDLE rawHandle = reinterpret_cast<HANDLE>(0x3); + const std::array<std::vector<BYTE>, 2> testArrays = { + std::vector<BYTE>{6, 1}, std::vector<BYTE>{6, 2}}; + + EXPECT_CALL(_mockwinapi, + CreateFile(StrEq(testPath), _, shareMode, _, disposition, _, _)) + .WillOnce(Return(rawHandle)); + for (const auto &testBytes : testArrays) { + EXPECT_CALL(_mockwinapi, WriteFile(rawHandle, testBytes.data(), + testBytes.size(), _, _)) + .WillOnce(Return(1)); + } + EXPECT_CALL(_mockwinapi, CloseHandle(rawHandle)); + { + WritableFile testFile{testPath, shareMode, disposition, _mockwinapi}; + testFile << testArrays[0] << testArrays[1]; + } +} + +TEST_F(wa_WritableFileTest, stream_operator_bytes_failure) { + const std::string testPath{"foo"}; + DWORD shareMode = 0x1; + DWORD disposition = 0x2; + HANDLE rawHandle = reinterpret_cast<HANDLE>(0x3); + const std::vector<BYTE> testBytes = {0, 1, 2, 3, 4, 5}; + DWORD errorCode = ERROR_ACCESS_DENIED; + const std::string buf = "Access denied"; + std::vector<char> errorStr(buf.cbegin(), buf.cend()); + errorStr.push_back('\0'); + + EXPECT_CALL(_mockwinapi, + CreateFile(StrEq(testPath), _, shareMode, _, disposition, _, _)) + .WillOnce(Return(rawHandle)); + EXPECT_CALL(_mockwinapi, WriteFile(rawHandle, testBytes.data(), + testBytes.size(), _, _)) + .WillOnce(Return(0)); + EXPECT_CALL(_mockwinapi, CloseHandle(rawHandle)); + EXPECT_CALL(_mockwinapi, GetLastError()).WillOnce(Return(errorCode)); + EXPECT_CALL(_mockwinapi, FormatMessageA(_, _, errorCode, _, _, _, _)) + .WillOnce(DoAll(SetCharBuffer<4>(errorStr.data()), + Return(errorStr.size() - 1))); + EXPECT_CALL(_mockwinapi, LocalFree(errorStr.data())); + { + WritableFile testFile{testPath, shareMode, disposition, _mockwinapi}; + ASSERT_THROW( + { + try { + testFile << testBytes; + } catch (const FileError &e) { + EXPECT_STREQ("File 'foo': error: Access denied (5)", + e.what()); + throw; + } + }, + FileError); + } +} + +TEST_F(wa_WritableFileTest, getDefaultWhitelist_success) { + NiceMock<MockLogger> mocklogger; + NiceMock<MockWinApi> mockwinapi; + StrictMock<MockEnvironment> mockenv{&mocklogger, mockwinapi}; + const std::string testDir{"foo\\bar"}; + const std::string testPath{"bazqux.exe"}; + EXPECT_CALL(mockenv, agentDirectory()).WillOnce(Return(testDir)); + EXPECT_CALL(mockwinapi, GetModuleFileName(nullptr, _, _MAX_PATH)) + .WillOnce(DoAll(SetArrayArgument<1>(testPath.cbegin(), testPath.cend()), Return(10))); + const std::unordered_set<std::string> expected{ + "foo\\bar\\bin\\OpenHardwareMonitorLib.sys", "bazqux.exe"}; + const auto actual = getDefaultWhitelist(mockenv, mockwinapi); + ASSERT_EQ(expected, actual); +} + +TEST_F(wa_WritableFileTest, getDefaultWhitelist_GetModuleFileName_failure) { + NiceMock<MockLogger> mocklogger; + NiceMock<MockWinApi> mockwinapi; + StrictMock<MockEnvironment> mockenv{&mocklogger, mockwinapi}; + const std::string testDir{"foo\\bar"}; + EXPECT_CALL(mockenv, agentDirectory()).WillOnce(Return(testDir)); + EXPECT_CALL(mockwinapi, GetModuleFileName(nullptr, _, _MAX_PATH)) + .WillOnce(Return(0)); + const std::unordered_set<std::string> expected{ + "foo\\bar\\bin\\OpenHardwareMonitorLib.sys"}; + const auto actual = getDefaultWhitelist(mockenv, mockwinapi); + ASSERT_EQ(expected, actual); +} + using CallTuple = std::tuple<BOOL, std::string, DWORD>; template <size_t U> using CallArray = std::array<CallTuple, U>;

6 years, 2 months

updated werk text

by Andreas Boesl

Module: check_mk Branch: master Commit: 0a4b8bd43d2876ff20dabaab85bb12fac9d54ca3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a4b8bd43d2876… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Apr 18 13:35:23 2018 +0200 updated werk text Change-Id: I994cc384569c307ceb886a42a01e4a15c242d0a4 --- .werks/5799 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/5799 b/.werks/5799 index 57a22fe..f14b8f8 100644 --- a/.werks/5799 +++ b/.werks/5799 @@ -7,7 +7,7 @@ Version: 1.6.0i1 Date: 1524050943 Class: fix -This error appears when the availability timeline is not fully connect, e.g. if it is split +This error appears when the availability timeline is not fully connected, e.g. if it is split by a service period. The computation error itself seems no big issue, since this incorrect computed value wasn't evaluated, anyway.

6 years, 2 months

← Newer
1
...
7
8
9
10
11
12
13
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2018