Checkmk git commits August 2017

checkmk-commits@lists.checkmk.com

10 participants
201 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 7a0a7df9bae175008c9026b257bb7fc7a6dedcb1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a0a7df9bae175… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 18 21:17:03 2017 +0200 Use site python for integration tests Change-Id: Id774a51401d68d809bf85bef36517cdb91cbd323 --- tests/Makefile | 12 +---------- tests/pylint/Makefile | 2 +- tests/pylint/requirements.txt | 2 ++ tests/requirements.txt | 9 ++++++++ tests/testlib/__init__.py | 20 +++++++++++++++--- tests/web/conftest.py | 49 +++++++++++++++++++++++++++++++++++++++++++ tests/web/test_backup.py | 24 +++++++++++++++++++++ tests/web/test_escaping.py | 5 ----- 8 files changed, 103 insertions(+), 20 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index a6055f2..b94e7cc 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -47,17 +47,7 @@ test-bandit-ci: setup: sudo apt-get install \ python-pip \ - python-lxml \ - python-enchant \ - python-lockfile \ chrpath sudo pip install --upgrade pip - sudo pip install --upgrade \ - pytest \ - requests \ - beautifulsoup4 \ - pytest-stepwise \ - dill \ - html5lib \ - bandit + sudo pip install --upgrade -r requirements.txt $(MAKE) -C pylint setup diff --git a/tests/pylint/Makefile b/tests/pylint/Makefile index fcedd33..9572d61 100644 --- a/tests/pylint/Makefile +++ b/tests/pylint/Makefile @@ -2,6 +2,6 @@ help: @echo "see make in tests/ directory" setup: - sudo pip install --upgrade pylint==1.6.4 + sudo pip install --upgrade -r requirements.txt sudo apt-get install \ enchant diff --git a/tests/pylint/requirements.txt b/tests/pylint/requirements.txt new file mode 100644 index 0000000..9a91342 --- /dev/null +++ b/tests/pylint/requirements.txt @@ -0,0 +1,2 @@ +pylint==1.6.4 +pyenchant diff --git a/tests/requirements.txt b/tests/requirements.txt new file mode 100644 index 0000000..b6156ae --- /dev/null +++ b/tests/requirements.txt @@ -0,0 +1,9 @@ +pytest +requests +beautifulsoup4 +pytest-stepwise +dill +html5lib +bandit +lockfile +lxml diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index e49ded7..6298c5d 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -371,11 +371,13 @@ class Site(object): assert exit_code == 0 assert os.path.exists("/omd/sites/%s" % self.id) + self._enable_mod_python_debug() + + self._install_test_python_modules() + if self.update_with_git: self._update_with_f12_files() - self._enable_mod_python_debug() - # When using the Git version, the original version files will be # replaced by the .f12 scripts. When tests are running in parallel @@ -481,6 +483,18 @@ class Site(object): "PythonHandler index\n PythonDebug On")) + def _install_test_python_modules(self): + for file_name in os.listdir("/usr/local/lib/python2.7/dist-packages"): + target_path = self.path("local/lib/python/"+file_name) + if not os.path.exists(target_path): + assert os.system("sudo ln -s /usr/local/lib/python2.7/dist-packages/%s %s" % + (file_name, target_path)) >> 8 == 0 + #assert self.execute(["pip", "install", + # "-r", os.path.join(cmk_path(), "tests", "requirements.txt"), + # "-r", os.path.join(cmk_path(), "tests", "pylint", "requirements.txt"), + # ]).wait() == 0 + + def rm_if_not_reusing(self): if not self.reuse: self.rm() @@ -626,7 +640,7 @@ class Site(object): if "WORKSPACE" in os.environ: env_var_str = "WORKSPACE='%s' " % os.environ["WORKSPACE"] - cmd = env_var_str + subprocess.list2cmdline(sys.argv + [ cmk_path() + "/tests" ]) + cmd = env_var_str + subprocess.list2cmdline(["python"] + sys.argv + [ cmk_path() + "/tests" ]) args = [ "/usr/bin/sudo", "--", "/bin/su", "-l", self.id, "-c", cmd ] return subprocess.call(args) diff --git a/tests/web/conftest.py b/tests/web/conftest.py index 82f8066..31bf9e1 100644 --- a/tests/web/conftest.py +++ b/tests/web/conftest.py @@ -1,4 +1,5 @@ import __builtin__ +import sys import _pytest import testlib import cmk @@ -10,3 +11,51 @@ monkeypatch.syspath_prepend("%s/web/htdocs" % (testlib.cmk_path())) # Fake the localization wrapper _(...) monkeypatch.setattr(__builtin__, "_", lambda x: x, raising=False) + +# Fake mod_python.apache to make html_mod_python.py stuff importable +class FakeModPythonUnderscoreApache(object): + # These are all fake values! + SERVER_RETURN = None + AP_CONN_UNKNOWN = None + AP_CONN_CLOSE = None + AP_CONN_KEEPALIVE = None + APR_NOFILE = None + APR_REG = None + APR_DIR = None + APR_CHR = None + APR_BLK = None + APR_PIPE = None + APR_LNK = None + APR_SOCK = None + APR_UNKFILE = None + + def parse_qs(self, *args, **kwargs): + raise NotImplemented() + + def parse_qsl(self, *args, **kwargs): + raise NotImplemented() + + def table(self, *args, **kwargs): + raise NotImplemented() + + def log_error(self, *args, **kwargs): + raise NotImplemented() + + def config_tree(self, *args, **kwargs): + raise NotImplemented() + + def server_root(self, *args, **kwargs): + raise NotImplemented() + + def mpm_query(self, *args, **kwargs): + raise NotImplemented() + + def exists_config_define(self, *args, **kwargs): + raise NotImplemented() + + def stat(self, *args, **kwargs): + raise NotImplemented() + + +monkeypatch.setitem(sys.modules, "_apache", FakeModPythonUnderscoreApache()) + diff --git a/tests/web/test_backup.py b/tests/web/test_backup.py new file mode 100644 index 0000000..df977fe --- /dev/null +++ b/tests/web/test_backup.py @@ -0,0 +1,24 @@ +# encoding: utf-8 + +def test_backup_key_create_web(site, monkeypatch): + if site.file_exists("etc/check_mk/backup_keys.mk"): + site.delete_file("etc/check_mk/backup_keys.mk") + + import wato + mode = wato.ModeBackupEditKey() + + try: + # First create a backup key + key_dict = mode._create_key({ + "alias": u"älias", + "passphrase": "passphra$e", + }) + + assert site.file_exists("etc/check_mk/backup_keys.mk") + + # Then test key existance + test_mode = wato.ModeBackupEditKey() + keys = test_mode.load() + assert len(keys) == 1 + finally: + site.delete_file("etc/check_mk/backup_keys.mk") diff --git a/tests/web/test_escaping.py b/tests/web/test_escaping.py index 2078d91..50ecdbf 100644 --- a/tests/web/test_escaping.py +++ b/tests/web/test_escaping.py @@ -2,11 +2,6 @@ # call using # > py.test -s -k test_HTML_generator.py -# enable imports from web directory -from testlib import cmk_path -import sys -sys.path.insert(0, "%s/web/htdocs" % cmk_path()) - # external imports import re

