Checkmk git commits October 2018

checkmk-commits@lists.checkmk.com

15 participants
308 discussions

5847 FIX lnx_thermal: Fixed to only gather values of temp & type

by Óscar Nájera

Module: check_mk Branch: master Commit: e6522087f042421d7d154b74fecd227ef5381fd6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6522087f04242… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Oct 18 09:57:18 2018 +0200 5847 FIX lnx_thermal: Fixed to only gather values of temp & type The Linux agent collected too many values when hysteresis data was available and the check crashed. This has been fixed now by fixing the required values. Jira: CMK-1121 Change-Id: I276cb7657db571b5532acddf583768bcc5c148fe --- .werks/5847 | 11 +++++++ agents/check_mk_agent.linux | 13 ++++---- tests/unit/checks/test_lnx_thermal.py | 56 +++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 5 deletions(-) diff --git a/.werks/5847 b/.werks/5847 new file mode 100644 index 0000000..0eb9a4d --- /dev/null +++ b/.werks/5847 @@ -0,0 +1,11 @@ +Title: lnx_thermal: Fixed to only gather values of temp & type +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0p6 +Date: 1539338001 +Class: fix + +The Linux agent collected too many values when hysteresis data was available and the check crashed. +This has been fixed now by fixing the required values. diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index a90057d..13ee884 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -997,12 +997,15 @@ fi # Gather thermal information provided e.g. by acpi # At the moment only supporting thermal sensors if [ -z "$MK_IN_CONTAINER" ] && ls /sys/class/thermal/thermal_zone* >/dev/null 2>&1; then - echo '<<<lnx_thermal>>>' + echo '<<<lnx_thermal:sep(124)>>>' for F in /sys/class/thermal/thermal_zone*; do - echo -n "${F##*/} " - if [ ! -e "$F/mode" ] ; then echo -n "- " ; fi - cat "$F"/{mode,type,temp,trip_point_*} | tr \\n " " - echo + line="${F##*/}" + if [ ! -e "$F/mode" ] ; then line="${line}|-" ; else line="${line}|$(cat "$F"/mode)"; fi + line="${line}|$(cat "$F"/{type,temp} | tr \\n "|")" + for G in $(ls "$F"/trip_point_*_{temp,type}); do + line="${line}$(< "$G" tr \\n "|")" + done + echo "${line%?}" done fi diff --git a/tests/unit/checks/test_lnx_thermal.py b/tests/unit/checks/test_lnx_thermal.py new file mode 100644 index 0000000..49497d4 --- /dev/null +++ b/tests/unit/checks/test_lnx_thermal.py @@ -0,0 +1,56 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals +import pytest + +# Mark all tests in this file as check related tests +pytestmark = pytest.mark.checks + + +def splitter(text, split_symbol=None): + return [line.split(split_symbol) for line in text.split("\n")] + +agent_info = [ + splitter("""thermal_zone0 enabled acpitz 57000 127000 critical +thermal_zone1 enabled acpitz 65000 100000 critical 95500 passive +thermal_zone3 - pch_skylake 46000 115000 critical +thermal_zone5 pkg-temp-0 44000 0 passive 0 passive"""), + splitter( + """thermal_zone0|enabled|acpitz|25000|107000|critical +thermal_zone3|-|pch_skylake|45000|115000|critical +thermal_zone4|-|INT3400 Thermal|20000 +thermal_zone5|-|x86_pkg_temp|48000|0|passive|0|passive +thermal_zone6|-|B0D4|61000|127000|critical|127000|hot|99000|passive|99000|active|94000|active""", + '|') +] +result_discovery = [[('Zone %s' % i, {}) for i in [0, 1, 3, 5]], + [('Zone %s' % i, {}) for i in [0, 3, 4, 5, 6]]] + + +(a)pytest.mark.parametrize("info, result", zip(agent_info, result_discovery)) +def test_parse(check_manager, info, result): + check = check_manager.get_check("lnx_thermal") + assert list(check.run_discovery(info)) == result + + +result_check = [ + [ + (0, '57.0 °C', [('temp', 57.0, 127.0, 127.0)]), + (0, '65.0 °C', [('temp', 65.0, 95.5, 100.0)]), + (0, '46.0 °C', [('temp', 46.0, 115.0, 115.0)]), + (0, '44.0 °C', [('temp', 44.0, None, None)]), + ], + [ + (0, '25.0 °C', [('temp', 25.0, 107.0, 107.0)]), + (0, '45.0 °C', [('temp', 45.0, 115.0, 115.0)]), + (0, '20.0 °C', [('temp', 20.0, None, None)]), + (0, '48.0 °C', [('temp', 48.0, None, None)]), + (0, '61.0 °C', [('temp', 61.0, 99.0, 127.0)]), + ], +] + +(a)pytest.mark.parametrize("info, discovered, checked", zip(agent_info, result_discovery, + result_check)) +def test_parse(check_manager, info, discovered, checked): + check = check_manager.get_check("lnx_thermal") + for (item, params), result in zip(discovered, checked): + assert check.run_check(item, params, info) == result

5 years, 8 months

checkman/esx_vsphere_objects.count: Add reference to new rule.

by Moritz Kiemer

Module: check_mk Branch: master Commit: 5e96f26b314f31678a69a7cc72c469d632e0aad5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e96f26b314f31… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Oct 18 08:45:51 2018 +0200 checkman/esx_vsphere_objects.count: Add reference to new rule. Change-Id: Idd4e83016d7200398aa40832a3e809b58ee48671 --- checkman/esx_vsphere_objects.count | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/checkman/esx_vsphere_objects.count b/checkman/esx_vsphere_objects.count index 9d427c7..eabfe29 100644 --- a/checkman/esx_vsphere_objects.count +++ b/checkman/esx_vsphere_objects.count @@ -6,7 +6,8 @@ distribution: check_mk description: This Check only counts the nubmer of Virtualmachines on a Hostsystem, or the number of Virtualmachines and Hostsystems on a vCenter. - It's always {OK} + Via the rule "Distribution of virtual machines over ESX hosts" you can make sure that a + given set of VMs is running on a given number of different Hosts. inventory: One service will be created

5 years, 8 months

Extended help text of fileinfo group ruleset

by Simon Betz

Module: check_mk Branch: master Commit: ff6184bce41b67d77b3e3871f1d4eae09e3471ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff6184bce41b67… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Oct 18 09:50:52 2018 +0200 Extended help text of fileinfo group ruleset Change-Id: Ic4b9d7abb49f70375cd0f57ef82e602c04bf4ac0 --- cmk/gui/plugins/wato/check_parameters.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cmk/gui/plugins/wato/check_parameters.py b/cmk/gui/plugins/wato/check_parameters.py index d8b06c0..a60f49f 100644 --- a/cmk/gui/plugins/wato/check_parameters.py +++ b/cmk/gui/plugins/wato/check_parameters.py @@ -7126,9 +7126,11 @@ register_rule(group + '/' + subgroup_storage, 'not only for the total size and the age of the oldest/youngest ' 'file but also on the count. You can define one or several ' 'patterns for a group containing <tt>*</tt> and <tt>?</tt>, for example ' - '<tt>/var/log/apache/*.log</tt>. If the pattern begins with a tilde then ' - 'this pattern is interpreted as a regular expression instead of as a filename ' - 'globbing pattern and <tt>*</tt> and <tt>?</tt> are treated differently. ' + '<tt>/var/log/apache/*.log</tt>. Please see Python\'s fnmatch for more ' + 'information regarding globbing patterns and special characters. ' + 'If the pattern begins with a tilde then this pattern is interpreted as ' + 'a regular expression instead of as a filename globbing pattern and ' + '<tt>*</tt> and <tt>?</tt> are treated differently. ' 'For files contained in a group ' 'the discovery will automatically create a group service instead ' 'of single services for each file. This rule also applies when '

5 years, 8 months

6807 FIX veeam_tapejobs: Check returns 'Item not found' if no jobs are sent by the agent

by Simon Betz

Module: check_mk Branch: master Commit: 944372e366618df5b5d4f3780c1d932d44586a6c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=944372e366618d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Oct 18 09:33:57 2018 +0200 6807 FIX veeam_tapejobs: Check returns 'Item not found' if no jobs are sent by the agent Change-Id: I9ec39c0ededacf92f1a5de776ad258a5d7f0ffdf --- .werks/6807 | 11 +++++++++++ checks/veeam_tapejobs | 8 ++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/6807 b/.werks/6807 new file mode 100644 index 0000000..9cffec8 --- /dev/null +++ b/.werks/6807 @@ -0,0 +1,11 @@ +Title: veeam_tapejobs: Check returns 'Item not found' if no jobs are sent by the agent +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1539848025 + + diff --git a/checks/veeam_tapejobs b/checks/veeam_tapejobs index 68c0008..c3f17c9 100644 --- a/checks/veeam_tapejobs +++ b/checks/veeam_tapejobs @@ -48,8 +48,12 @@ def inventory_veeam_tapejobs(parsed): def check_veeam_tapejobs(item, params, parsed): - last_result = parsed[item]["last_result"] - last_state = parsed[item]["last_state"] + data = parsed.get(item) + if data is None: + return + + last_result = data["last_result"] + last_state = data["last_state"] statetext = ", last state: " + last_state warn, crit = params

5 years, 8 months

6751 FIX SLES15: Fixed dependencies of gd

by Marcel Arentz

Module: check_mk Branch: master Commit: b1b3ee2664285fa7ca17bed1cfbc7158e74b1855 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1b3ee2664285f… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Oct 17 16:54:11 2018 +0200 6751 FIX SLES15: Fixed dependencies of gd In newer versions of SLES gd is only available if the module Desktop-Applications is activated. For Check_MK the package libgd3 is fully sufficient and available in all installations, so the depedencies changed from gd to libgd3. Change-Id: I8a9a54b62fa32526f4372b78e40c29bc7f9f4d75 --- .werks/6751 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/6751 b/.werks/6751 new file mode 100644 index 0000000..37c0c8d --- /dev/null +++ b/.werks/6751 @@ -0,0 +1,12 @@ +Title: SLES15: Fixed dependencies of gd +Level: 1 +Component: omd +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1539787840 +Class: fix + +In newer versions of SLES gd is only available if the module Desktop-Applications is +activated. For Check_MK the package libgd3 is fully sufficient and available +in all installations, so the depedencies changed from gd to libgd3.

5 years, 8 months

CMK-1149: Fixed name of package in dependencies of SLES15

by Marcel Arentz

Module: check_mk Branch: master Commit: 9983ab7f624b3dcbb2cbc3309be7beac66eda531 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9983ab7f624b3d… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue Oct 16 15:50:06 2018 +0200 CMK-1149: Fixed name of package in dependencies of SLES15 Change-Id: I2b6c1227bb35fa404ab80b3ae99fd185a7e667d0 --- omd/distros/SLES_15.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/omd/distros/SLES_15.mk b/omd/distros/SLES_15.mk index 385c789..8ce7b77 100644 --- a/omd/distros/SLES_15.mk +++ b/omd/distros/SLES_15.mk @@ -30,7 +30,7 @@ BUILD_PACKAGES += libtiff-devel # Perl::GD BUILD_PACKAGES += libuuid-devel BUILD_PACKAGES += libxml2-devel BUILD_PACKAGES += sqlite3-devel # needed by Python (for sqlite3 module) -BUILD_PACKAGES += tk-devel # needed by Python (for Tkinter module) +BUILD_PACKAGES += tk-devel # needed by Python (for Tkinter module) BUILD_PACKAGES += make BUILD_PACKAGES += mysql BUILD_PACKAGES += openldap2-devel @@ -47,15 +47,15 @@ BUILD_PACKAGES += rrdtool-devel # needed for CMC BUILD_PACKAGES += libffi-devel # needed for pyOpenSSL (and dependant) compilations BUILD_PACKAGES += krb5-devel # needed for pykerberos / requests-kerberos python modules BUILD_PACKAGES += flex # needed for heirloom-pkgtools -BUILD_PACKAGES += openssh # needed for check_by_ssh +BUILD_PACKAGES += openssh # needed for check_by_ssh OS_PACKAGES = OS_PACKAGES += cronie # needed for sites cron jobs -OS_PACKAGES += net-tools # traceroute is needed for Check_MK parent scan +OS_PACKAGES += net-tools # traceroute is needed for Check_MK parent scan OS_PACKAGES += apache2 OS_PACKAGES += bind-utils # check_dns OS_PACKAGES += curl OS_PACKAGES += dialog -OS_PACKAGES += gd +OS_PACKAGES += libgd3 OS_PACKAGES += graphviz OS_PACKAGES += libpng16-16 OS_PACKAGES += libevent-2_1-8

5 years, 8 months

Updated googletest to 1.8.1.

by Sven Panne

Module: check_mk Branch: master Commit: 638001abdd907e08c707c9468aac8fec1a99673e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=638001abdd907e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Oct 18 08:45:46 2018 +0200 Updated googletest to 1.8.1. Change-Id: I77530c897124f13812e4ac42932a356add55151a --- omd/packages/googletest/.gitignore | 1 + omd/packages/googletest/Makefile | 4 ++-- .../googletest/googletest-release-1.8.1.tar.gz | Bin 0 -> 992298 bytes 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/omd/packages/googletest/.gitignore b/omd/packages/googletest/.gitignore index 7c44d19..5e664de 100644 --- a/omd/packages/googletest/.gitignore +++ b/omd/packages/googletest/.gitignore @@ -1,2 +1,3 @@ destdir/ googletest-??????????/ +googletest-release-?????/ diff --git a/omd/packages/googletest/Makefile b/omd/packages/googletest/Makefile index e6712cd..9dd85c8 100644 --- a/omd/packages/googletest/Makefile +++ b/omd/packages/googletest/Makefile @@ -1,10 +1,10 @@ include ../../Makefile.omd -# tar file generated by cloning https://github.com/google/googletest and doing: +# The tar file for snapshots can be generated by cloning https://github.com/google/googletest and doing: # ( VERSION=0048647619; git archive --prefix=googletest-$VERSION/ -o ~/git/check_mk/omd/packages/googletest/googletest-$VERSION.tar.gz $VERSION ) NAME := googletest -VERSION := 0048647619 +VERSION := release-1.8.1 DIR := $(NAME)-$(VERSION) .PHONY: build install skel clean diff --git a/omd/packages/googletest/googletest-release-1.8.1.tar.gz b/omd/packages/googletest/googletest-release-1.8.1.tar.gz new file mode 100644 index 0000000..f0ded9c Binary files /dev/null and b/omd/packages/googletest/googletest-release-1.8.1.tar.gz differ

5 years, 8 months

Updated RE2 to 2018-10-01.

by Sven Panne

Module: check_mk Branch: master Commit: 036c437f79cb0c9ff7cc464236258085c6b98155 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=036c437f79cb0c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Oct 18 08:34:43 2018 +0200 Updated RE2 to 2018-10-01. Change-Id: Ida57788f0ae225f0eaf7137d770031edd6ab560b --- omd/packages/re2/Makefile | 6 +--- ...-Use-fallthrough-attribute-when-available.patch | 33 --------------------- omd/packages/re2/re2-2018-02-01.tar.gz | Bin 388937 -> 0 bytes omd/packages/re2/re2-2018-10-01.tar.gz | Bin 0 -> 391254 bytes 4 files changed, 1 insertion(+), 38 deletions(-) diff --git a/omd/packages/re2/Makefile b/omd/packages/re2/Makefile index 7665be9..47e457c 100644 --- a/omd/packages/re2/Makefile +++ b/omd/packages/re2/Makefile @@ -4,7 +4,7 @@ include ../../Makefile.omd # principle we could use any tag by exporting it manually via: # ( TAG=2018-02-01; git archive --prefix=re2-$TAG/ --output=re2-$TAG.tar.gz $TAG ) NAME = re2 -VERSION = 2018-02-01 +VERSION = 2018-10-01 DIR = $(NAME)-$(VERSION) .PHONY: build unpacks install skel clean @@ -36,10 +36,6 @@ build: unpack unpack: tar xzf $(DIR).tar.gz - for p in patches/*.patch; do \ - echo "applying $$p..." ; \ - patch -p1 -b -d $(DIR) < $$p ; \ - done install: diff --git a/omd/packages/re2/patches/0001-Use-fallthrough-attribute-when-available.patch b/omd/packages/re2/patches/0001-Use-fallthrough-attribute-when-available.patch deleted file mode 100644 index 8fa9726..0000000 --- a/omd/packages/re2/patches/0001-Use-fallthrough-attribute-when-available.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ef0b0e0bde7bb50b6b5d6144a53869bfc2416597 Mon Sep 17 00:00:00 2001 -From: Sven Panne <sp(a)mathias-kettner.de> -Date: Fri, 9 Feb 2018 15:12:37 +0100 -Subject: [PATCH] Use fallthrough attribute when available. - ---- - util/util.h | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/util/util.h b/util/util.h -index a69d842..9f8216b 100644 ---- a/util/util.h -+++ b/util/util.h -@@ -11,6 +11,16 @@ using std::string; - - #define arraysize(array) (int)(sizeof(array)/sizeof((array)[0])) - -+#if !defined(FALLTHROUGH_INTENDED) && defined(__has_cpp_attribute) -+#if __has_cpp_attribute(fallthrough) -+#define FALLTHROUGH_INTENDED [[fallthrough]] -+#elif __has_cpp_attribute(gnu::fallthrough) -+#define FALLTHROUGH_INTENDED [[gnu::fallthrough]] -+#elif __has_cpp_attribute(clang::fallthrough) -+#define FALLTHROUGH_INTENDED [[clang::fallthrough]] -+#endif -+#endif -+ - #ifndef FALLTHROUGH_INTENDED - #define FALLTHROUGH_INTENDED do { } while (0) - #endif --- -2.14.1 - diff --git a/omd/packages/re2/re2-2018-02-01.tar.gz b/omd/packages/re2/re2-2018-02-01.tar.gz deleted file mode 100644 index 56b642d..0000000 Binary files a/omd/packages/re2/re2-2018-02-01.tar.gz and /dev/null differ diff --git a/omd/packages/re2/re2-2018-10-01.tar.gz b/omd/packages/re2/re2-2018-10-01.tar.gz new file mode 100644 index 0000000..215a0e9 Binary files /dev/null and b/omd/packages/re2/re2-2018-10-01.tar.gz differ

5 years, 8 months

docker: refactoring to minimize differences to 1.5.0

by Moritz Kiemer

Module: check_mk Branch: master Commit: 2d661f63928ad2c3d8c68c3dc72ff005ea9c7ab8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d661f63928ad2… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Oct 17 15:40:59 2018 +0200 docker: refactoring to minimize differences to 1.5.0 Change-Id: I92dd566a291dc0771579fb95789f9514d0ce51ff --- checks/docker.include | 77 ++++++++++++++++++++++---------------------- inventory/docker_node_images | 4 +-- 2 files changed, 41 insertions(+), 40 deletions(-) diff --git a/checks/docker.include b/checks/docker.include index 70e2386..87eb4cd 100644 --- a/checks/docker.include +++ b/checks/docker.include @@ -26,6 +26,7 @@ import json import re + def _docker_get_bytes(string): '''get number of bytes from string @@ -74,44 +75,6 @@ def _get_repo_tag(string): return string, "latest" -def _docker_parse_table(rows, fields, keys): - '''docker provides us with space separated tables with field containing spaces - - e.g.: - - TYPE TOTAL ACTIVE SIZE RECLAIMABLE - Images 7 6 2.076 GB 936.9 MB (45%) - Containers 22 0 2.298 GB 2.298 GB (100%) - Local Volumes 5 5 304 B 0 B (0%) - ''' - if not rows or not rows[0]: - return [] - - indices = [] - for field in fields: - rex = regex(field + r'\ *') - m = rex.search(rows[0][0]) - if m is not None: - start, end = m.start(), m.end() - if end - start == len(field): - end = None - indices.append((start, end)) - else: - indices.append((0, 0)) - - table = [] - for row in rows[1:]: - if not row: - continue - try: - line = {k: row[0][i:j].strip() for k, (i, j) in zip(keys, indices)} - except IndexError: - continue - table.append(line) - - return table - - def parse_docker_node_info(info): '''parse output of "docker info"''' try: @@ -166,6 +129,44 @@ def parse_docker_node_info(info): return parsed +def _docker_parse_table(rows, fields, keys): + '''docker provides us with space separated tables with field containing spaces + + e.g.: + + TYPE TOTAL ACTIVE SIZE RECLAIMABLE + Images 7 6 2.076 GB 936.9 MB (45%) + Containers 22 0 2.298 GB 2.298 GB (100%) + Local Volumes 5 5 304 B 0 B (0%) + ''' + if not rows or not rows[0]: + return [] + + indices = [] + for field in fields: + rex = regex(field + r'\ *') + m = rex.search(rows[0][0]) + if m is not None: + start, end = m.start(), m.end() + if end - start == len(field): + end = None + indices.append((start, end)) + else: + indices.append((0, 0)) + + table = [] + for row in rows[1:]: + if not row: + continue + try: + line = {k: row[0][i:j].strip() for k, (i, j) in zip(keys, indices)} + except IndexError: + continue + table.append(line) + + return table + + def parse_docker_system_df(info): field_map = ( diff --git a/inventory/docker_node_images b/inventory/docker_node_images index 8c161c6..8bc367c 100644 --- a/inventory/docker_node_images +++ b/inventory/docker_node_images @@ -45,7 +45,7 @@ def inv_docker_node_images(info, inventory_tree, status_data_tree): "repository" : image["Repository"], "tag" : image["Tag"], "id" : image["ID"], - "amount_containers" : image["amount_containers"], # len(image.get("__containers__", [])), + "amount_containers" : image["amount_containers"], }) @@ -60,7 +60,7 @@ def inv_docker_node_images_containers(info, inventory_tree, status_data_tree): containers = parse_docker_node_images(info).get("containers", {}) status_node = status_data_tree.get_list("software.applications.docker.containers:") - for container in sorted(containers.itervalues(), lambda c: c["ID"]): + for container in sorted(containers.itervalues(), key=lambda c: c["ID"]): status_node.append({ "id" : container["ID"], "repository" : container["Repository"],

5 years, 8 months

Fixed LDAP attribute test after recent commit

by Lars Michelsen

Module: check_mk Branch: master Commit: 5e46608417eb3ee7874d23af651494d1d813ba16 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e46608417eb3e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 17 16:41:53 2018 +0200 Fixed LDAP attribute test after recent commit Change-Id: Ie6afc307e8d07674d565239c880b2897a89ebf93 --- tests/unit/cmk/gui/test_userdb_ldap_connector.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/cmk/gui/test_userdb_ldap_connector.py b/tests/unit/cmk/gui/test_userdb_ldap_connector.py index dac5048..42c0c90 100644 --- a/tests/unit/cmk/gui/test_userdb_ldap_connector.py +++ b/tests/unit/cmk/gui/test_userdb_ldap_connector.py @@ -291,7 +291,7 @@ def test_group_base_dn_not_exists(mocked_ldap, monkeypatch): def test_locked_attributes(mocked_ldap): - assert mocked_ldap.locked_attributes() == ['alias', 'password', 'email'] + assert mocked_ldap.locked_attributes() == ['alias', 'password', 'locked', 'email'] def test_multisite_attributes(mocked_ldap):

5 years, 8 months

← Newer
1
...
10
11
12
13
14
15
16
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2018