Checkmk git commits November 2017

checkmk-commits@lists.checkmk.com

10 participants
325 discussions

df: Include filesystem type information in parsed info

by Konstantin Büttner

Module: check_mk Branch: master Commit: 838d6982bd36bffbfea861156f178dc1f7d84e44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=838d6982bd36bf… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Nov 29 12:59:37 2017 +0100 df: Include filesystem type information in parsed info Change-Id: I14c02769fa12542af078e8aadb8211a05922c7e4 --- checks/df | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/checks/df b/checks/df index e3384bc..fca4bbb 100644 --- a/checks/df +++ b/checks/df @@ -95,7 +95,7 @@ inventory_df_exclude_fs = [ 'tmpfs', 'nfs', 'smbfs', 'cifs', 'iso9660' ] def parse_df(info): def parse_blocks_subsection(blocks_subsection): - mp_to_volume = {} + volume_info = {} df_blocks = [] btrfs_devices = set() for line in blocks_subsection: @@ -115,9 +115,10 @@ def parse_df(info): if line[2] == "File" and line[3] == "System": line = [ line[0], " ".join(line[1:4]) ] + line[4:] + fs_type = line[1] # This particular bit of magic originated in Werk #2671 and has the purpose of avoiding duplicate checks, # as btrfs filesystems are often mounted at multiple mountpoints. We keep it for compatibility. - if line[1] == "btrfs": + if fs_type == "btrfs": device = line[0] if device not in btrfs_devices: btrfs_devices.add(device) @@ -126,11 +127,12 @@ def parse_df(info): else: mountpoint = " ".join(line[6:]).replace('\\', '/') # Windows \ is replaced with / + if fs_type in inventory_df_exclude_fs: + continue # ignore this filesystem type + if line[2] == '-' or int(line[2]) == 0: continue # exclude filesystems without size - if line[1] in inventory_df_exclude_fs: - continue # ignore this filesystem type # Beware: the 6th column of df ("used perc") may includes 5% which are reserved @@ -144,9 +146,13 @@ def parse_df(info): reserved_mb = size_mb - avail_mb - used_mb # reserved for root df_blocks.append((mountpoint, size_mb, avail_mb, reserved_mb)) - mp_to_volume[mountpoint] = line[0] + volume_name = line[0] + volume_info[mountpoint] = { + "volume_name" : volume_name, + "fs_type" : fs_type, + } - return df_blocks, mp_to_volume + return df_blocks, volume_info def parse_inodes_subsection(inodes_subsection): df_inodes = [] @@ -191,7 +197,7 @@ def inventory_df(parsed): inventory_options = host_extra_conf_merged(host_name(), inventory_df_rules) include_volume_name = inventory_options.get("include_volume_name", False) - (df_blocks, mp_to_volume), _ = parsed + (df_blocks, volume_info), _ = parsed mplist = [] for line in df_blocks: @@ -207,7 +213,7 @@ def inventory_df(parsed): for entry in df_inventory(mplist): if is_mountpoint(entry): mountpoint, params = entry - item = "%s %s" % (mp_to_volume[mountpoint], mountpoint) + item = "%s %s" % (volume_info[mountpoint]["volume_name"], mountpoint) inventory.append((item, params)) else: inventory.append(entry) @@ -217,11 +223,11 @@ def inventory_df(parsed): def check_df(item, params, parsed): - (df_blocks, mp_to_volume), df_inodes = parsed - if "patterns" in params or item in mp_to_volume: + (df_blocks, volume_info), df_inodes = parsed + if "patterns" in params or item in volume_info: return df_check_filesystem_list(item, params, df_blocks, df_inodes) else: - mountpoint = { ("%s %s" % (mp_to_volume[mp], mp)) : mp for mp in mp_to_volume }[item] + mountpoint = { ("%s %s" % (volume_info[mp]["volume_name"], mp)) : mp for mp in volume_info }[item] return df_check_filesystem_list(mountpoint, params, df_blocks, df_inodes)

6 years, 7 months

test_df_discovery_with_parse: Comment test cases, remove redundant test case

by Konstantin Büttner

