Checkmk git commits October 2018

checkmk-commits@lists.checkmk.com

15 participants
308 discussions

6808 FIX agent_vsphere: Fixed retrieving system information

by Simon Betz

Module: check_mk Branch: master Commit: 355b0f49e1d67a37eeac9f8dc2dd1b83b44d2b2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=355b0f49e1d67a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Oct 19 11:37:19 2018 +0200 6808 FIX agent_vsphere: Fixed retrieving system information Change-Id: Ia8442cd24e06f669c608d88963eeaf9346394e18 --- .werks/6808 | 11 +++++++++++ agents/special/agent_vsphere | 26 +++++++++++++------------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/.werks/6808 b/.werks/6808 new file mode 100644 index 0000000..29987ba --- /dev/null +++ b/.werks/6808 @@ -0,0 +1,11 @@ +Title: agent_vsphere: Fixed retrieving system information +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1539938611 + + diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index cf635fe..a494139 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -1003,17 +1003,17 @@ def get_agent_info_tcp(hostname): # Globals of ESX System. These settings are available after the first "systeminfo" query systemfields = [ - ("apiVersion", float), - ("name", None), - ("rootFolder", None), - ("perfManager", None), - ("sessionManager", None), - ("licenseManager", None), - ("propertyCollector", None), - ("version", None), - ("build", None), - ("vendor", None), - ("osType", None), + "apiVersion", + "name", + "rootFolder", + "perfManager", + "sessionManager", + "licenseManager", + "propertyCollector", + "version", + "build", + "vendor", + "osType", ] systeminfo = {} @@ -1172,10 +1172,10 @@ def retrieve_systeminfo(): # Retrieve basic data, which requires no login payload = telegram_list["systeminfo"] _reply_code, _reply_msg, _reply_headers, reply_data = query_server(payload) - for entry, function in systemfields: + for entry in systemfields: element = get_pattern("<%(entry)s.*>(.*)</%(entry)s>" % { "entry": entry }, reply_data) if element: - systeminfo[entry] = function(element[0]) if function else element[0] + systeminfo[entry] = element[0] def login():

5 years, 8 months

generictests: merge provided parameters into default

by Moritz Kiemer

Module: check_mk Branch: master Commit: 3cf289e7e5c953b3799beac8fc21a1295378d656 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3cf289e7e5c953… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Oct 19 09:28:59 2018 +0200 generictests: merge provided parameters into default Change-Id: I285a21192b46037d84fd03e890e5d50f3162f9a5 --- tests/unit/checks/generictests/run.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/unit/checks/generictests/run.py b/tests/unit/checks/generictests/run.py index 673f414..e70bf96 100644 --- a/tests/unit/checks/generictests/run.py +++ b/tests/unit/checks/generictests/run.py @@ -42,24 +42,24 @@ def get_info_argument(dataset, subcheck, fallback_parsed=None):# . #. -def get_merged_parameters(default_p, discovered_p):# . +def get_merged_parameters(default_p, provided_p):# . """return (merged_params, description_string) I think this is a mess. I'm trying to do the right thing, any ideas wellcome. """ - if not discovered_p: + if not provided_p: return default_p, "default" - elif isinstance(discovered_p, str): + elif isinstance(provided_p, str): return default_p, "default" - elif type(default_p) == type(discovered_p) == dict: - default_p.update(discovered_p) + elif type(default_p) == type(provided_p) == dict: + default_p.update(provided_p) return default_p, repr(default_p) elif not default_p: - return discovered_p, repr(discovered_p) + return provided_p, repr(provided_p) raise DiscoveryParameterTypeError("unhandled: %r/%r" \ - % (default_p, discovered_p)) + % (default_p, provided_p)) #. @@ -162,8 +162,8 @@ def check_listed_result(check, list_entry, info_arg, immu):# . item, params, results_expected_raw = list_entry print("Dataset item %r in check %r" % (item, check.name)) - if params == "default": - params = check.default_parameters() + default_params = check.default_parameters() + params, __ = get_merged_parameters(default_params, params) immu.register(params, 'params') result_raw = check.run_check(item, params, info_arg)

5 years, 8 months

Adapted werk

by Simon Betz

Module: check_mk Branch: master Commit: 0f5afa959755e715fc5a7bde342f96a057b960a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f5afa959755e7… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Oct 19 10:33:20 2018 +0200 Adapted werk Change-Id: I3cf39b0862cbd9f5c8f40b86478036dd27b08598 --- .werks/6806 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/6806 b/.werks/6806 index 97e4425..a1adb18 100644 --- a/.werks/6806 +++ b/.werks/6806 @@ -3,7 +3,7 @@ Level: 1 Component: inv Compatible: compat Edition: cre -Version: 1.5.0p7 +Version: 1.6.0i1 Date: 1539776847 Class: fix

5 years, 8 months

6806 FIX Management boards: Fixed execution of inventory plugins

by Simon Betz

