Module: check_mk Branch: master Commit: e261fd0812349ddae13a33583c6970db15776659 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e261fd0812349d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 14 10:32:33 2018 +0200 6067 FIX diskstat: Fixed error complaining about unknown diskstat_diskless_pattern Change-Id: I042551ce3eb0e68c3d0f36961fb760282e884782 --- .werks/6067 | 11 +++++++++++ checks/diskstat | 3 --- checks/diskstat.include | 3 +++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/6067 b/.werks/6067 new file mode 100644 index 0000000..a8170c8 --- /dev/null +++ b/.werks/6067 @@ -0,0 +1,11 @@ +Title: diskstat: Fixed error complaining about unknown diskstat_diskless_pattern +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1526286734 + + diff --git a/checks/diskstat b/checks/diskstat index b2edbe7..95c70a6 100644 --- a/checks/diskstat +++ b/checks/diskstat @@ -102,9 +102,6 @@ # parsed = timestamp, disks -diskstat_diskless_pattern = re.compile("x?[shv]d[a-z]*[0-9]+") - - def parse_diskstat(info): timestamp_str, proc_diskstat, name_info = diskstat_extract_name_info(info) timestamp = int(timestamp_str) diff --git a/checks/diskstat.include b/checks/diskstat.include index 619b13d..53c9aa8 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -43,6 +43,9 @@ diskstat_inventory = [] # ( [ 'summary', 'physical', 'lvm', 'vxvm' ], ALL_HOSTS ), # ] +diskstat_diskless_pattern = re.compile("x?[shv]d[a-z]*[0-9]+") + + def inventory_diskstat_generic(parsed): # Skip over on empty data if not parsed: