Checkmk git commits October 2018

checkmk-commits@lists.checkmk.com

15 participants
308 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 4bdf2a7f28bcdb45ced152cc9c5284be0fffc6bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4bdf2a7f28bcdb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 17 16:32:45 2018 +0200 Fixed picking issue Change-Id: I3dbe4a6f3629778e280c103a0ce0b4bcb8030d79 --- cmk/gui/plugins/userdb/ldap_connector.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/plugins/userdb/ldap_connector.py b/cmk/gui/plugins/userdb/ldap_connector.py index 0b8e3cd..0faa16c 100644 --- a/cmk/gui/plugins/userdb/ldap_connector.py +++ b/cmk/gui/plugins/userdb/ldap_connector.py @@ -1925,7 +1925,7 @@ def ldap_sync_auth_expire(connection, plugin, params, user_id, ldap_user, user): # Special handling for active directory: Is the user enabled / disabled? if connection.is_active_directory() and ldap_user.get('useraccountcontrol'): # see http://www.selfadsi.de/ads-attributes/user-userAccountControl.htm for details - locked_in_ad = saveint(ldap_user['useraccountcontrol'][0]) & 2 + locked_in_ad = int(ldap_user['useraccountcontrol'][0]) & 2 locked_in_cmk = user.get("locked", False) if locked_in_ad and not locked_in_cmk:

5 years, 8 months

5957 FIX LDAP: Locking of users using "Authentication Expiration" plugin was not unlocking users

by Lars Michelsen

Module: check_mk Branch: master Commit: a7f24c230f67220e9ba7c3eb01f85e750d142027 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7f24c230f6722… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 17 16:17:24 2018 +0200 5957 FIX LDAP: Locking of users using "Authentication Expiration" plugin was not unlocking users The LDAP sync can lock users in Check_MK based on their locking property in the Active Directory. When a user was locked in AD and Check_MK performed the next sync, the user login was disabled. The inverse operation was not working. Unlocking previously locked users has now been implemented correctly. Another change is, that the locking property in Check_MK is now read-only for LDAP users. Change-Id: I124a45ffde266358b80b55e1414ee0b8c84813f9 --- .werks/5957 | 16 ++++++++++++++++ cmk/gui/plugins/userdb/ldap_connector.py | 10 +++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/.werks/5957 b/.werks/5957 new file mode 100644 index 0000000..15a69cb --- /dev/null +++ b/.werks/5957 @@ -0,0 +1,16 @@ +Title: LDAP: Locking of users using "Authentication Expiration" plugin was not unlocking users +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1523264693 + +The LDAP sync can lock users in Check_MK based on their locking property in the Active Directory. +When a user was locked in AD and Check_MK performed the next sync, the user login was disabled. +The inverse operation was not working. + +Unlocking previously locked users has now been implemented correctly. Another change is, that +the locking property in Check_MK is now read-only for LDAP users. diff --git a/cmk/gui/plugins/userdb/ldap_connector.py b/cmk/gui/plugins/userdb/ldap_connector.py index 44fe9e8..0b8e3cd 100644 --- a/cmk/gui/plugins/userdb/ldap_connector.py +++ b/cmk/gui/plugins/userdb/ldap_connector.py @@ -1925,11 +1925,18 @@ def ldap_sync_auth_expire(connection, plugin, params, user_id, ldap_user, user): # Special handling for active directory: Is the user enabled / disabled? if connection.is_active_directory() and ldap_user.get('useraccountcontrol'): # see http://www.selfadsi.de/ads-attributes/user-userAccountControl.htm for details - if int(ldap_user['useraccountcontrol'][0]) & 2 and not user.get("locked", False): + locked_in_ad = saveint(ldap_user['useraccountcontrol'][0]) & 2 + locked_in_cmk = user.get("locked", False) + + if locked_in_ad and not locked_in_cmk: return { 'locked': True, 'serial': user.get('serial', 0) + 1, } + elif not locked_in_ad and locked_in_cmk: + return { + 'locked': False, + } changed_attr = params.get('attr', connection.ldap_attr('pw_changed')).lower() if not changed_attr in ldap_user: @@ -1969,6 +1976,7 @@ ldap_attribute_plugins['auth_expire'] = { 'the password has changed in LDAP or the account has been locked.'), 'needed_attributes' : ldap_needed_attributes_auth_expire, 'sync_func' : ldap_sync_auth_expire, + 'lock_attributes' : ['locked'], # When a plugin introduces new user attributes, it should declare the output target for # this attribute. It can either be written to the multisites users.mk or the check_mk # contacts.mk to be forwarded to nagios. Undeclared attributes are stored in the check_mk