Module: check_mk Branch: master Commit: ea0beccebf3516587209356ba72471d98ab69ada URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea0beccebf3516… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Oct 19 09:44:31 2018 +0200 6806 FIX Management boards: Fixed execution of inventory plugins Change-Id: I90b65ac68a0c8b0ccee32fff793025c7a540b625 --- .werks/6806 | 10 ++++++ cmk/paths.py | 7 ++++ cmk_base/checking.py | 10 ++++++ cmk_base/config.py | 36 +++++++++++++-------- cmk_base/inventory.py | 65 ++++++++------------------------------ cmk_base/snmp_scan.py | 9 +++--- tests/unit/cmk_base/test_checks.py | 12 +++---- 7 files changed, 73 insertions(+), 76 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ea0beccebf…

5 years, 8 months

6842 FIX Fixed dashlet top offset in classic theme

by Lars Michelsen

Module: check_mk Branch: master Commit: bbc8dcc64581bcef35d2569090904c123f7f98c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbc8dcc64581bc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 19 10:07:00 2018 +0200 6842 FIX Fixed dashlet top offset in classic theme CMK-1147 Change-Id: Ic4d5362bf3dc967df169b6f6250b98c4c752a1a5 --- .werks/6842 | 11 +++++++++++ cmk/gui/plugins/dashboard/view.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/6842 b/.werks/6842 new file mode 100644 index 0000000..a94c399 --- /dev/null +++ b/.werks/6842 @@ -0,0 +1,11 @@ +Title: Fixed dashlet top offset in classic theme +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1539932331 + +CMK-1147 diff --git a/cmk/gui/plugins/dashboard/view.py b/cmk/gui/plugins/dashboard/view.py index fe5b276..9d85a06 100644 --- a/cmk/gui/plugins/dashboard/view.py +++ b/cmk/gui/plugins/dashboard/view.py @@ -99,4 +99,4 @@ class ViewDashlet(IFrameDashlet): views.load_views() views.painter_options.load(self._dashlet_spec["name"]) - views.show_view(self._dashlet_spec, show_heading=True, show_buttons=True, show_footer=True) + views.show_view(self._dashlet_spec, show_heading=True, show_buttons=False, show_footer=True)

5 years, 8 months

Prepare use of isort

by Lars Michelsen