Module: check_mk Branch: master Commit: 07ac8798b1ed08f9bb1e02c398d37d5f0c04e26c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07ac8798b1ed08… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Nov 29 12:02:32 2017 +0100 test_df_discovery_with_parse: Comment test cases, remove redundant test case Change-Id: Ide2900910513922f95b7d7657b904d579f0407d8 --- tests/checks/test_df_check.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/tests/checks/test_df_check.py b/tests/checks/test_df_check.py index bc1f24e..5da3a8b 100644 --- a/tests/checks/test_df_check.py +++ b/tests/checks/test_df_check.py @@ -218,14 +218,13 @@ info_df_btrfs = \ @pytest.mark.parametrize("info,expected_result,include_volume_name", [ ([], [], False), - (info_df_lnx, [(u'/', {})], False), - (info_df_lnx, [(u'/dev/sda4 /', {})], True), - (info_df_win, [(u'E:/', {}), (u'F:/', {}), (u'C:/', {})], False), - (info_df_win, [(u'New_Volume E:/', {}), (u'New_Volume F:/', {}), (u'C:\\ C:/', {})], True), - (info_df_lnx_tmpfs, [], False), - (info_df_lnx_tmpfs, [], True), - (info_df_btrfs, [(u'/sys/fs/cgroup', {}), (u'btrfs /dev/sda1', {})], False), - (info_df_btrfs, [(u'/dev/sda1 /sys/fs/cgroup', {}), (u'/dev/sda1 btrfs /dev/sda1', {})], True), + (info_df_lnx, [(u'/', {})], False), # Linux + (info_df_lnx, [(u'/dev/sda4 /', {})], True), # Linux w/ volume name option + (info_df_win, [(u'E:/', {}), (u'F:/', {}), (u'C:/', {})], False), # Windows + (info_df_win, [(u'New_Volume E:/', {}), (u'New_Volume F:/', {}), (u'C:\\ C:/', {})], True), # Windows w/ volume name option + (info_df_lnx_tmpfs, [], False), # Ignoring tmpfs + (info_df_btrfs, [(u'/sys/fs/cgroup', {}), (u'btrfs /dev/sda1', {})], False), # btrfs + (info_df_btrfs, [(u'/dev/sda1 /sys/fs/cgroup', {}), (u'/dev/sda1 btrfs /dev/sda1', {})], True), # btrfs w/ volume name option ]) def test_df_discovery_with_parse(check_manager, monkeypatch, info, expected_result, include_volume_name): # NOTE: This commented-out code is the result of trying to mock the the ruleset variable itself instead of the

6 years, 7 months

test_df_check_with_parse: Add test cases for Windows, btrfs and variant items that include the volume name

by Konstantin Büttner

Module: check_mk Branch: master Commit: 9483d70ee0d8d5d4dc7f2583eeb029542111b68f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9483d70ee0d8d5… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Nov 29 11:33:23 2017 +0100 test_df_check_with_parse: Add test cases for Windows, btrfs and variant items that include the volume name Change-Id: I744082057694e67f65a36f424c469b5c8cae192b --- tests/checks/test_df_check.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/checks/test_df_check.py b/tests/checks/test_df_check.py index 06d5b65..bc1f24e 100644 --- a/tests/checks/test_df_check.py +++ b/tests/checks/test_df_check.py @@ -241,7 +241,11 @@ def test_df_discovery_with_parse(check_manager, monkeypatch, info, expected_resu # TODO: Make this work by finding a way to get a check's default levels in this context. @pytest.mark.parametrize("item,params,info,expected_result", [ - (u"/", "default", info_df_lnx, {}) + (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, {}), ]) def test_df_check_with_parse(check_manager, monkeypatch, item, params, info, expected_result): check = check_manager.get_check("df")

6 years, 7 months

5558 FIX Rule list: Fixed visibility of rules in child folders for transitive folders

by Lars Michelsen

Module: check_mk Branch: master Commit: d3765fbb2b47d167df64e7f49b656d6c8b48a186 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3765fbb2b47d1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 29 11:20:19 2017 +0100 5558 FIX Rule list: Fixed visibility of rules in child folders for transitive folders When viewing the list of rules in a ruleset via WATO, it shows the rules grouped by folder. When the user views a transitive folder the rules defined in child folders were not listed. It has now been changed to work like this: The list shows all rules of all parent and all child folders. Folders of other, not involved, branches in the folder hierarchy are not displayed. Change-Id: I16da6d1875dcfe7d0275cae5cfb784e60f8ea1b9 --- .werks/5558 | 16 ++++++++++++++++ web/htdocs/wato.py | 8 +++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.werks/5558 b/.werks/5558 new file mode 100644 index 0000000..6ff8d4d --- /dev/null +++ b/.werks/5558 @@ -0,0 +1,16 @@ +Title: Rule list: Fixed visibility of rules in child folders for transitive folders +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i2 +Date: 1511950428 + +When viewing the list of rules in a ruleset via WATO, it shows the rules grouped by folder. +When the user views a transitive folder the rules defined in child folders were not listed. + +It has now been changed to work like this: The list shows all rules of all parent and +all child folders. Folders of other, not involved, branches in the folder hierarchy +are not displayed. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2f1d546..e60a926 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -13043,11 +13043,13 @@ class ModeEditRuleset(WatoMode): skip_this_folder = False for folder, rulenr, rule in ruleset.get_rules(): if folder != last_folder: - if not watolib.Folder.current().is_root() and not folder.is_transitive_parent_of(watolib.Folder.current()): + # Only show folders related to the currently viewed folder hierarchy + if folder.is_transitive_parent_of(watolib.Folder.current()) \ + or watolib.Folder.current().is_transitive_parent_of(folder): + skip_this_folder = False + else: skip_this_folder = True continue - else: - skip_this_folder = False if last_folder != None: table.end()

6 years, 7 months

Clean up test_mkbackup_parse, as manual cache clearing is no longer required

by Konstantin Büttner

Module: check_mk Branch: master Commit: b7c307d3cf599c878b23fb93a6d343eeebdb8654 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7c307d3cf599c… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Nov 29 11:13:51 2017 +0100 Clean up test_mkbackup_parse, as manual cache clearing is no longer required Change-Id: If319d6b3c5e57729ed8f9fd446522170fbba2d91 --- tests/checks/test_mkbackup_check.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/checks/test_mkbackup_check.py b/tests/checks/test_mkbackup_check.py index 11e33d8..0029892 100644 --- a/tests/checks/test_mkbackup_check.py +++ b/tests/checks/test_mkbackup_check.py @@ -159,9 +159,5 @@ info_3 = [[u'[[[system:test1]]]'], info_3, ]) def test_mkbackup_parse(check_manager, monkeypatch, info): - import cmk_base.checks - import cmk_base - check = check_manager.get_check("mkbackup") check.run_parse(info) - cmk_base.config_cache.clear_all()

6 years, 7 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: f96d3f46770f01b2a0f175d14997b780b41334cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f96d3f46770f01… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 29 11:13:36 2017 +0100 Reserved 20 Werk IDS Change-Id: Ia75ddf43858980c4b154224057d328cd98186742 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index b610eca..9274a03 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5558 +5578

6 years, 7 months

Fixed invalid default value

by Lars Michelsen

Module: check_mk Branch: master Commit: 53cfa637c56496a4171bc8b87736d448d4803951 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53cfa637c56496… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 29 10:47:07 2017 +0100 Fixed invalid default value Change-Id: I2d29b12c3530e2e0faa5057527c43df234f2e89c --- cmk_base/item_state.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk_base/item_state.py b/cmk_base/item_state.py index 39e408a..c997d0b 100644 --- a/cmk_base/item_state.py +++ b/cmk_base/item_state.py @@ -53,7 +53,7 @@ ZERO = 0.0 g_item_state = {} # storing counters of one host g_last_counter_wrap = None # -g_item_state_prefix = [] +g_item_state_prefix = () g_suppress_on_wrap = True # Suppress check on wrap (raise an exception) # e.g. do not suppress this check on check_mk -nv

6 years, 7 months

Cleaned up test: Context is now directly available with the check object

by Lars Michelsen

Module: check_mk Branch: master Commit: 0a5bdbb5da27f101cc6e2cadb504a58db3bbd72d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a5bdbb5da27f1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 29 10:32:55 2017 +0100 Cleaned up test: Context is now directly available with the check object Change-Id: I58f3acb4c2cee77f3ca84d87b50bdaaa60b0b3b2 --- tests/checks/test_df_check.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/checks/test_df_check.py b/tests/checks/test_df_check.py index ce4061d..06d5b65 100644 --- a/tests/checks/test_df_check.py +++ b/tests/checks/test_df_check.py @@ -228,8 +228,6 @@ info_df_btrfs = \ (info_df_btrfs, [(u'/dev/sda1 /sys/fs/cgroup', {}), (u'/dev/sda1 btrfs /dev/sda1', {})], True), ]) def test_df_discovery_with_parse(check_manager, monkeypatch, info, expected_result, include_volume_name): - import cmk_base - # NOTE: This commented-out code is the result of trying to mock the the ruleset variable itself instead of the # host_extra_conf_merged function. It did not work. Maybe we can get it to work at a later stage. # import cmk_base.rulesets @@ -237,7 +235,7 @@ def test_df_discovery_with_parse(check_manager, monkeypatch, info, expected_resu # [({"include_volume_name": include_volume_name}, [], cmk_base.rulesets.ALL_HOSTS, {})]) check = check_manager.get_check("df") - monkeypatch.setitem(cmk_base.checks._check_contexts["df"], "host_extra_conf_merged", lambda _, __: {"include_volume_name": include_volume_name}) + monkeypatch.setitem(check.context, "host_extra_conf_merged", lambda _, __: {"include_volume_name": include_volume_name}) assert check.run_discovery(check.run_parse(info)) == expected_result

