Checkmk git commits October 2018

checkmk-commits@lists.checkmk.com

15 participants
308 discussions

6847 LDAP: Improved nested group lookup performance

by Lars Michelsen

Module: check_mk Branch: master Commit: e257edbcb1c505438a89b553b2e52147cac3abfa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e257edbcb1c505… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 22 11:27:47 2018 +0200 6847 LDAP: Improved nested group lookup performance Instead of relying on the on the incredibly slow memberOf:1.2.840.113556.1.4.1941: chain matching mechanism of the Active Diretory the LDAP synchronization is now performing it's own nested group resolution. Change-Id: I527cd6d9cda6a6ac91fb9b3d2a4a5c244e6e9f92 --- .werks/6847 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/6847 b/.werks/6847 new file mode 100644 index 0000000..0f17f34 --- /dev/null +++ b/.werks/6847 @@ -0,0 +1,12 @@ +Title: LDAP: Improved nested group lookup performance +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1540200391 +Class: feature + +Instead of relying on the on the incredibly slow memberOf:1.2.840.113556.1.4.1941: chain matching +mechanism of the Active Diretory the LDAP synchronization is now performing it's own nested group +resolution.

5 years, 8 months

LDAP: Count number of queries during sync for writing to web.log at the end

by Lars Michelsen

Module: check_mk Branch: master Commit: e19b9f7e88018d8e236e57aba25c8c42c3efc5b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e19b9f7e88018d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 17 15:33:00 2018 +0200 LDAP: Count number of queries during sync for writing to web.log at the end Change-Id: I42a8d5db81b3b0701f6cb9e3c23a80d89da2df2c --- cmk/gui/plugins/userdb/ldap_connector.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmk/gui/plugins/userdb/ldap_connector.py b/cmk/gui/plugins/userdb/ldap_connector.py index 0faa16c..e6936a4 100644 --- a/cmk/gui/plugins/userdb/ldap_connector.py +++ b/cmk/gui/plugins/userdb/ldap_connector.py @@ -178,6 +178,7 @@ class LDAPUserConnector(UserConnector): self._ldap_obj_config = None self._logger = log.logger.getChild("ldap.Connection(%s)" % self.id()) + self._num_queries = 0 self._user_cache = {} self._group_cache = {} @@ -519,6 +520,7 @@ class LDAPUserConnector(UserConnector): columns = [] self._logger.info('LDAP_SEARCH "%s" "%s" "%s" "%r"' % (base, scope, filt, columns)) + self._num_queries += 1 start_time = time.time() # In some environments, the connection to the LDAP server does not seem to @@ -1097,7 +1099,8 @@ class LDAPUserConnector(UserConnector): changes.append(_("LDAP [%s]: Modified user %s (%s)") % (connection_id, user_id, ', '.join(details))) duration = time.time() - start_time - self._logger.info('SYNC FINISHED - Duration: %0.3f sec', duration) + self._logger.info('SYNC FINISHED - Duration: %0.3f sec, Queries: %d' % + (duration, self._num_queries)) import cmk.gui.watolib as watolib # TODO: Cleanup if changes and config.wato_enabled and not config.is_wato_slave_site(): @@ -1131,6 +1134,7 @@ class LDAPUserConnector(UserConnector): def _flush_caches(self): + self._num_queries = 0 self._user_cache.clear() self._group_cache.clear()

5 years, 8 months

Improved LDAP unit tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 6b73e21e63a414f3174da6c56027023617b394d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b73e21e63a414… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 17 20:15:24 2018 +0200 Improved LDAP unit tests * Enabled group membership testing for nested groups * Workaround some differences between python-ldap and MockLdap modules in terms of encoding as it is currently used by Check_MK. (See http://www.python-ldap.org/en/latest/bytes_mode.html) In our LDAP code we are converting all values received from python-ldap to unicode strings. This should make it easy to switch to bytes_mode=False by simply changing the value and remove the decoding stuff from the LDAP connector. Change-Id: Id169eebe45122d26c5196c8b6a6b166d0cd0c3db --- cmk/gui/plugins/userdb/ldap_connector.py | 3 + tests/unit/cmk/gui/test_userdb_ldap_connector.py | 456 +++++++++++++---------- 2 files changed, 260 insertions(+), 199 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6b73e21e63…

5 years, 8 months

checktestlib.py: Produce more helpful output

by Moritz Kiemer

Module: check_mk Branch: master Commit: 8d90593584c002e8da94275a413b419eced0e4eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d90593584c002… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Oct 19 09:25:26 2018 +0200 checktestlib.py: Produce more helpful output Change-Id: Ia5e20027849f0cf4b16c00748d102396c64dcb4b --- tests/unit/checks/checktestlib.py | 44 ++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/tests/unit/checks/checktestlib.py b/tests/unit/checks/checktestlib.py index adbc552..e22049c 100644 --- a/tests/unit/checks/checktestlib.py +++ b/tests/unit/checks/checktestlib.py @@ -11,7 +11,7 @@ class Tuploid(object): if isinstance(other_value, self.__class__): return other_value.tuple == self.tuple elif type(other_value) == tuple: - return all(x==y for x, y in zip(other_value, self.tuple)) + return all(x == y for x, y in zip(other_value, self.tuple)) def __ne__(self, other_value): return not self.__eq__(other_value) @@ -25,7 +25,6 @@ class Tuploid(object): yield x - class PerfValue(Tuploid): """Represents a single perf value""" @@ -69,6 +68,23 @@ class PerfValue(Tuploid): return "PerfValue(%r, %r, %r, %r, %r, %r)" % self.tuple +def assertPerfValuesEqual(actual, expected): + """ + Compare two PerfValues. + + This gives more helpful output than 'assert actual == expected' + """ + assert isinstance(actual, PerfValue), "not a PerfValue: %r" % actual + assert isinstance(expected, PerfValue), "not a PerfValue: %r" % expected + assert expected.key == actual.key, "expected %r, but key is %r" % (expected, actual.key) + assert expected.value == actual.value, "expected %r, but value is %r" % (expected, actual.value) + assert expected.warn == actual.warn, "expected %r, but warn is %r" % (expected, actual.warn) + assert expected.crit == actual.crit, "expected %r, but crit is %r" % (expected, actual.crit) + assert expected.minimum == actual.minimum, "expected %r, but minimum is %r" % (expected, actual.minimum) + assert expected.maximum == actual.maximum, "expected %r, but maximum is %r" % (expected, actual.maximum) + + + class BasicCheckResult(Tuploid): """ A basic check result @@ -120,6 +136,22 @@ class BasicCheckResult(Tuploid): return 'BasicCheckResult(%r, %r, %r, multiline=%r)' % self.tuple +def assertBasicCheckResultsEqual(actual, expected): + """ + Compare two BasicCheckResults. + + This gives more helpful output than 'assert actual == expected' + """ + assert isinstance(actual, BasicCheckResult), "not a BasicCheckResult: %r" % actual + assert isinstance(expected, BasicCheckResult), "not a BasicCheckResult: %r" % expected + assert expected.status == actual.status, "expected %r, but status is %r" % (expected, actual.status) + assert expected.infotext == actual.infotext, "expected %r, but infotext is %r" % (expected, actual.infotext) + assert len(expected.perfdata) == len(actual.perfdata), "expected %r, but got %d perfdata" % (expected, len(actual.perfdata)) + for pact, pexp in zip(actual.perfdata, expected.perfdata): + assertPerfValuesEqual(pact, pexp) + assert expected.multiline == actual.multiline, "expected %r, but multiline is %r" % (expected, actual.multiline) + + class CheckResult(object): """ A check result potentially consisting of multiple subresults, @@ -199,9 +231,7 @@ def assertCheckResultsEqual(actual, expected): This gives more helpful output than 'assert actual == expected' """ if isinstance(actual, BasicCheckResult): - assert isinstance(expected, BasicCheckResult), \ - "%r is not a BasicCheckResult instance" % expected - assert actual == expected, "%s != %s" % (actual, expected) + assertBasicCheckResultsEqual(actual, expected) else: assert isinstance(actual, CheckResult), \ @@ -209,9 +239,9 @@ def assertCheckResultsEqual(actual, expected): assert isinstance(expected, CheckResult), \ "%r is not a CheckResult instance" % expected assert len(actual.subresults) == len(expected.subresults), \ - "subresults not of equal length" + "subresults not of equal length (expected %d)" % len(expected.subresults) for suba, sube in zip(actual.subresults, expected.subresults): - assert suba == sube, "%r != %r" % (suba, sube) + assertBasicCheckResultsEqual(suba, sube) class DiscoveryEntry(Tuploid):

5 years, 8 months

df_lnx_regression.py: Add some tests

by Moritz Kiemer

Module: check_mk Branch: master Commit: 36b0fecced2017b72aa90316cdff91409cabaf55 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36b0fecced2017… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Oct 19 09:13:42 2018 +0200 df_lnx_regression.py: Add some tests Change-Id: I3e32251e406741d5d42f2e4b1be843c0e44b6efc --- .../generictests/datasets/df_lnx_regression.py | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/tests/unit/checks/generictests/datasets/df_lnx_regression.py b/tests/unit/checks/generictests/datasets/df_lnx_regression.py index e40052c..9dc663c 100644 --- a/tests/unit/checks/generictests/datasets/df_lnx_regression.py +++ b/tests/unit/checks/generictests/datasets/df_lnx_regression.py @@ -42,6 +42,32 @@ checks = { ), ] ), + (u'/', {"show_reserved": True}, + [(0, '75.8% used (103.92 of 137.13 GB), therein reserved for root: 5.1% (7155.30 MB),' \ + ' trend: 0.00 B / 24 hours', + [(u'/', 106418.50390625, 112333.35625, 126375.02578125, 0, 140416.6953125), + ('fs_size', 140416.6953125, None, None, None, None), + ('reserved', 7155.296875, None, None, None, None), + ('growth', 0.0, None, None, None, None), + ('trend', 0, None, None, 0, 5850.695638020833), + ('inodes_used', 1654272, 8228044.8, 8685158.4, 0, 9142272), + ] + ), + ] + ), + (u'/dev/sda4 /', {"show_reserved": True}, + [(0, '75.8% used (103.92 of 137.13 GB), therein reserved for root: 5.1% (7155.30 MB),' \ + ' trend: 0.00 B / 24 hours', + [(u'/', 106418.50390625, 112333.35625, 126375.02578125, 0, 140416.6953125), + ('fs_size', 140416.6953125, None, None, None, None), + ('reserved', 7155.296875, None, None, None, None), + ('growth', 0.0, None, None, None, None), + ('trend', 0, None, None, 0, 5850.695638020833), + ('inodes_used', 1654272, 8228044.8, 8685158.4, 0, 9142272), + ] + ), + ] + ), (u'/home', 'default', [(3, 'filesystem not found', [])] ), ]

5 years, 8 months

6506 FIX Disable logging of unknown packets for smart ping.

by Sven Panne

Module: check_mk Branch: master Commit: 950b08d642c5b30eb34e9f00eb75a1e4b79ff09a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=950b08d642c5b3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Oct 19 11:34:53 2018 +0200 6506 FIX Disable logging of unknown packets for smart ping. Smart ping used to log packets it couldn't understand, but for some setups this is far too much and there is nothing actionable for a user, so this has been disabled for now. In the future this will be part of the smart ping logging settings. Change-Id: Ia06a253899607e165f4e730405baf9605f30a9c9 --- .werks/6506 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/6506 b/.werks/6506 new file mode 100644 index 0000000..7865be4 --- /dev/null +++ b/.werks/6506 @@ -0,0 +1,12 @@ +Title: Disable logging of unknown packets for smart ping. +Level: 1 +Component: cmc +Compatible: compat +Edition: cee +Version: 1.6.0i1 +Date: 1539941535 +Class: fix + +Smart ping used to log packets it couldn't understand, but for some setups +this is far too much and there is nothing actionable for a user, so this has +been disabled.

5 years, 8 months

Moved host and service modes to dedicated modules

by Kenneth Okoh

Module: check_mk Branch: master Commit: b40282c6d64916cb3e09ccea356b7509dcedb937 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b40282c6d64916… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Fri Oct 19 12:16:00 2018 +0200 Moved host and service modes to dedicated modules Change-Id: Ib43f644856015c4f17d2dec2a4a873c6814839a1 --- cmk/gui/wato/__init__.py | 1218 +--------------------------------------- cmk/gui/wato/pages/folders.py | 12 +- cmk/gui/wato/pages/hosts.py | 425 ++++++++++++++ cmk/gui/wato/pages/services.py | 839 +++++++++++++++++++++++++++ 4 files changed, 1279 insertions(+), 1215 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b40282c6d6…

5 years, 8 months

6840 FIX sshd_config: change the option without-password to key-based

by Alexander Wilms

Module: check_mk Branch: master Commit: d2e1c2d5b0807ee644492db9bc7792de1463326b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d2e1c2d5b0807e… Author: Alexander Wilms <aw(a)mathias-kettner.de> Date: Wed Oct 17 14:10:01 2018 +0200 6840 FIX sshd_config: change the option without-password to key-based In the sshd_config the options without-password and prohibit-password are equivalent. Therefore, we transform the old Check_MK option without-password to the new option key-based which represents both values. Change-Id: I455913ce2610c407d08eea74b40c740bfb2fa7f6 --- .werks/6840 | 13 +++++++++++++ checks/sshd_config | 12 +++++++++++- cmk/gui/plugins/wato/check_parameters.py | 32 +++++++++++++++++++++++--------- 3 files changed, 47 insertions(+), 10 deletions(-) diff --git a/.werks/6840 b/.werks/6840 new file mode 100644 index 0000000..fc6a437 --- /dev/null +++ b/.werks/6840 @@ -0,0 +1,13 @@ +Title: sshd_config: change the option without-password to key-based +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1539777921 +Class: fix + +In the sshd_config the options without-password and +prohibit-password are equivalent. Therefore, we +transform the old Check_MK option without-password +to the new option key-based which represents both values. diff --git a/checks/sshd_config b/checks/sshd_config index 06d8df8..69e11fb 100644 --- a/checks/sshd_config +++ b/checks/sshd_config @@ -39,13 +39,19 @@ def parse_sshd_config(info): identity = lambda x: x + + def map_permit_root_login(value): + if value in [u"prohibit-password", u"without-password"]: + return u"key-based" + return value + relevant_options = { #option parse function "Protocol": lambda x: ",".join(sorted(x.split(","))), # Port can be defined multiple times in sshd_config. # Therefore we use a list of ints. "Port": lambda x: [int(x)], - "PermitRootLogin": identity, + "PermitRootLogin": map_permit_root_login, "PasswordAuthentication": identity, "PermitEmptyPasswords": identity, "ChallengeResponseAuthentication": identity, @@ -79,6 +85,10 @@ def inventory_sshd_config(parsed): def check_sshd_config(_no_item, params, parsed): + root_login = params.get("PermitRootLogin", "") + if root_login == "without-password": + params["PermitRootLogin"] = "key-based" + # type_ is needed because info contains unicode and params str convert = lambda x, type_: (x if isinstance(x, type_) else ", ".join(map(type_, x))) diff --git a/cmk/gui/plugins/wato/check_parameters.py b/cmk/gui/plugins/wato/check_parameters.py index a60f49f..cafb1c8 100644 --- a/cmk/gui/plugins/wato/check_parameters.py +++ b/cmk/gui/plugins/wato/check_parameters.py @@ -2137,6 +2137,17 @@ register_check_parameters( match_type = "dict", ) +def transform_ssh_config(choice): + """ + In the sshd_config the options without-password and + prohibit-password are equivalent. Therefore, we + transform the old Check_MK option without-password + to the new option key-based which represents both values. + """ + if choice == "without-password": + return "key-based" + return choice + register_check_parameters( subgroup_applications, "sshd_config", @@ -2144,15 +2155,18 @@ register_check_parameters( Dictionary( elements = [ ("PermitRootLogin", - DropdownChoice( - title = _("Permit root login"), - choices = [ - ('yes', _('Yes')), - ('without-password', _('Without password')), - ('forced-commands-only', _('Forced commands only')), - ('no', _('No')), - ], - default_value = "without-password", + Transform( + DropdownChoice( + title = _("Permit root login"), + choices = [ + ('yes', _('yes')), + ('key-based', _('without-password/prohibit-password (Key based)')), + ('forced-commands-only', _('forced-commands-only')), + ('no', _('no')), + ], + default_value = "key-based", + ), + forth=transform_ssh_config )), ("Protocol", DropdownChoice(

5 years, 8 months

Moved folders and edit folder modes to dedicated module

by Kenneth Okoh

Module: check_mk Branch: master Commit: fa9aa0a2adf3213e601a9c5ffd39d416fcad3ae8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa9aa0a2adf321… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Fri Oct 19 11:03:42 2018 +0200 Moved folders and edit folder modes to dedicated module Change-Id: If9f967d887926933a9a005d7373ecd9886b7bbc6 --- cmk/gui/plugins/wato/utils/__init__.py | 330 +++++++++++- cmk/gui/wato/__init__.py | 898 +------------------------------- cmk/gui/wato/pages/folders.py | 917 +++++++++++++++++++++++++++++++++ 3 files changed, 1247 insertions(+), 898 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fa9aa0a2ad…

5 years, 8 months

6843 FIX Increased size of "state of a service" BI rule input field

by Lars Michelsen

Module: check_mk Branch: master Commit: 727a7c5adf94446e16ad2254ff67a4ce7dac6def URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=727a7c5adf9444… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 19 10:03:50 2018 +0200 6843 FIX Increased size of "state of a service" BI rule input field Change-Id: I6df8af9c2fc94df8385078c0927b19c8f064aba3 --- .werks/6843 | 11 +++++++++++ cmk/gui/plugins/wato/bi.py | 1 + 2 files changed, 12 insertions(+) diff --git a/.werks/6843 b/.werks/6843 new file mode 100644 index 0000000..70bacfe --- /dev/null +++ b/.werks/6843 @@ -0,0 +1,11 @@ +Title: Increased size of "state of a service" BI rule input field +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1539936206 + + diff --git a/cmk/gui/plugins/wato/bi.py b/cmk/gui/plugins/wato/bi.py index f62f461..5eb0464 100644 --- a/cmk/gui/plugins/wato/bi.py +++ b/cmk/gui/plugins/wato/bi.py @@ -748,6 +748,7 @@ class ModeBI(WatoMode, BIManagement): help = _("A regular expression matching the <b>beginning</b> of a service description. You can " "use a trailing <tt>$</tt> in order to define an exact match. For each " "matching service on the specified hosts one child node will be created. "), + size = 80, ), ] ),

5 years, 8 months

← Newer
1
...
7
8
9
10
11
12
13
...
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