6 years, 10 months

Tests: Wait up to 10 seconds for EC/core config reload now

by Lars Michelsen

Module: check_mk Branch: master Commit: 4b41eaf0ab29570faf722be19258c9f4557c4118 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b41eaf0ab2957… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 31 11:00:48 2017 +0200 Tests: Wait up to 10 seconds for EC/core config reload now Change-Id: Id0833ba72a0d2a61f66cee5b637e4179e5906aa3 --- tests/testlib/__init__.py | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 47eda37..e49ded7 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -1136,6 +1136,8 @@ class CMKWebSession(WebSession): if allow_foreign_changes != None: request["allow_foreign_changes"] = "1" if allow_foreign_changes else "0" + old_t = self.site.live.query_value("GET status\nColumns: program_start\n") + time_started = time.time() result = self._api_request("webapi.py?action=activate_changes", { "request": json.dumps(request), @@ -1149,15 +1151,21 @@ class CMKWebSession(WebSession): "Failed to activate %s: %r" % (site_id, status) assert status["_time_ended"] > time_started - # HACK: Activating changes can involve an asynchronous(!) monitoring + # Activating changes can involve an asynchronous(!) monitoring # core restart/reload, so e.g. querying a Livestatus table immediately - # might not reflect the changes yet. The right way to handle this would - # be polling the "program_start" column of the "status" table until the - # reload is complete. But this will only work if there is an actual - # restart/reload involved, which we don't know here, only our caller. - # Ugly workaround: Wait a moment and hope for the best, wasting a few - # seconds is better than a false positive during testing... >:-P - time.sleep(2) + # might not reflect the changes yet. Ask the core for a successful reload. + def config_reloaded(): + new_t = self.site.live.query_value("GET status\nColumns: program_start\n") + print "New config load time: %s" % new_t + return new_t > old_t + + reload_time, timeout = time.time(), 10 + while not config_reloaded(): + if time.time() > reload_time + timeout: + raise Exception("Config did not update within %d seconds" % timeout) + time.sleep(0.2) + + assert config_reloaded() def get_regular_graph(self, hostname, service_description, graph_index, expect_error=False): @@ -1246,11 +1254,19 @@ class CMKEventConsole(CMKWebSession): assert old_t > time.time() - 86400 super(CMKEventConsole, self).activate_changes(allow_foreign_changes=True) - time.sleep(1) - new_t = web.site.live.query_value("GET eventconsolestatus\nColumns: status_config_load_time\n") - print "New config load time: %s" % new_t - assert new_t > old_t + def config_reloaded(): + new_t = web.site.live.query_value("GET eventconsolestatus\nColumns: status_config_load_time\n") + print "New config load time: %s" % new_t + return new_t > old_t + + reload_time, timeout = time.time(), 10 + while not config_reloaded(): + if time.time() > reload_time + timeout: + raise Exception("Config did not update within %d seconds" % timeout) + time.sleep(0.2) + + assert config_reloaded()

6 years, 10 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 1269554b96927464b9fd62390731eae5767b7882 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1269554b969274… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 31 09:13:43 2017 +0200 Reserved 20 Werk IDS Change-Id: I2d1bd4befb4e67e5e6c0f2f012d9894c2b1f66dc --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 6f8556c..814974a 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5168 +5188

6 years, 10 months

5168 FIX Fixed highlighting of rules when searching for ineffective rules

by Lars Michelsen

Module: check_mk Branch: master Commit: c741f82b41e7fb35ad56c684dd517907b010da0d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c741f82b41e7fb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 31 09:14:14 2017 +0200 5168 FIX Fixed highlighting of rules when searching for ineffective rules Change-Id: I9537c99e7d0d026f111676a7ef2b5c5ab2139e9b --- .werks/5168 | 10 ++++++++++ web/htdocs/wato.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/5168 b/.werks/5168 new file mode 100644 index 0000000..5dd16ba --- /dev/null +++ b/.werks/5168 @@ -0,0 +1,10 @@ +Title: Fixed highlighting of rules when searching for ineffective rules +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1504163636 +Class: fix + + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 6e0f953..233d907 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12926,7 +12926,7 @@ class ModeEditRuleset(WatoMode): if ruleset.has_rule_search_options(search_options) \ and rule.matches_search(search_options) \ - and ("fulltext" in search_options and not ruleset.matches_fulltext_search(search_options)): + and ("fulltext" not in search_options or not ruleset.matches_fulltext_search(search_options)): css.append("matches_search") table.row(css=" ".join(css) if css else None)

6 years, 10 months

5057 FIX Fixed cancelling events by "syslog application" when using similar rules

by Lars Michelsen

Module: check_mk Branch: master Commit: 00396545f0eb7a95d178266f91e33ee2bf5908bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00396545f0eb7a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 30 16:05:04 2017 +0200 5057 FIX Fixed cancelling events by "syslog application" when using similar rules When using two or more rules that both have a "match syslog application" condition and a "syslog application to cancel event" condition while all other conditions are equal, it could happen that the first rule always caught messages that should not be caught by that rule. These messages were not handled by the second rule as expected. Change-Id: Icdb5a02711ad43e411f89820c8bc3dc4d91087fd --- .werks/5057 | 13 +++++++++++++ bin/mkeventd | 23 +++++++++++++---------- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/.werks/5057 b/.werks/5057 new file mode 100644 index 0000000..bd1c867 --- /dev/null +++ b/.werks/5057 @@ -0,0 +1,13 @@ +Title: Fixed cancelling events by "syslog application" when using similar rules +Level: 1 +Component: ec +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1504101697 +Class: fix + +When using two or more rules that both have a "match syslog application" condition and a +"syslog application to cancel event" condition while all other conditions are equal, it +could happen that the first rule always caught messages that should not be caught by that +rule. These messages were not handled by the second rule as expected. diff --git a/bin/mkeventd b/bin/mkeventd index 2467f42..61e0f5e 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -2459,11 +2459,21 @@ class EventServer(object): self.logger.info(" did not match because of wrong source IP address '%s' (need '%s')" % (event["ipaddress"], rule.get("match_ipaddress"))) return False + cancel_by_application = False + if "cancel_application" in rule: + cancel_by_application = match(rule.get("cancel_application"), + event["application"], + complete=False) != False + if match(rule.get("match_application"), event["application"], complete=False) == False \ - and "cancel_application" not in rule: + and not cancel_by_application: if debug: - self.logger.info(" did not match because of wrong application '%s' (need '%s')" % - (event["application"], pattern(rule.get("match_application")))) + need_msg = "need %r" % pattern(rule.get("match_application")) + if "cancel_application" in rule: + need_msg += " or %r for cancelling" % pattern(rule.get("cancel_application")) + + self.logger.info(" did not match because of wrong application '%s' (%s)" % + (event["application"], need_msg)) return False if "match_facility" in rule and event["facility"] != rule["match_facility"]: @@ -2483,13 +2493,6 @@ class EventServer(object): else: cp = True - if "cancel_application" in rule: - cancel_by_application = match(rule.get("cancel_application"), - event["application"], - complete=False) != False - else: - cancel_by_application = True - match_groups = match(rule.get("match_ok", ""), event["text"], complete = False) if match_groups != False and cp and cancel_by_application: if debug:

6 years, 10 months

Remove superfluous wrapper function

by Konstantin Büttner

Module: check_mk Branch: master Commit: 056125926e7ee7793c6fcc54461f48345a439d4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=056125926e7ee7… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Aug 30 15:33:05 2017 +0200 Remove superfluous wrapper function Change-Id: I1b0bae1d983e25af91b8bf9a7e928cc4934db7b5 --- checks/df.include | 3 --- checks/hp_msa_volume | 2 +- checks/oracle_asm_diskgroup | 4 ++-- checks/ucd_disk | 2 +- checks/vms_diskstat | 2 +- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/checks/df.include b/checks/df.include index 228c0da..7e2e2d1 100644 --- a/checks/df.include +++ b/checks/df.include @@ -243,9 +243,6 @@ def get_filesystem_levels(mountpoint, size_gb, params): return levels -# Legacy function for checks that do not support groups yet -def df_check_filesystem(hostname, mountpoint, size_mb, avail_mb, reserved_mb, params): - return df_check_filesystem_list(mountpoint, params, [(mountpoint, size_mb, avail_mb, reserved_mb)]) # New function for checks that support groups. def df_check_filesystem_list(item, params, fslist_blocks, fslist_inodes = None): diff --git a/checks/hp_msa_volume b/checks/hp_msa_volume index 54a8e8b..cfed4d3 100644 --- a/checks/hp_msa_volume +++ b/checks/hp_msa_volume @@ -195,7 +195,7 @@ def check_hp_msa_volume_df(item, params, parsed): alloc_mb = (int(parsed[item]["allocated-size-numeric"]) * 512) / 1024 ** 2 avail_mb = size_mb - alloc_mb - yield df_check_filesystem(host_name(), item, size_mb, avail_mb, 0, params) + yield df_check_filesystem_single(item, size_mb, avail_mb, 0, None, None, params) check_info['hp_msa_volume.df'] = { diff --git a/checks/oracle_asm_diskgroup b/checks/oracle_asm_diskgroup index 168bc90..796cea2 100644 --- a/checks/oracle_asm_diskgroup +++ b/checks/oracle_asm_diskgroup @@ -149,8 +149,8 @@ def check_oracle_asm_diskgroup(item, params, parsed): # EXTERNAL Redundancy free_space_mb = int(free_mb) - status, infotext, perfdata = df_check_filesystem(host_name(), item, int(total_mb), - free_space_mb, 0, params) + status, infotext, perfdata = df_check_filesystem_single(item, int(total_mb), + free_space_mb, 0, None, None, params) if disktype is not None: infotext += ', %s redundancy' % disktype.lower() infotext += add_text diff --git a/checks/ucd_disk b/checks/ucd_disk index 707d1f2..0173e50 100644 --- a/checks/ucd_disk +++ b/checks/ucd_disk @@ -38,7 +38,7 @@ def check_ucd_disk(item, params, info): if disk_path == item: disk_total_mb = float(disk_total_str) / 1024 disk_avail_mb = float(disk_avail_str) / 1024 - return df_check_filesystem(host_name(), item, disk_total_mb, disk_avail_mb, 0, params) + return df_check_filesystem_single(item, disk_total_mb, disk_avail_mb, 0, None, None, params) check_info['ucd_disk'] = { diff --git a/checks/vms_diskstat b/checks/vms_diskstat index cc4e59b..6701241 100644 --- a/checks/vms_diskstat +++ b/checks/vms_diskstat @@ -45,7 +45,7 @@ def check_vms_diskstat_fs(item, params, info): device, label, size, used, ios = line size_mb = int(size) * 512 / (1024.0 * 1024.0) avail_mb = int(used) * 512 / (1024.0 * 1024.0) - return df_check_filesystem(host_name(), item, size_mb, avail_mb, 0, params) + return df_check_filesystem_single(item, size_mb, avail_mb, 0, None, None, params) return (3, "no such disk")

6 years, 10 months

Remove unused argument 'hostname' from df_check_filesystem_single

by Konstantin Büttner

Module: check_mk Branch: master Commit: 98825203905d7c3998433ee39ef219d217d71645 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=98825203905d7c… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Aug 30 15:23:02 2017 +0200 Remove unused argument 'hostname' from df_check_filesystem_single Change-Id: I3d9426ffe59aff802a3ee06e2b3e546ff6e0d978 --- checks/db2_logsizes | 2 +- checks/df.include | 6 +++--- checks/esx_vsphere_datastores | 2 +- checks/netapp_api_luns | 2 +- checks/netapp_api_qtree_quota | 2 +- checks/netapp_api_volumes | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/checks/db2_logsizes b/checks/db2_logsizes index 2bcce10..08f73b6 100644 --- a/checks/db2_logsizes +++ b/checks/db2_logsizes @@ -102,7 +102,7 @@ def check_db2_logsizes(item, params, parsed): int(db["logsecond"][data_offset])) * 4096 free = total - int(db["usedspace"][data_offset]) - return df_check_filesystem_single(host_name(), item, total / 1024**2, free / 1024**2, 0, + return df_check_filesystem_single(item, total / 1024**2, free / 1024**2, 0, None, None, params, this_time = timestamp) check_info['db2_logsizes'] = { diff --git a/checks/df.include b/checks/df.include index f62d8ae..228c0da 100644 --- a/checks/df.include +++ b/checks/df.include @@ -273,7 +273,7 @@ def df_check_filesystem_list(item, params, fslist_blocks, fslist_inodes = None): if count == 0: return (3, "No filesystem matching the patterns") else: - status, infotext, perfdata = df_check_filesystem_single(host_name(), item, total_size_mb, total_avail_mb, total_reserved_mb, total_inodes, total_inodes_avail, params) + status, infotext, perfdata = df_check_filesystem_single(item, total_size_mb, total_avail_mb, total_reserved_mb, total_inodes, total_inodes_avail, params) infotext += " (%d filesystems)" % count return status, infotext, perfdata else: @@ -283,11 +283,11 @@ def df_check_filesystem_list(item, params, fslist_blocks, fslist_inodes = None): inodes_total, inodes_avail = fslist_inodes[idx][1], fslist_inodes[idx][2] else: inodes_total, inodes_avail = None, None - return df_check_filesystem_single(host_name(), mp, size_mb, avail_mb, reserved_mb, inodes_total, inodes_avail, params) + return df_check_filesystem_single(mp, size_mb, avail_mb, reserved_mb, inodes_total, inodes_avail, params) return (3, "filesystem not found") -def df_check_filesystem_single(hostname, mountpoint, size_mb, avail_mb, reserved_mb, inodes_total, inodes_avail, params, this_time = None): +def df_check_filesystem_single(mountpoint, size_mb, avail_mb, reserved_mb, inodes_total, inodes_avail, params, this_time = None): if size_mb == 0: return (1, "Size of filesystem is 0 MB", []) diff --git a/checks/esx_vsphere_datastores b/checks/esx_vsphere_datastores index aa5ed25..b9bb753 100644 --- a/checks/esx_vsphere_datastores +++ b/checks/esx_vsphere_datastores @@ -71,7 +71,7 @@ def check_esx_vsphere_datastores(item, params, info): avail_mb = store["freeSpace"] / 1024.0 / 1024.0 state, infotext, perfdata = df_check_filesystem_single( - host_name(), item, size_mb, avail_mb, 0, None, None, params) + item, size_mb, avail_mb, 0, None, None, params) if 'uncommitted' in store: uncommitted_mb = store["uncommitted"] / 1024.0 / 1024.0 diff --git a/checks/netapp_api_luns b/checks/netapp_api_luns index e79d0b2..29ff29b 100644 --- a/checks/netapp_api_luns +++ b/checks/netapp_api_luns @@ -57,7 +57,7 @@ def check_netapp_api_luns(item, params, parsed): if params.get("ignore_levels"): yield 0, "Total size: %s, Used space is ignored" % get_bytes_human_readable(size_total) else: - yield df_check_filesystem_single(host_name(), item, size_total, size_avail, 0, None, None, params) + yield df_check_filesystem_single(item, size_total, size_avail, 0, None, None, params) def netapp_api_luns_item(name): return name.rsplit("/", 1)[-1] diff --git a/checks/netapp_api_qtree_quota b/checks/netapp_api_qtree_quota index 1bc000c..5287a70 100644 --- a/checks/netapp_api_qtree_quota +++ b/checks/netapp_api_qtree_quota @@ -55,7 +55,7 @@ def check_netapp_api_qtree_quota(item, params, parsed): inodes_total = None inodes_avail = None - return df_check_filesystem_single(host_name(), item, size_total, size_avail, 0, + return df_check_filesystem_single(item, size_total, size_avail, 0, inodes_total, inodes_avail, params) check_info["netapp_api_qtree_quota"] = { diff --git a/checks/netapp_api_volumes b/checks/netapp_api_volumes index 4107f26..b414938 100644 --- a/checks/netapp_api_volumes +++ b/checks/netapp_api_volumes @@ -66,7 +66,7 @@ def check_netapp_api_volumes(item, params, parsed): size_avail = int(volume.get("size-available")) / mega inodes_total = int(volume.get("files-total")) inodes_avail = inodes_total - int(volume.get("files-used")) - state, info, perf = df_check_filesystem_single(host_name(), item, size_total, size_avail, 0, + state, info, perf = df_check_filesystem_single(item, size_total, size_avail, 0, inodes_total, inodes_avail, params) counter_wrapped = False

6 years, 10 months

df: Put duplicated logic determining the mountpoint in parse function

by Konstantin Büttner

Module: check_mk Branch: master Commit: 2ef6fca9920b445eeed884f0f2623842831c5b75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ef6fca9920b44… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Aug 30 11:47:43 2017 +0200 df: Put duplicated logic determining the mountpoint in parse function Change-Id: I9f5e1ee0b40d60d8ebe86d707f96717d14979298 --- checks/df | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/checks/df b/checks/df index 7503bde..0cbd510 100644 --- a/checks/df +++ b/checks/df @@ -117,10 +117,11 @@ def parse_df(info): device = line[0] if device not in btrfs_devices: btrfs_devices.add(device) - df_blocks.append(line[:6] + [ "btrfs " + line[0] ]) # replace mount point with device + df_blocks.append(line[:6] + [ "btrfs " + device ]) # replace mount point with device else: - df_blocks.append(line) + mountpoint = " ".join(line[6:]).replace('\\', '/') # Windows \ is replaced with / + df_blocks.append(line[:6] + [ mountpoint ]) return df_blocks def parse_inodes_subsection(inodes_subsection): @@ -166,7 +167,7 @@ def inventory_df(parsed): if line[2] == '-' or int(line[2]) == 0 or line[5] == '-': continue # exclude filesystems without size - mountpoint = " ".join(line[6:]).replace('\\', '/') # Windows \ is replaced with / + mountpoint = line[6] if mountpoint in inventory_df_exclude_mountpoints: continue # exclude this mount point (/tmp, /proc, whatever user wants) @@ -183,7 +184,7 @@ def check_df(item, params, parsed): # df outputs seven columns: # DEVICE FS-TYPE SIZE(KB) USED(KB) AVAIL(KB) USED(%) MOUNTPOINT # The mount point may contain spaces (seen on VMWare volumes and on ESX) - mountpoint = " ".join(line[6:]).replace('\\', '/') + mountpoint = line[6] if "patterns" in params or item == mountpoint: # Beware: the 6th column of df ("used perc") may includes 5% which are reserved # for the superuser, whereas the 4th colum ("used MB") does *not* include that.

6 years, 10 months

Refactoring: Separate logic for inodes and blocks in parse_df

by Konstantin Büttner

Module: check_mk Branch: master Commit: d2f6010b3901a5e239b80f06d987135f393a6740 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d2f6010b3901a5… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Aug 30 11:03:24 2017 +0200 Refactoring: Separate logic for inodes and blocks in parse_df Change-Id: I4cb2fe24a78a4b15a36d04cdb1f56e738506c731 --- checks/df | 81 ++++++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 51 insertions(+), 30 deletions(-) diff --git a/checks/df b/checks/df index 584c4b2..7503bde 100644 --- a/checks/df +++ b/checks/df @@ -91,9 +91,53 @@ def parse_df(info): - df_blocks = [] - df_inodes = [] - btrfs_devices = set() + + def parse_blocks_subsection(blocks_subsection): + df_blocks = [] + btrfs_devices = set() + for line in blocks_subsection: + try: + int(line[1]) + except ValueError: + pass + else: + line = [ line[0], None ] + line[1:] + + if not is_inode: + # Handle known cases, where the file system contains spaces + for index, entry in enumerate(line): + if entry == "NTFS": + line = [ " ".join(line[:index]) ] + [line[index]] + line[index+1:index+5] + [ " ".join(line[index+5:]) ] + break + + if line[2] == "File" and line[3] == "System": + line = [ line[0], " ".join(line[1:4]) ] + line[4:] + + if line[1] == "btrfs": + device = line[0] + if device not in btrfs_devices: + btrfs_devices.add(device) + df_blocks.append(line[:6] + [ "btrfs " + line[0] ]) # replace mount point with device + + else: + df_blocks.append(line) + return df_blocks + + def parse_inodes_subsection(inodes_subsection): + df_inodes = [] + for line in inodes_subsection: + try: + int(line[1]) + except ValueError: + pass + else: + line = [ line[0], None ] + line[1:] + df_inodes.append(line) + return df_inodes + + + blocks_subsection = [] + inodes_subsection = [] is_inode = False for line in info: @@ -104,35 +148,12 @@ def parse_df(info): is_inode = False continue - try: - int(line[1]) - except ValueError: - pass + if is_inode: + inodes_subsection.append(line) else: - line = [ line[0], None ] + line[1:] - - if not is_inode: - # Handle known cases, where the file system contains spaces - for index, entry in enumerate(line): - if entry == "NTFS": - line = [ " ".join(line[:index]) ] + [line[index]] + line[index+1:index+5] + [ " ".join(line[index+5:]) ] - break - - if line[2] == "File" and line[3] == "System": - line = [ line[0], " ".join(line[1:4]) ] + line[4:] - - if line[1] == "btrfs": - device = line[0] - if device not in btrfs_devices: - btrfs_devices.add(device) - df_blocks.append(line[:6] + [ "btrfs " + line[0] ]) # replace mount point with device - - else: - df_blocks.append(line) - else: - df_inodes.append(line) + blocks_subsection.append(line) - return df_blocks, df_inodes + return parse_blocks_subsection(blocks_subsection), parse_inodes_subsection(inodes_subsection) def inventory_df(parsed):

6 years, 10 months

Remove unneeded argument

by Konstantin Büttner

Module: check_mk Branch: master Commit: 4aa78b9f78e245cbaf5990964b723cbeb6a9815b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4aa78b9f78e245… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Aug 30 13:54:23 2017 +0200 Remove unneeded argument Change-Id: I21466e387195210c75984732241d08c83d399cf8 --- checks/mongodb_collections | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/mongodb_collections b/checks/mongodb_collections index 8ed6d1a..2bf549c 100644 --- a/checks/mongodb_collections +++ b/checks/mongodb_collections @@ -60,7 +60,7 @@ def check_mongodb_collections(item, params, parsed): total_mb = float(values["storageSize"]) / 1024.0**2 fslist_blocks.append((coll_item, total_mb, total_mb - used_mb, 0)) - return df_check_filesystem_list(item, params, fslist_blocks, None) + return df_check_filesystem_list(item, params, fslist_blocks) check_info["mongodb_collections"] = {

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