[checkmk-commits] 6636 FIX hr_fs: Fix discovery for VCenter appliances

Module: check_mk Branch: master Commit: 5201eed184041179146d9a741abeee78aadca9fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5201eed1840411… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Nov 14 13:22:17 2018 +0100 6636 FIX hr_fs: Fix discovery for VCenter appliances Previously, due to a bogus type value provided by these appliances via SNMP, the filesystem checks would not be discovered. This has been fixed. Change-Id: Id52210cde800571ee70f0b55bff66b46767123e5 --- .werks/6636 | 13 +++++++++++++ checks/hr_fs.include | 7 ++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.werks/6636 b/.werks/6636 new file mode 100644 index 0000000..83d5c1a --- /dev/null +++ b/.werks/6636 @@ -0,0 +1,13 @@ +Title: hr_fs: Fix discovery for VCenter appliances +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1542198055 + +Previously, due to a bogus type value provided by +these appliances via SNMP, the filesystem checks +would not be discovered. This has been fixed. diff --git a/checks/hr_fs.include b/checks/hr_fs.include index bb56877..f1d0b22 100644 --- a/checks/hr_fs.include +++ b/checks/hr_fs.include @@ -53,7 +53,12 @@ def inventory_hr_fs(info): mplist = [] for hrtype, hrdescr, _hrunits, hrsize, _hrused in info: hrdescr = fix_hr_fs_mountpoint(hrdescr) - if hrtype in [ ".1.3.6.1.2.1.25.2.1.4" ] and \ + # NOTE: These types are defined in the HR-TYPES-MIB. + # .1.3.6.1.2.1.25.2.1 + + # +-> .4 "hrStorageFixedDisk" + if hrtype in [ ".1.3.6.1.2.1.25.2.1.4", + # This strange value below is needed for VCenter Appliances + ".1.3.6.1.2.1.25.2.3.1.2.4"] and \ hrdescr not in inventory_df_exclude_mountpoints and \ saveint(hrsize) != 0: mplist.append(hrdescr)