Module: check_mk Branch: master Commit: 7340cf24b515fca1198c8fe009925d5b9a5db1d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7340cf24b515fc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Aug 11 20:23:53 2018 +0200 Prepare use of isort * Add initial configuration file for isort * Add isort to development dependencies in Pipfile Change-Id: I61060be8fff66f0b2618de31704209aa3d22d7a2 --- .isort.cfg | 9 +++++++++ Pipfile | 1 + Pipfile.lock | 50 +++++++++++++++++++++++--------------------------- 3 files changed, 33 insertions(+), 27 deletions(-) diff --git a/.isort.cfg b/.isort.cfg new file mode 100644 index 0000000..d4d2f09 --- /dev/null +++ b/.isort.cfg @@ -0,0 +1,9 @@ +# See http://timothycrosley.github.io/isort/ +[settings] +line_length=99 +known_first_party=cmk_base,cmk,livestatus,omd +indent=4 +use_parentheses=1 +include_trailing_comma=1 +# Use vertical hanging indent (see https://github.com/timothycrosley/isort#multi-line-output-modes) +multi_line_output=3 diff --git a/Pipfile b/Pipfile index 42376b2..d5ea49b 100644 --- a/Pipfile +++ b/Pipfile @@ -23,6 +23,7 @@ pyenchant = "*" yapf = "*" docker = "*" mockldap = "*" +isort = "*" [packages] setuptools_scm = "==2.1.0" diff --git a/Pipfile.lock b/Pipfile.lock index 6ea5560..04bf3c2 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "ad338207f5a0bd9c610e5effd84d3dbfcbcef550bf27bccebdaaec9e88c1e6dc" + "sha256": "9d027b0de5bbce378ae775de1d120dfc174fedf2191341a3081512ccb83eba21" }, "pipfile-spec": 6, "requires": { @@ -520,7 +520,6 @@ "sha256:7779a3bbb74e79db234af6a08775568c6769b5821faecf6e2f4143edb227516e" ], "index": "pypi", - "markers": "python_version >= '2.7' and python_version != '3.0.*' and python_version != '3.1.*' and python_version != '3.2.*' and python_version != '3.3.*'", "version": "==16.2.0" }, "pypdf2": { @@ -610,7 +609,6 @@ "sha256:ec22d826a36ed72a7358ff3fe56cbd4ba69dd7a6718ffd450ff0e9df7a47ce6a" ], "index": "pypi", - "markers": null, "version": "==2.19.1" }, "requests-kerberos": { @@ -734,7 +732,6 @@ "sha256:0ef2bf9f07c3150929b25e8e61b5198c27b0dca195e156f0e4d5bdd89185ca1a", "sha256:fc9b582dba0366e63540982c3944a9230cbc6f303641c51483fa547dcc22393a" ], - "markers": "python_version >= '2.6'", "version": "==1.6.5" }, "atomicwrites": { @@ -841,7 +838,6 @@ "sha256:e05cb4d9aad6233d67e0541caa7e511fa4047ed7750ec2510d466e806e0255d6", "sha256:f3f501f345f24383c0000395b26b726e46758b71393267aeae0bd36f8b3ade80" ], - "markers": "python_version != '3.2.*' and python_version != '3.0.*' and python_version != '3.1.*' and python_version < '4' and python_version >= '2.6'", "version": "==4.5.1" }, "dill": { @@ -853,11 +849,11 @@ }, "docker": { "hashes": [ - "sha256:6c4da20ef40e8d3eaf650f1488d91452b9a1128045481d7169fd34665ffa90ee", - "sha256:bc693be5a84b3b9e5aaf156068c5c0a445ee5138c638c3fbc857133bf67ebe07" + "sha256:31421f16c01ffbd1ea7353c7e7cd7540bf2e5906d6173eb51c8fea4e0ea38b19", + "sha256:fbe82af9b94ccced752527c8de07fa20267f9634b48674ba478a0bb4000a0b1e" ], "index": "pypi", - "version": "==3.5.0" + "version": "==3.5.1" }, "docker-pycreds": { "hashes": [ @@ -887,7 +883,7 @@ "sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca", "sha256:a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50" ], - "markers": "python_version < '3.0'", + "markers": "python_version < '3.3'", "version": "==1.0.2" }, "futures": { @@ -895,15 +891,15 @@ "sha256:9ec02aa7d674acb8618afb127e27fde7fc68994c0437ad759fa094a574adb265", "sha256:ec0a6cb848cc212002b9828c3e34c675e0c9ff6741dc445cab6fdd4e1085d1f1" ], - "markers": "python_version < '3' and python_version >= '2.6'", "version": "==3.2.0" }, "gitdb2": { "hashes": [ - "sha256:87783b7f4a8f6b71c7fe81d32179b3c8781c1a7d6fa0c69bff2f315b00aff4f8", - "sha256:bb4c85b8a58531c51373c89f92163b92f30f81369605a67cd52d1fc21246c044" + "sha256:83361131a1836661a155172932a13c08bda2db3674e4caa32368aa6eb02f38c2", + "sha256:e3a0141c5f2a3f635c7209d56c496ebe1ad35da82fe4d3ec4aaa36278d70648a" ], - "version": "==2.0.4" + "markers": "python_version >= '2.7' and python_version != '3.0.*' and python_version != '3.1.*' and python_version != '3.2.*' and python_version != '3.3.*'", + "version": "==2.0.5" }, "gitpython": { "hashes": [ @@ -942,7 +938,7 @@ "sha256:b9c40e9750f3d77e6e4d441d8b0266cf555e7cdabdcff33c4fd06366ca761ef8", "sha256:ec9ef8f4a9bc6f71eec99e1806bfa2de401650d996c59330782b89a5555c1497" ], - "markers": "python_version < '3' and python_version >= '2.6'", + "index": "pypi", "version": "==4.3.4" }, "lazy-object-proxy": { @@ -1072,19 +1068,19 @@ }, "pluggy": { "hashes": [ - "sha256:6e3836e39f4d36ae72840833db137f7b7d35105079aee6ec4a62d9f80d594dd1", - "sha256:95eb8364a4708392bae89035f45341871286a333f749c3141c20573d2b3876e1" + "sha256:447ba94990e8014ee25ec853339faf7b0fc8050cdc3289d4d71f7f410fb90095", + "sha256:bde19360a8ec4dfd8a20dcb811780a30998101f078fc7ded6162f0076f50508f" ], "markers": "python_version >= '2.7' and python_version != '3.0.*' and python_version != '3.1.*' and python_version != '3.2.*' and python_version != '3.3.*'", - "version": "==0.7.1" + "version": "==0.8.0" }, "py": { "hashes": [ - "sha256:06a30435d058473046be836d3fc4f27167fd84c45b99704f2fb5509ef61f9af1", - "sha256:50402e9d1c9005d759426988a492e0edaadb7f4e68bcddfea586bc7432d009c6" + "sha256:bf92637198836372b520efcba9e020c330123be8ce527e535d185ed4b6f45694", + "sha256:e76826342cefe3c3d5f7e8ee4316b80d1dd8a300781612ddbc765c17ba25a6c6" ], "markers": "python_version >= '2.7' and python_version != '3.0.*' and python_version != '3.1.*' and python_version != '3.2.*' and python_version != '3.3.*'", - "version": "==1.6.0" + "version": "==1.7.0" }, "pyasn1": { "hashes": [ @@ -1121,11 +1117,11 @@ }, "pytest": { "hashes": [ - "sha256:7e258ee50338f4e46957f9e09a0f10fb1c2d05493fa901d113a8dafd0790de4e", - "sha256:9332147e9af2dcf46cd7ceb14d5acadb6564744ddff1fe8c17f0ce60ece7d9a2" + "sha256:10e59f84267370ab20cec9305bafe7505ba4d6b93ecbf66a1cce86193ed511d5", + "sha256:8c827e7d4816dfe13e9329c8226aef8e6e75d65b939bc74fda894143b6d1df59" ], "index": "pypi", - "version": "==3.8.2" + "version": "==3.9.1" }, "pytest-cov": { "hashes": [ @@ -1180,7 +1176,6 @@ "sha256:ec22d826a36ed72a7358ff3fe56cbd4ba69dd7a6718ffd450ff0e9df7a47ce6a" ], "index": "pypi", - "markers": null, "version": "==2.19.1" }, "scandir": { @@ -1218,10 +1213,11 @@ }, "smmap2": { "hashes": [ - "sha256:0dd53d991af487f9b22774fa89451358da3607c02b9b886a54736c6a313ece0b", - "sha256:dc216005e529d57007ace27048eb336dcecb7fc413cfb3b2f402bb25972b69c6" + "sha256:0555a7bf4df71d1ef4218e4807bbf9b201f910174e6e08af2e138d4e517b4dde", + "sha256:29a9ffa0497e7f2be94ca0ed1ca1aa3cd4cf25a1f6b4f5f87f74b46ed91d609a" ], - "version": "==2.0.4" + "markers": "python_version >= '2.7' and python_version != '3.0.*' and python_version != '3.1.*' and python_version != '3.2.*' and python_version != '3.3.*'", + "version": "==2.0.5" }, "stevedore": { "hashes": [