6 years, 7 months

Refactored some pages to WatoMode structure

by Lars Michelsen

Module: check_mk Branch: master Commit: 4abbab2852b252e8de842ea5831c826bf2bdc7ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4abbab2852b252… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 28 17:05:44 2017 +0100 Refactored some pages to WatoMode structure Change-Id: I54c4fd8a5832604e6f3484cdf1ec90e5aa02ad5d --- web/htdocs/wato.py | 262 ++++++++++++++++++++++++++++------------------------- 1 file changed, 138 insertions(+), 124 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4abbab2852…

6 years, 7 months

check.default_parameters() provide defaults for check tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 16921bfca38d6ea992ee358eada15e2b5f0cb38b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16921bfca38d6e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 29 10:29:48 2017 +0100 check.default_parameters() provide defaults for check tests Change-Id: I329908b7362e120653ea97fc15c86548abbc36b1 --- tests/testlib/__init__.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index a98dfe3..08c91d7 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -1500,6 +1500,13 @@ class Check(object): import cmk_base.checks as checks self.name = name self.info = checks.check_info[name] + self.context = checks._check_contexts[name] + + + def default_parameters(self): + import cmk_base.checks as checks + params = {} + return checks._update_with_default_check_parameters(self.name, params) def run_parse(self, info):

6 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2017