Checkmk git commits August 2017

checkmk-commits@lists.checkmk.com

10 participants
201 discussions

Fixed recently introduced exception when creating LDAP connections

by Lars Michelsen

Module: check_mk Branch: master Commit: c07b66e15e1d4da6b44ad2c398eef815f9c50f66 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c07b66e15e1d4d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 30 13:21:20 2017 +0200 Fixed recently introduced exception when creating LDAP connections Change-Id: I24cf980bda28db696bf77fb70811f8852b790dbf --- web/plugins/userdb/ldap.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 701d33f..6f82493 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -139,6 +139,9 @@ class LDAPUserConnector(UserConnector): @classmethod def transform_config(cls, config): + if not config: + return config + # For a short time in git master the directory_type could be: # ('ad', {'discover_nearest_dc': True/False}) if type(config["directory_type"]) == tuple and config["directory_type"][0] == "ad" \

6 years, 10 months

5056 FIX WATO: Wrong list of groups shown on user edit page when syncing groups via LDAP

by Lars Michelsen

Module: check_mk Branch: master Commit: d7332b1053403a089a9e342ee241d51322a4da4e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7332b1053403a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 30 13:35:00 2017 +0200 5056 FIX WATO: Wrong list of groups shown on user edit page when syncing groups via LDAP The locked contact group list on the edit user page was listing too many groups when using the contact group plugin of the LDAP sync. Change-Id: I17c0253b1805f1f87c4155c6a6f600ac16e546fe --- .werks/5056 | 12 ++++++++++++ web/htdocs/wato.py | 13 ++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/.werks/5056 b/.werks/5056 new file mode 100644 index 0000000..dfcb0d8 --- /dev/null +++ b/.werks/5056 @@ -0,0 +1,12 @@ +Title: WATO: Wrong list of groups shown on user edit page when syncing groups via LDAP +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1504092814 + +The locked contact group list on the edit user page was listing too many groups when +using the contact group plugin of the LDAP sync. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index dead87c..6e0f953 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11024,23 +11024,22 @@ def mode_edit_user(phase): html.write(_("Please first create some <a href='%s'>contact groups</a>") % groups_page_url) else: - entries = sorted([ (group['alias'], c) for c, group in contact_groups.items() ]) + entries = sorted([ (group['alias'] or c, c) for c, group in contact_groups.items() ]) is_member_of_at_least_one = False for alias, gid in entries: - if not alias: - alias = gid + is_member = gid in user.get("contactgroups", []) if not is_locked('contactgroups'): html.checkbox("cg_" + gid, gid in user.get("contactgroups", [])) else: - is_member = gid in user.get("contactgroups", []) if is_member: is_member_of_at_least_one = True html.hidden_field("cg_" + gid, '1' if is_member else '') - url = folder_preserving_link([("mode", "edit_contact_group"), ("edit", gid)]) - html.a(alias, href=url) - html.br() + if not is_locked('contactgroups') or is_member: + url = folder_preserving_link([("mode", "edit_contact_group"), ("edit", gid)]) + html.a(alias, href=url) + html.br() if is_locked('contactgroups') and not is_member_of_at_least_one: html.i(_('No contact groups assigned.'))

6 years, 10 months

Minor code cleanup

by Konstantin Büttner