5 years, 8 months

test_df_check: refactor some tests to fix the actual results

by Moritz Kiemer

Module: check_mk Branch: master Commit: c1946690e9eae65255f4351df77eb6bb1b0bb877 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1946690e9eae6… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Oct 19 08:09:12 2018 +0200 test_df_check: refactor some tests to fix the actual results Change-Id: I86778ea45d54398bc05935636b756999d49ccab1 --- .../generictests/datasets/df_lnx_regression.py | 48 ++++++++++++++++++++++ .../generictests/datasets/df_win_regression.py | 43 +++++++++++++++++++ tests/unit/checks/test_df_check.py | 7 ---- 3 files changed, 91 insertions(+), 7 deletions(-) diff --git a/tests/unit/checks/generictests/datasets/df_lnx_regression.py b/tests/unit/checks/generictests/datasets/df_lnx_regression.py new file mode 100644 index 0000000..e40052c --- /dev/null +++ b/tests/unit/checks/generictests/datasets/df_lnx_regression.py @@ -0,0 +1,48 @@ + + +checkname = 'df' + + +info = [[u'/dev/sda4', + u'ext4', + u'143786696', + u'101645524', + u'34814148', + u'75%', + u'/'], + [u'[df_inodes_start]'], + [u'/dev/sda4', u'ext4', u'9142272', u'1654272', u'7488000', u'19%', u'/'], + [u'[df_inodes_end]']] + + +discovery = {'': [(u'/', {})]} + + +checks = { + '': [ + (u'/', 'default', + [(0, '75.8% used (103.92 of 137.13 GB), trend: 0.00 B / 24 hours', + [(u'/', 106418.50390625, 112333.35625, 126375.02578125, 0, 140416.6953125), + ('fs_size', 140416.6953125, 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 /', 'default', + [(0, '75.8% used (103.92 of 137.13 GB), trend: 0.00 B / 24 hours', + [(u'/', 106418.50390625, 112333.35625, 126375.02578125, 0, 140416.6953125), + ('fs_size', 140416.6953125, 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', [])] + ), + ] +} diff --git a/tests/unit/checks/generictests/datasets/df_win_regression.py b/tests/unit/checks/generictests/datasets/df_win_regression.py new file mode 100644 index 0000000..4ba11d0 --- /dev/null +++ b/tests/unit/checks/generictests/datasets/df_win_regression.py @@ -0,0 +1,43 @@ + + +checkname = 'df' + + +info = [[u'C:\\', u'NTFS', u'8192620', u'7724268', u'468352', u'95%', u'C:\\'], + [u'New_Volume', u'NTFS', u'10240796', u'186256', u'10054540', u'2%', u'E:\\'], + [u'New_Volume', + u'NTFS', + u'124929596', + u'50840432', + u'74089164', + u'41%', + u'F:\\']] + + +discovery = {'': [(u'C:/', {}), (u'E:/', {}), (u'F:/', {})]} + + +checks = {'': [(u'C:/', 'default', + [(2, '94.3% used (7.37 of 7.81 GB), (warn/crit at 80.00/90.00%), trend: 0.00 B / 24 hours', + [(u'C:/', 7543.23046875, 6400.484375, 7200.544921875, 0, 8000.60546875), + ('fs_size', 8000.60546875, None, None, None, None), + ('growth', 0.0, None, None, None, None), + ('trend', 0, None, None, 0, 333.3585611979167)])]), + (u'New_Volume E:/', 'default', + [(0, '1.82% used (181.89 MB of 9.77 GB), trend: 0.00 B / 24 hours', + [(u'E:/', 181.890625, 8000.621875, 9000.699609375, 0, 10000.77734375), + ('fs_size', 10000.77734375, None, None, None, None), + ('growth', 0.0, None, None, None, None), + ('trend', 0, None, None, 0, 416.6990559895833)])]), + (u'E:/', 'default', + [(0, '1.82% used (181.89 MB of 9.77 GB), trend: 0.00 B / 24 hours', + [(u'E:/', 181.890625, 8000.621875, 9000.699609375, 0, 10000.77734375), + ('fs_size', 10000.77734375, None, None, None, None), + ('growth', 0.0, None, None, None, None), + ('trend', 0, None, None, 0, 416.6990559895833)])]), + (u'F:/', 'default', + [(0, '40.7% used (48.49 of 119.14 GB), trend: 0.00 B / 24 hours', + [(u'F:/', 49648.859375, 97601.246875, 109801.402734375, 0, 122001.55859375), + ('fs_size', 122001.55859375, None, None, None, None), + ('growth', 0.0, None, None, None, None), + ('trend', 0, None, None, 0, 5083.398274739583)])])]} diff --git a/tests/unit/checks/test_df_check.py b/tests/unit/checks/test_df_check.py index 51e9e55..4c023e5 100644 --- a/tests/unit/checks/test_df_check.py +++ b/tests/unit/checks/test_df_check.py @@ -240,10 +240,8 @@ info_empty_inodes = [ @pytest.mark.parametrize("info,expected_result,inventory_df_rules", [ ([], [], {}), - (info_df_lnx, [(u'/', {})], {}), # Linux (info_df_lnx, [(u'/', {})], { "include_volume_name" : False }), # Linux w/ volume name unset (info_df_lnx, [(u'/dev/sda4 /', {})], { "include_volume_name" : True}), # Linux w/ volume name option - (info_df_win, [(u'E:/', {}), (u'F:/', {}), (u'C:/', {})], {}), # Windows (info_df_win, [(u'New_Volume E:/', {}), (u'New_Volume F:/', {}), (u'C:\\ C:/', {})], { "include_volume_name" : True }), # Windows w/ volume name option (info_df_lnx_tmpfs, [], {}), # Ignoring tmpfs @@ -279,12 +277,7 @@ def test_df_discovery_with_parse(check_manager, info, expected_result, inventory @pytest.mark.parametrize("item,params,info,expected_result", [ - (u"/", "default", info_df_lnx, {}), - (u'/dev/sda4 /', "default", info_df_lnx, {}), - (u'E:/', "default", info_df_win, {}), - (u'New_Volume E:/', "default", info_df_win, {}), (u'btrfs /dev/sda1', "default", info_df_btrfs, {}), - (u"/home", "default", info_df_lnx, {}), # When called with an item not found in info, the check should not crash. ]) def test_df_check_with_parse(check_manager, item, params, info, expected_result): check = check_manager.get_check("df")

5 years, 8 months

Centralized cmk.i18n _() stub and added type infos

by Lars Michelsen

Module: check_mk Branch: master Commit: e86db4f1b117d1b00e8e1171ebfbcac615914bdf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e86db4f1b117d1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 13 21:09:07 2018 +0200 Centralized cmk.i18n _() stub and added type infos Change-Id: I2fac819c2002179172c5dcd4946f17799ade8fa8 --- cmk/__init__.py | 9 +-------- cmk/cpu_tracking.py | 5 ----- cmk/defines.py | 9 +-------- cmk/ec/defaults.py | 11 +---------- cmk/exceptions.py | 10 +--------- cmk/i18n.py | 37 +++++++++++++++++++++++++++++++++++++ cmk/man_pages.py | 12 ++---------- cmk/paths.py | 13 ------------- cmk/regex.py | 13 ++++--------- cmk/render.py | 8 +------- cmk/store.py | 12 ++---------- cmk/werks.py | 11 ++--------- 12 files changed, 52 insertions(+), 98 deletions(-) diff --git a/cmk/__init__.py b/cmk/__init__.py index f650ace..902a3ca 100644 --- a/cmk/__init__.py +++ b/cmk/__init__.py @@ -35,14 +35,7 @@ import os import cmk.paths from cmk.exceptions import MKGeneralException - -# TODO: Clean this up one day by using the way recommended by gettext. -# (See https://docs.python.org/2/library/gettext.html). For this we -# need the path to the locale files here. -try: - _ -except NameError: - _ = lambda x: x # Fake i18n when not available +from cmk.i18n import _ def omd_version(): return os.path.basename(os.readlink(cmk.paths.omd_root + "/version")) diff --git a/cmk/cpu_tracking.py b/cmk/cpu_tracking.py index 76fad2a..f4ad90f 100644 --- a/cmk/cpu_tracking.py +++ b/cmk/cpu_tracking.py @@ -29,11 +29,6 @@ import time import cmk_base.console as console -try: - _ -except NameError: - _ = lambda x: x # Fake i18n when not available - # TODO: Move state out of module scope # TODO: This should be rewritten to a context manager object. See cmk.profile for # an example how it could look like. diff --git a/cmk/defines.py b/cmk/defines.py index fb53b0e..dcd995a 100644 --- a/cmk/defines.py +++ b/cmk/defines.py @@ -27,14 +27,7 @@ """This module serves constants which are needed in several components of Check_MK.""" -# TODO: Clean this up one day by using the way recommended by gettext. -# (See https://docs.python.org/2/library/gettext.html). For this we -# need the path to the locale files here. -try: - _ -except NameError: - _ = lambda x: x # Fake i18n when not available - +from cmk.i18n import _ # TODO: Investigate Check_MK code for more defines and other places # where similar strucures are defined and use the things from diff --git a/cmk/ec/defaults.py b/cmk/ec/defaults.py index 07485d8..7e5c4fe 100644 --- a/cmk/ec/defaults.py +++ b/cmk/ec/defaults.py @@ -28,16 +28,7 @@ from typing import Any, AnyStr, Dict, List # pylint: disable=unused-import import cmk.log -# Clean this up one day by using the way recommended by gettext. -# (See https://docs.python.org/2/library/gettext.html). For this we -# need the path to the locale files here. -try: - _ -except NameError: - # Fake i18n when not available - def _(string): - # type: (AnyStr) -> AnyStr - return string +from cmk.i18n import _ def default_rule_pack(rules): diff --git a/cmk/exceptions.py b/cmk/exceptions.py index 1ac4350..9b50e66 100644 --- a/cmk/exceptions.py +++ b/cmk/exceptions.py @@ -24,15 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. - -# TODO: Clean this up one day by using the way recommended by gettext. -# (See https://docs.python.org/2/library/gettext.html). For this we -# need the path to the locale files here. -try: - _ -except NameError: - _ = lambda x: x # Fake i18n when not available - +from cmk.i18n import _ # never used directly in the code. Just some wrapper to make all of our # exceptions handleable with one call diff --git a/cmk/i18n.py b/cmk/i18n.py new file mode 100644 index 0000000..96f3bd5 --- /dev/null +++ b/cmk/i18n.py @@ -0,0 +1,37 @@ +#!/usr/bin/env python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2016 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. + +"""Stub for future i18n code on cmk main module level""" + +from typing import AnyStr, Text # pylint:disable=unused-import + +# TODO: Clean this up one day by using the way recommended by gettext. +# (See https://docs.python.org/2/library/gettext.html). For this we +# need the path to the locale files here. +# Fake i18n when not available +def _(string): + # type: (AnyStr) -> Text + return string diff --git a/cmk/man_pages.py b/cmk/man_pages.py index 2dc6bef..7afb3f0 100644 --- a/cmk/man_pages.py +++ b/cmk/man_pages.py @@ -41,16 +41,8 @@ import cmk.debug import cmk.paths import cmk.tty as tty -from .exceptions import MKGeneralException - -# TODO: Clean this up one day by using the way recommended by gettext. -# (See https://docs.python.org/2/library/gettext.html). For this we -# need the path to the locale files here. -try: - _ -except NameError: - _ = lambda x: x # Fake i18n when not available - +from cmk.exceptions import MKGeneralException +from cmk.i18n import _ catalog_titles = { "hw" : "Appliances, other dedicated Hardware", diff --git a/cmk/paths.py b/cmk/paths.py index 5398b2f..7986296 100644 --- a/cmk/paths.py +++ b/cmk/paths.py @@ -29,15 +29,6 @@ to all components of Check_MK.""" import os -# TODO: Clean this up one day by using the way recommended by gettext. -# (See https://docs.python.org/2/library/gettext.html). For this we -# need the path to the locale files here. -try: - _ -except NameError: - _ = lambda x: x # Fake i18n when not available - - # # First declare the possible paths for the linters. Then set it within _set_paths() # @@ -155,10 +146,6 @@ def _set_paths(): def _omd_root(): return os.environ.get("OMD_ROOT", "") - #try: - #except KeyError: - # raise MKGeneralException(_("OMD_ROOT environment variable not set. You can " - # "only execute this in an OMD site.")) def _set_core_specific_paths(): diff --git a/cmk/regex.py b/cmk/regex.py index 374c5db..f4be0db 100644 --- a/cmk/regex.py +++ b/cmk/regex.py @@ -27,17 +27,12 @@ """This module wraps some regex handling functions used by Check_MK""" import re -from .exceptions import MKGeneralException +from typing import Dict, Pattern # pylint:disable=unused-import -# TODO: Clean this up one day by using the way recommended by gettext. -# (See https://docs.python.org/2/library/gettext.html). For this we -# need the path to the locale files here. -try: - _ -except NameError: - _ = lambda x: x # Fake i18n when not available +from cmk.exceptions import MKGeneralException +from cmk.i18n import _ -g_compiled_regexes = {} +g_compiled_regexes = {} # type: Dict[str, Pattern] def regex(pattern): """Compile regex or look it up in already compiled regexes. diff --git a/cmk/render.py b/cmk/render.py index 85642a6..b964dfe 100644 --- a/cmk/render.py +++ b/cmk/render.py @@ -33,13 +33,7 @@ are just for optical output purposes.""" import time import math -# TODO: Clean this up one day by using the way recommended by gettext. -# (See https://docs.python.org/2/library/gettext.html). For this we -# need the path to the locale files here. -try: - _ -except NameError: - _ = lambda x: x # Fake i18n when not available +from cmk.i18n import _ #. # .--Date/Time-----------------------------------------------------------. diff --git a/cmk/store.py b/cmk/store.py index fbc3fad..d7a68c2 100644 --- a/cmk/store.py +++ b/cmk/store.py @@ -36,20 +36,12 @@ import pprint import tempfile import time -from .exceptions import MKGeneralException +from cmk.exceptions import MKGeneralException +from cmk.i18n import _ # TODO: Make all methods handle paths the same way. e.g. mkdir() and makedirs() # care about encoding a path to UTF-8. The others don't to that. -# TODO: Clean this up one day by using the way recommended by gettext. -# (See https://docs.python.org/2/library/gettext.html). For this we -# need the path to the locale files here. -try: - _ -except NameError: - _ = lambda x: x # Fake i18n when not available - - #. #. # .--Directories---------------------------------------------------------. diff --git a/cmk/werks.py b/cmk/werks.py index ab1c730..f46a20d 100644 --- a/cmk/werks.py +++ b/cmk/werks.py @@ -32,15 +32,8 @@ import json import cmk.paths -from .exceptions import MKGeneralException - -# TODO: Clean this up one day by using the way recommended by gettext. -# (See https://docs.python.org/2/library/gettext.html). For this we -# need the path to the locale files here. -try: - _ -except NameError: - _ = lambda x: x # Fake i18n when not available +from cmk.exceptions import MKGeneralException +from cmk.i18n import _ def werk_classes():

5 years, 8 months

Cleaned up analyze configuration registration

by Lars Michelsen

Module: check_mk Branch: master Commit: 01dc7b71b2a2658854b820e866b20a6e77a14b5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01dc7b71b2a265… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 18 18:25:14 2018 +0200 Cleaned up analyze configuration registration * Instead of __subclass__ magic it uses the standard plugin_registry based approach. We assume that no one has built his own ACTests, so we don't try to be compatible to the old approach. * Add a test for correctly registered tests. Change-Id: I3094230ce743f87f1d95c5e8c0073e56d48d0591 --- cmk/gui/plugins/wato/__init__.py | 1 + cmk/gui/plugins/wato/ac_tests.py | 37 ++++++++++++++++++++++++++-------- cmk/gui/plugins/wato/utils/__init__.py | 1 + cmk/gui/watolib.py | 19 ++++++++++++----- tests/unit/cmk/gui/test_watolib.py | 27 +++++++++++++++++++++++++ 5 files changed, 72 insertions(+), 13 deletions(-) diff --git a/cmk/gui/plugins/wato/__init__.py b/cmk/gui/plugins/wato/__init__.py index f42521b..9c5a8f9 100644 --- a/cmk/gui/plugins/wato/__init__.py +++ b/cmk/gui/plugins/wato/__init__.py @@ -45,6 +45,7 @@ from cmk.gui.plugins.wato.utils import ( ACResultWARN, ACTest, ACTestCategories, + ac_test_registry, add_change, add_replication_paths, changelog_button, diff --git a/cmk/gui/plugins/wato/ac_tests.py b/cmk/gui/plugins/wato/ac_tests.py index 3fb7d24..073656f 100644 --- a/cmk/gui/plugins/wato/ac_tests.py +++ b/cmk/gui/plugins/wato/ac_tests.py @@ -37,14 +37,17 @@ from cmk.gui.i18n import _ from cmk.gui.globals import html from cmk.gui.exceptions import MKGeneralException -from . import \ - ACTestCategories, \ - ACTest, \ - ACResultCRIT, \ - ACResultWARN, \ - ACResultOK, \ - ConfigDomainOMD - +from cmk.gui.plugins.wato import ( + ACTestCategories, + ACTest, + ac_test_registry, + ACResultCRIT, + ACResultWARN, + ACResultOK, + ConfigDomainOMD, +) + +(a)ac_test_registry.register class ACTestPersistentConnections(ACTest): def category(self): return ACTestCategories.performance @@ -93,6 +96,7 @@ class ACTestPersistentConnections(ACTest): +(a)ac_test_registry.register class ACTestLiveproxyd(ACTest): def category(self): return "performance" @@ -127,6 +131,7 @@ class ACTestLiveproxyd(ACTest): +(a)ac_test_registry.register class ACTestLivestatusUsage(ACTest): def category(self): return ACTestCategories.performance @@ -176,6 +181,7 @@ class ACTestLivestatusUsage(ACTest): +(a)ac_test_registry.register class ACTestTmpfs(ACTest): def category(self): return ACTestCategories.performance @@ -223,6 +229,7 @@ class ACTestTmpfs(ACTest): +(a)ac_test_registry.register class ACTestLDAPSecured(ACTest): def category(self): return ACTestCategories.security @@ -258,6 +265,7 @@ class ACTestLDAPSecured(ACTest): +(a)ac_test_registry.register class ACTestNumberOfUsers(ACTest): def category(self): return ACTestCategories.performance @@ -292,6 +300,7 @@ class ACTestNumberOfUsers(ACTest): +(a)ac_test_registry.register class ACTestHTTPSecured(ACTest): def category(self): return ACTestCategories.security @@ -321,6 +330,7 @@ class ACTestHTTPSecured(ACTest): +(a)ac_test_registry.register class ACTestOldDefaultCredentials(ACTest): def category(self): return ACTestCategories.security @@ -353,6 +363,7 @@ class ACTestOldDefaultCredentials(ACTest): +(a)ac_test_registry.register class ACTestBackupConfigured(ACTest): def category(self): return ACTestCategories.reliability @@ -387,6 +398,7 @@ class ACTestBackupConfigured(ACTest): +(a)ac_test_registry.register class ACTestBackupNotEncryptedConfigured(ACTest): def category(self): return ACTestCategories.security @@ -452,6 +464,7 @@ class ACApacheTest(ACTest): +(a)ac_test_registry.register class ACTestApacheNumberOfProcesses(ACApacheTest): def category(self): return ACTestCategories.performance @@ -536,6 +549,7 @@ class ACTestApacheNumberOfProcesses(ACApacheTest): +(a)ac_test_registry.register class ACTestApacheProcessUsage(ACApacheTest): def category(self): return ACTestCategories.performance @@ -578,6 +592,7 @@ class ACTestApacheProcessUsage(ACApacheTest): +(a)ac_test_registry.register class ACTestCheckMKHelperUsage(ACTest): def category(self): return ACTestCategories.performance @@ -640,6 +655,7 @@ class ACTestCheckMKHelperUsage(ACTest): +(a)ac_test_registry.register class ACTestAlertHandlerEventTypes(ACTest): def category(self): return ACTestCategories.performance @@ -668,6 +684,7 @@ class ACTestAlertHandlerEventTypes(ACTest): +(a)ac_test_registry.register class ACTestGenericCheckHelperUsage(ACTest): def category(self): return ACTestCategories.performance @@ -722,6 +739,7 @@ class ACTestGenericCheckHelperUsage(ACTest): +(a)ac_test_registry.register class ACTestSizeOfExtensions(ACTest): def category(self): return ACTestCategories.performance @@ -769,6 +787,8 @@ class ACTestSizeOfExtensions(ACTest): return int(subprocess.check_output(["du", "-sb", "%s/local" % cmk.paths.omd_root]).split()[0]) + +(a)ac_test_registry.register class ACTestESXDatasources(ACTest): def category(self): return ACTestCategories.deprecations @@ -806,6 +826,7 @@ class ACTestESXDatasources(ACTest): yield ACResultOK(_("No configured rules are affected")) +(a)ac_test_registry.register class ACTestRulebasedNotifications(ACTest): def category(self): return ACTestCategories.deprecations diff --git a/cmk/gui/plugins/wato/utils/__init__.py b/cmk/gui/plugins/wato/utils/__init__.py index ef8461a..2be1bbd 100644 --- a/cmk/gui/plugins/wato/utils/__init__.py +++ b/cmk/gui/plugins/wato/utils/__init__.py @@ -92,6 +92,7 @@ from cmk.gui.watolib import ( ValueSpecAttribute, ACTestCategories, ACTest, + ac_test_registry, ACResultCRIT, ACResultWARN, ACResultOK, diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index 3ebf4b4..8aaa067 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -83,6 +83,7 @@ import cmk.gui.log as log import cmk.gui.background_job as background_job import cmk.gui.gui_background_job as gui_background_job import cmk.gui.weblib as weblib +import cmk.gui.plugin_registry from cmk.gui.i18n import _u, _ from cmk.gui.globals import html from cmk.gui.htmllib import HTML @@ -10226,13 +10227,21 @@ class ACTest(object): +class ACTestRegistry(cmk.gui.plugin_registry.ClassRegistry): + def plugin_base_class(self): + return ACTest + + + def _register(self, plugin_class): + self._entries[plugin_class.__name__] = plugin_class + + +ac_test_registry = ACTestRegistry() + + def check_analyze_config(): results = [] - # TODO: I'll clean up this plugin mechanism soon - for test_cls in ACTest.__subclasses__(): # pylint: disable=no-member - if test_cls.__subclasses__(): # pylint: disable=no-member - continue # Only use leaf classes - + for test_cls in ac_test_registry.values(): test = test_cls() if not test.is_relevant(): diff --git a/tests/unit/cmk/gui/test_watolib.py b/tests/unit/cmk/gui/test_watolib.py new file mode 100644 index 0000000..58f45d2 --- /dev/null +++ b/tests/unit/cmk/gui/test_watolib.py @@ -0,0 +1,27 @@ + +import cmk.gui.watolib as watolib + +def test_registered_ac_tests(): + registered_plugins = sorted(watolib.ac_test_registry.keys()) + assert registered_plugins == [ + 'ACTestAlertHandlerEventTypes', + 'ACTestApacheNumberOfProcesses', + 'ACTestApacheProcessUsage', + 'ACTestBackupConfigured', + 'ACTestBackupNotEncryptedConfigured', + 'ACTestCheckMKHelperUsage', + 'ACTestESXDatasources', + 'ACTestGenericCheckHelperUsage', + 'ACTestHTTPSecured', + 'ACTestLDAPSecured', + 'ACTestLiveproxyd', + 'ACTestLivestatusUsage', + 'ACTestNumberOfUsers', + 'ACTestOldDefaultCredentials', + 'ACTestPersistentConnections', + 'ACTestRulebasedNotifications', + 'ACTestSecureAgentUpdaterTransport', + 'ACTestSecureNotificationSpoolerMessages', + 'ACTestSizeOfExtensions', + 'ACTestTmpfs' + ]

5 years, 8 months

6841 FIX Fixed missing hostname in graph collection graph titles

by Lars Michelsen

Module: check_mk Branch: master Commit: e1b1c4a580f7d34470c7c0588e6e3929a9e4630c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1b1c4a580f7d3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 18 17:18:43 2018 +0200 6841 FIX Fixed missing hostname in graph collection graph titles Change-Id: I7405187e121c98feb23fd1d9def1278e3128552f --- .werks/6841 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/6841 b/.werks/6841 new file mode 100644 index 0000000..8367f6c --- /dev/null +++ b/.werks/6841 @@ -0,0 +1,11 @@ +Title: Fixed missing hostname in graph collection graph titles +Level: 1 +Component: metrics +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1539875901 + +

5 years, 8 months

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