5 years, 8 months

Updated Boost to 1.68.0.

by Sven Panne

Module: check_mk Branch: master Commit: cc8e04f404a8178168f5e26992b088a6ac33fe3f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc8e04f404a817… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Oct 17 15:04:00 2018 +0200 Updated Boost to 1.68.0. Compared to our previous 1.66.0, we get a new ASIO library among other things. Change-Id: I58a84d63da5febb7d0a105acbb8fa37b9837d8aa --- omd/packages/boost/Makefile | 4 ++-- .../{boost_1_66_0.tar.gz => boost_1_68_0.tar.bz2} | Bin 101669839 -> 92155315 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/omd/packages/boost/Makefile b/omd/packages/boost/Makefile index 2beb316..f886a21 100644 --- a/omd/packages/boost/Makefile +++ b/omd/packages/boost/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME := boost -VERSION := 1_66_0 +VERSION := 1_68_0 DIR := $(NAME)_$(VERSION) # For some obscure reason (GCC's dual ABI) we have to link all Boost stuff @@ -20,7 +20,7 @@ B2_LINK_OPTION := "link=static" .PHONY: build install skel clean build: check-python - tar xzf $(NAME)_$(VERSION).tar.gz + tar xjf $(NAME)_$(VERSION).tar.bz2 # basically what part of AC_PROC_CXX does @CXX="" ; \ for PROG in g++-8 g++-7 clang++-6.0 clang++-5.0 g++-6 clang++-4.0 g++-5 clang++-3.9 clang++-3.8 clang++-3.7 clang++-3.6 clang++-3.5 g++-4.9 g++ clang++; do \ diff --git a/omd/packages/boost/boost_1_66_0.tar.gz b/omd/packages/boost/boost_1_68_0.tar.bz2 similarity index 80% rename from omd/packages/boost/boost_1_66_0.tar.gz rename to omd/packages/boost/boost_1_68_0.tar.bz2 index f0881e0..8721965 100644 Binary files a/omd/packages/boost/boost_1_66_0.tar.gz and b/omd/packages/boost/boost_1_68_0.tar.bz2 differ

5 years, 8 months

docker.include: Adapt changes from 1.5.0 branch

by Moritz Kiemer

Module: check_mk Branch: master Commit: 883fe97c19340e89840b10e29afc0b6bfeb908ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=883fe97c19340e… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Oct 17 14:39:38 2018 +0200 docker.include: Adapt changes from 1.5.0 branch Change-Id: I543c3344c62426173634b0a324fdcaced527efff --- checks/docker.include | 48 +++++++++++--------------- tests/unit/checks/test_docker_parse_helpers.py | 1 - 2 files changed, 21 insertions(+), 28 deletions(-) diff --git a/checks/docker.include b/checks/docker.include index 639a550..70e2386 100644 --- a/checks/docker.include +++ b/checks/docker.include @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. import json - +import re def _docker_get_bytes(string): '''get number of bytes from string @@ -37,14 +37,19 @@ def _docker_get_bytes(string): ''' # remove percent string = string.split('(')[0].strip() - value_string = string.rstrip('kKMGB').strip() - unit_string = string.lstrip('0123456789.').strip() + tmp = re.split('([a-zA-Z]+)', string) + value_string = tmp[0].strip() + unit_string = tmp[1].strip() if len(tmp) > 1 else 'B' try: factor = { + 'TB': 10**12, 'GB': 10**9, 'MB': 10**6, + 'KB': 10**3, 'kB': 10**3, - }.get(unit_string, 1) + 'B' : 1, + '' : 1, + }[unit_string] return int(float(value_string) * factor) except (ValueError, TypeError): return None @@ -63,18 +68,6 @@ def _docker_trunc_id(hash_string): return long_id[:12] -# .--parse---------------------------------------------------------------. -# | | -# | _ __ __ _ _ __ ___ ___ | -# | | '_ \ / _` | '__/ __|/ _ \ | -# | | |_) | (_| | | \__ \ __/ | -# | | .__/ \__,_|_| |___/\___| | -# | |_| | -# +----------------------------------------------------------------------+ -# | | -# '----------------------------------------------------------------------' - - def _get_repo_tag(string): if ":" in string: return tuple(string.split(":", 1)) @@ -122,6 +115,7 @@ def _docker_parse_table(rows, fields, keys): def parse_docker_node_info(info): '''parse output of "docker info"''' try: + # parse legacy json output (verisons 1.5.0 - 1.5.0p6) return json.loads(" ".join(info[0])) except ValueError: pass @@ -132,18 +126,16 @@ def parse_docker_node_info(info): if not row: continue # remove '|', it was protecting leading whitespace - row[0] = row[0][1:] - if not row[0]: + row0 = row[0][1:] + if not row0: continue # ignore misssing keys / pad lines that are not of "key: value" type if len(row) == 1: row.append('') - key = row[0].strip() + key = row0.strip() value = ':'.join(row[1:]).strip() # indented keys are prefixed by the last not indented key - # this does the right thing in the cases we use - indent = len(row[0]) - len(key) - if indent == 0: + if len(row0) - len(key) == 0: parsed[key] = value prefix = key else: @@ -176,18 +168,20 @@ def parse_docker_node_info(info): def parse_docker_system_df(info): - keys = ('Type', 'TotalCount', 'Active', 'Size', 'Reclaimable') - types = (str, int, int, _docker_get_bytes, _docker_get_bytes) + field_map = ( + ('TYPE', 'TOTAL', 'ACTIVE', 'SIZE', 'RECLAIMABLE'), + ('Type', 'TotalCount', 'Active', 'Size', 'Reclaimable'), + (str, int, int, _docker_get_bytes, _docker_get_bytes), + ) try: # parse legacy json output: from 1.5.0 - 1.5.0p6 table = [json.loads(",".join(row)) for row in info if row] except ValueError: - header = ('TYPE', 'TOTAL', 'ACTIVE', 'SIZE', 'RECLAIMABLE') - table = _docker_parse_table(info, header, keys) + table = _docker_parse_table(info, field_map[0], field_map[1]) parsed = {} for line in table: - for key, type_ in zip(keys, types): + for key, type_ in zip(field_map[1], field_map[2]): v = line.get(key) if v is not None: line[key] = type_(v) diff --git a/tests/unit/checks/test_docker_parse_helpers.py b/tests/unit/checks/test_docker_parse_helpers.py index 890c8d9..41d8d5b 100644 --- a/tests/unit/checks/test_docker_parse_helpers.py +++ b/tests/unit/checks/test_docker_parse_helpers.py @@ -11,7 +11,6 @@ execfile(os.path.join(os.path.dirname(__file__), '../../../checks/docker.include ("0 B", 0), ("2B", 2), ("23 kB", 23000), - ("foobar", None), ("", None), ]) def test_parse_docker_get_bytes(indata, outdata):

5 years, 8 months

generictests: more helpful assert message

by Moritz Kiemer

Module: check_mk Branch: master Commit: 4e93ec8a26750ad6a849b2844470ac36be8dd7b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e93ec8a26750a… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Oct 17 12:57:26 2018 +0200 generictests: more helpful assert message Change-Id: I6c9dd4dfa1c297153331416e9709ffedbcbf26b1 --- tests/unit/checks/generictests/run.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/checks/generictests/run.py b/tests/unit/checks/generictests/run.py index eb6d44e..673f414 100644 --- a/tests/unit/checks/generictests/run.py +++ b/tests/unit/checks/generictests/run.py @@ -180,7 +180,7 @@ def run(check_manager, dataset, write=False): """Run all possible tests on 'dataset'""" print("START: %r" % dataset) checklist = checkhandler.get_applicables(dataset.checkname) - assert checklist + assert checklist, "Found no check plugin for %r" % dataset.checkname immu = Immutables() # test the parse function

5 years, 8 months

6831 docker_node_images: Support old Docker versions

by Moritz Kiemer

Module: check_mk Branch: master Commit: 1024facf2fdc192711500aa4fcfa5df80df1e826 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1024facf2fdc19… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Oct 12 14:25:40 2018 +0200 6831 docker_node_images: Support old Docker versions Some old Docker versions do not support the "--format" option, which resulted in faulty or missing agent data. This option is now avoided as far as possible. CMK-1031 Change-Id: Icd348fe91cfd18cc8a66155b40b300e5fafedc36 --- .werks/6831 | 12 + agents/check_mk_agent.linux | 9 +- checks/docker.include | 121 +- inventory/docker_node_images | 18 +- tests/unit/checks/test_docker_parse_images.py | 57 - tests/unit/checks/test_docker_parse_node_images.py | 7480 ++++++++++++++++++-- tests/unit/checks/test_docker_parse_ps_all.py | 80 - ... test_docker_parse_subsection_image_inspect.py} | 12 +- 8 files changed, 7189 insertions(+), 600 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1024facf2f…

5 years, 8 months

Reserved 1 Werk IDS

by Alexander Wilms

Module: check_mk Branch: master Commit: 65ace293a47b44e1c4e2184ca88ff27d71b2e9bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=65ace293a47b44… Author: Alexander Wilms <aw(a)mathias-kettner.de> Date: Wed Oct 17 13:51:26 2018 +0200 Reserved 1 Werk IDS Change-Id: I5ba351dcecc76ed40dc0bc79691aa8a285a265f0 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 4ba145e..f611b29 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6840 +6841

5 years, 8 months

Moved host diag and ldap modes to dedicated modules

by Lars Michelsen

Module: check_mk Branch: master Commit: bdc52ae0464901cbb34c399395a30774c65f828c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bdc52ae0464901… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 16 20:21:58 2018 +0200 Moved host diag and ldap modes to dedicated modules Change-Id: I40e71812234bb1b3f911251981dbf003138581a1 --- cmk/gui/wato/__init__.py | 716 +----------------------------------- cmk/gui/wato/pages/host_diagnose.py | 391 ++++++++++++++++++++ cmk/gui/wato/pages/ldap.py | 404 ++++++++++++++++++++ 3 files changed, 797 insertions(+), 714 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bdc52ae046…

5 years, 8 months

Moved random hosts, pattern editor and ruleset modes to dedicated modules

by Lars Michelsen

Module: check_mk Branch: master Commit: 829daad3d52b9d48f643de9ab8a0ca6a7c713f64 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=829daad3d52b9d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 16 20:07:34 2018 +0200 Moved random hosts, pattern editor and ruleset modes to dedicated modules Change-Id: Ia48cd4a868fc9e31990d6494f6159a2cae627209 --- cmk/gui/wato/__init__.py | 2226 ++-------------------------------- cmk/gui/wato/pages/pattern_editor.py | 232 ++++ cmk/gui/wato/pages/random_hosts.py | 115 ++ cmk/gui/wato/pages/rulesets.py | 1707 ++++++++++++++++++++++++++ 4 files changed, 2176 insertions(+), 2104 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=829daad3d5…

5 years, 8 months

Moved download agents mode to dedicated modules

by Lars Michelsen

Module: check_mk Branch: master Commit: 3f72f4333cff69a5f9404c33e04890805f67f52c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f72f4333cff69… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 16 21:07:24 2018 +0200 Moved download agents mode to dedicated modules Change-Id: I1e8da0825b9100abec3d8fc330fa5d29846eace4 --- cmk/gui/wato/__init__.py | 150 +--------------------------- cmk/gui/wato/pages/download_agents.py | 183 ++++++++++++++++++++++++++++++++++ 2 files changed, 184 insertions(+), 149 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3f72f4333c…

5 years, 8 months

← Newer
1
...
11
12
13
14
15
16
17
...
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