Module: check_mk Branch: master Commit: 4a6113be3c1ace8bfb3fc442d3f0935405a31ac0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a6113be3c1ace… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Aug 30 11:09:09 2017 +0200 Minor code cleanup Change-Id: I73aaa22db0934e491381a38336eca714d9102b12 --- checks/df | 1 + 1 file changed, 1 insertion(+) diff --git a/checks/df b/checks/df index 4a17fe3..584c4b2 100644 --- a/checks/df +++ b/checks/df @@ -178,6 +178,7 @@ def check_df(item, params, parsed): fslist_inodes.append((mountpoint, int(df_inodes[idx][2]), int(df_inodes[idx][4]))) return df_check_filesystem_list(item, params, fslist_blocks, fslist_inodes) + check_info['df'] = { "parse_function" : parse_df, "inventory_function" : inventory_df,

6 years, 10 months

test_automation_try_discovery_not_existing_host: Use another hostname for the test

by Lars Michelsen

Module: check_mk Branch: master Commit: add5a67c362add556cc4db9aebda96b51d27c47d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=add5a67c362add… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 30 11:04:27 2017 +0200 test_automation_try_discovery_not_existing_host: Use another hostname for the test Change-Id: If573c54176a1ef8b76d3c343ebb40645783b0a76 --- tests/cmk_base/test_automations.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/cmk_base/test_automations.py b/tests/cmk_base/test_automations.py index 720b245..2abcf21 100644 --- a/tests/cmk_base/test_automations.py +++ b/tests/cmk_base/test_automations.py @@ -236,8 +236,8 @@ def test_automation_analyse_service_no_check(test_cfg, site): def test_automation_try_discovery_not_existing_host(test_cfg, site): data = _execute_automation(site, "try-inventory", - args=["x"], - expect_stderr="Failed to lookup IPv4 address of x via DNS: [Errno -2] Name or service not known\n\n", + args=["xxx-not-existing-host"], + expect_stderr="Failed to lookup IPv4 address of xxx-not-existing-host via DNS: [Errno -2] Name or service not known\n\n", expect_stdout="", expect_exit_code=2, parse_data=False,

6 years, 10 months

Remove mysterious comment. What does that even mean?

by Konstantin Büttner

Module: check_mk Branch: master Commit: ac09b14b55bf361d1e67cdcaa1b3a6da1bcfe02d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac09b14b55bf36… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Aug 30 10:42:30 2017 +0200 Remove mysterious comment. What does that even mean? Change-Id: I2d7d9754934a5f0a39bbb687b24bc917c8a5c1a9 --- checks/df | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/df b/checks/df index 4b6ede8..4a17fe3 100644 --- a/checks/df +++ b/checks/df @@ -93,7 +93,7 @@ def parse_df(info): df_blocks = [] df_inodes = [] - btrfs_devices = set() # We might generalize that later + btrfs_devices = set() is_inode = False for line in info:

6 years, 10 months

Fixed issues in recent commit

by Lars Michelsen

Module: check_mk Branch: master Commit: 07caf32afe4bc74c5421912fa347531d641ec80f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07caf32afe4bc7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 30 10:35:15 2017 +0200 Fixed issues in recent commit Change-Id: Idbd38ed8732483a63c1a92534ceee9295796df86 --- web/plugins/userdb/ldap.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 850a9a6..701d33f 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -322,7 +322,7 @@ class LDAPUserConnector(UserConnector): locator.m_logger = log.logger try: server = locator.locate(domain) - self.log(' DISCOVERY: Discovered server %r from %r' % (server, connect_params["domain"])) + self.log(' DISCOVERY: Discovered server %r from %r' % (server, domain)) return server except Exception, e: self.log(' DISCOVERY: Failed to discover a server from domain %r' % domain) @@ -475,7 +475,7 @@ class LDAPUserConnector(UserConnector): if connect_method == "discover": servers = [ self._discover_nearest_dc(connect_params["domain"]) ] else: - servers = [ connect_params['server'] ] + connect_prams.get('failover_servers', []) + servers = [ connect_params['server'] ] + connect_params.get('failover_servers', []) return servers

6 years, 10 months

Added needed modules python-ad and dnspython for "closest DC detection"

by Lars Michelsen

Module: check_mk Branch: master Commit: 8fbe7e050aaba594e61928c4a06b79021256c508 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fbe7e050aaba5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 30 10:26:08 2017 +0200 Added needed modules python-ad and dnspython for "closest DC detection" Change-Id: Iec638d59b74a926e17c2b2bed3bcbe042edb87c6 --- omd/packages/python-modules/Makefile | 37 ++++++++++++--------- .../patches/0010-python-ad-disable-krb5.dif | 18 ++++++++++ .../python-modules/src/dnspython-1.15.0.zip | Bin 0 -> 252157 bytes .../python-modules/src/python-ad-0.9.tar.gz | Bin 0 -> 42831 bytes omd/packages/python-modules/src/python-ad.README | 1 + 5 files changed, 41 insertions(+), 15 deletions(-) diff --git a/omd/packages/python-modules/Makefile b/omd/packages/python-modules/Makefile index a91af06..71ff844 100644 --- a/omd/packages/python-modules/Makefile +++ b/omd/packages/python-modules/Makefile @@ -84,7 +84,11 @@ MODULES += psutil-5.2.0.tar.gz # needed for mkbench MODULES += six-1.10.0.tar.gz MODULES += ipaddress-1.0.18.tar.gz + MODULES += netifaces-0.10.6.tar.gz # needed for LDAP (nearest DC detection) +MODULES += dnspython-1.15.0.zip # needed for LDAP (nearest DC detection) +MODULES += python-ad-0.9.tar.gz # needed for LDAP (nearest DC detection) + MODULES += idna-2.5.tar.gz ifneq ($(filter $(DISTRO_CODE),el5 lucid sles11sp1 sles11sp2 sles11sp3 sles11sp4 squeeze),) MODULES += cryptography-1.4.tar.gz @@ -111,21 +115,7 @@ MODULES+=paramiko-2.1.2.tar.gz .PHONY: build check-freetds install skel clean -build: check-python check-freetds - mkdir -p dest - cd dest && \ - for M in $(MODULES); do \ - echo "Unpacking $$M..." ; \ - if echo $$M | grep .tar.gz; then \ - tar xvzf ../src/$$M ; \ - else \ - unzip -o ../src/$$M ; \ - fi \ - done - set -e ; for p in $(PATCHES) ; do \ - echo "applying $$p..." ; \ - patch -p1 -b -d dest < $$p ; \ - done +build: check-python check-freetds unpack set -e ; cd dest && \ mkdir -p $(TMP_INSTALL_PATH)/lib || true; \ export PYTHONPATH=$$PYTHONPATH:$(TMP_INSTALL_PATH)/lib ; \ @@ -151,6 +141,23 @@ build: check-python check-freetds cd .. ; \ done +unpack: + mkdir -p dest + cd dest && \ + for M in $(MODULES); do \ + echo "Unpacking $$M..." ; \ + if echo $$M | grep .tar.gz; then \ + tar xvzf ../src/$$M ; \ + else \ + unzip -o ../src/$$M ; \ + fi \ + done + set -e ; for p in $(PATCHES) ; do \ + echo "applying $$p..." ; \ + patch -p1 -b -d dest < $$p ; \ + done + + check-freetds: @if [ ! -d ../freetds/freetds-0.95.95 ]; then \ echo "ERROR: You need to build the \"freetds\" package first" ; \ diff --git a/omd/packages/python-modules/patches/0010-python-ad-disable-krb5.dif b/omd/packages/python-modules/patches/0010-python-ad-disable-krb5.dif new file mode 100644 index 0000000..5b43b5d --- /dev/null +++ b/omd/packages/python-modules/patches/0010-python-ad-disable-krb5.dif @@ -0,0 +1,18 @@ +diff -Nur dest.orig/python-ad-0.9/lib/ad/protocol/krb5.py dest/python-ad-0.9/lib/ad/protocol/krb5.py +--- dest.orig/python-ad-0.9/lib/ad/protocol/krb5.py 1970-01-01 01:00:00.000000000 +0100 ++++ dest/python-ad-0.9/lib/ad/protocol/krb5.py 2017-08-30 10:20:55.613686559 +0200 +@@ -0,0 +1 @@ ++# Dummy file to disable krb5 import warning because we don't build krb5 binding. +diff -Nur dest.orig/python-ad-0.9/setup.py dest/python-ad-0.9/setup.py +--- dest.orig/python-ad-0.9/setup.py 2008-11-02 15:19:14.000000000 +0100 ++++ dest/python-ad-0.9/setup.py 2017-08-30 10:19:13.744199717 +0200 +@@ -22,7 +22,7 @@ + 'Programming Language :: Python'], + package_dir = {'': 'lib'}, + packages = ['ad', 'ad.core', 'ad.protocol', 'ad.util'], +- ext_modules = [Extension('ad.protocol.krb5', ['lib/ad/protocol/krb5.c'], +- libraries=['krb5'])], ++ #ext_modules = [Extension('ad.protocol.krb5', ['lib/ad/protocol/krb5.c'], ++ # libraries=['krb5'])], + test_suite = 'nose.collector' + ) diff --git a/omd/packages/python-modules/src/dnspython-1.15.0.zip b/omd/packages/python-modules/src/dnspython-1.15.0.zip new file mode 100644 index 0000000..be2e7a6 Binary files /dev/null and b/omd/packages/python-modules/src/dnspython-1.15.0.zip differ diff --git a/omd/packages/python-modules/src/python-ad-0.9.tar.gz b/omd/packages/python-modules/src/python-ad-0.9.tar.gz new file mode 100644 index 0000000..23a98fc Binary files /dev/null and b/omd/packages/python-modules/src/python-ad-0.9.tar.gz differ diff --git a/omd/packages/python-modules/src/python-ad.README b/omd/packages/python-modules/src/python-ad.README new file mode 100644 index 0000000..829ce59 --- /dev/null +++ b/omd/packages/python-modules/src/python-ad.README @@ -0,0 +1 @@ +Downloaded from https://code.google.com/archive/p/python-ad/downloads

6 years, 10 months

LDAP discovery: Completely reworked discovery mechanism ( it now uses netlogon + DNS)

by Lars Michelsen

Module: check_mk Branch: master Commit: 067c413b6ddd0fbd052ff32cde49f132b2fa71d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=067c413b6ddd0f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 30 10:14:11 2017 +0200 LDAP discovery: Completely reworked discovery mechanism (it now uses netlogon + DNS) Change-Id: I8febb5959315de03b918d0a3256e8f33150b8b73 --- web/htdocs/wato.py | 137 ++++++++++++++---------- web/plugins/userdb/ldap.py | 258 +++++++++++++++++++++++++++------------------ 2 files changed, 234 insertions(+), 161 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=067c413b6d…

6 years, 10 months

df: Mark unused variable as such

by Konstantin Büttner

Module: check_mk Branch: master Commit: e70630d2fd26afe0e5fba251fe75b7cd0c80b3d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e70630d2fd26af… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Aug 29 18:45:52 2017 +0200 df: Mark unused variable as such Change-Id: Idf422ca8e5c3e5279a9949b382a4cd7b5aa4682f --- checks/df | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/df b/checks/df index d3e4435..4b6ede8 100644 --- a/checks/df +++ b/checks/df @@ -136,7 +136,7 @@ def parse_df(info): def inventory_df(parsed): - df_blocks, df_inodes = parsed + df_blocks, _ = parsed mplist = [] for line in df_blocks: if line[1] in inventory_df_exclude_fs:

6 years, 10 months

df.include: Split up df_inventory a bit

by Konstantin Büttner

Module: check_mk Branch: master Commit: 03582d6d36bd7fc669f463905cf9e8b5500b935c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03582d6d36bd7f… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Aug 29 18:28:04 2017 +0200 df.include: Split up df_inventory a bit We extract the logic sorting a mountpoint list into ungrouped mountpoints and groups. Change-Id: I51805782abe9ca590d8d2f91a274200c2769698e --- checks/df.include | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/checks/df.include b/checks/df.include index a024689..f62d8ae 100644 --- a/checks/df.include +++ b/checks/df.include @@ -66,32 +66,34 @@ factory_settings["filesystem_default_levels"] = { "show_reserved" : False, } -def df_inventory(mplist): - group_patterns = {} - for line in host_extra_conf(host_name(), filesystem_groups): - for group_name, pattern in line: - group_patterns.setdefault(group_name, []).append(pattern) - # Create one service for each mount point that is not contained - # in a filesystem group. And create one service for each non-empty - # filesystem group. - inventory = [] - have_groups = set([]) +def ungrouped_mountpoints_and_groups(mplist, group_patterns): + ungrouped_mountpoints = [] + groups = set([]) + for mp in mplist: in_group = False for group_name, patterns in group_patterns.items(): for pattern in patterns: if fnmatch.fnmatch(mp, pattern): - have_groups.add(group_name) + groups.add(group_name) in_group = True break if not in_group: - inventory.append((mp, {})) + ungrouped_mountpoints.append((mp, {})) + + return ungrouped_mountpoints, groups + + +def df_inventory(mplist): + group_patterns = {} + for line in host_extra_conf(host_name(), filesystem_groups): + for group_name, pattern in line: + group_patterns.setdefault(group_name, []).append(pattern) - for group_name in have_groups: - inventory.append((group_name, { "patterns" : group_patterns[group_name] })) + ungrouped_mountpoints, groups = ungrouped_mountpoints_and_groups(mplist, group_patterns) - return inventory + return ungrouped_mountpoints + list(groups) # Users might have set filesystem_default_levels to old format like (80, 90)

6 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2017