[checkmk-commits] Check_MK Git: check_mk: FIX dmidecode: fixed exceptions on missing/ unknown data

Module: check_mk Branch: master Commit: 87a8544b0cdaef3db4604c0bb74e1c019bc99207 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87a8544b0cdaef… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu May 22 15:48:22 2014 +0200 FIX dmidecode: fixed exceptions on missing/unknown data --- .werks/922 | 8 ++++++++ ChangeLog | 1 + inventory/dmidecode | 6 ++++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/922 b/.werks/922 new file mode 100644 index 0000000..8f278cf --- /dev/null +++ b/.werks/922 @@ -0,0 +1,8 @@ +Title: dmidecode: fixed exceptions on missing/unknown data +Level: 1 +Component: inv +Version: 1.2.5i3 +Date: 1400766476 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 9da13c1..f89e994 100644 --- a/ChangeLog +++ b/ChangeLog @@ -143,6 +143,7 @@ * 0913 lnx_distro: Now able to detect SuSE distributions... * 0610 mk_inventory: windows inventory check now included, install date added to data * 0886 FIX: Fix exception on non-UTF-8 encoded characters in software list + * 0922 FIX: dmidecode: fixed exceptions on missing/unknown data 1.2.5i2: diff --git a/inventory/dmidecode b/inventory/dmidecode index d29ded9..c654aeb 100644 --- a/inventory/dmidecode +++ b/inventory/dmidecode @@ -217,8 +217,8 @@ def inv_dmidecode_parse_mem_device(lines): if device["size"] != "No Module Installed": # Convert speed and size into numbers - device["speed"] = dmidecode_parse_speed(device["speed"]) - device["size"] = dmidecode_parse_size(device["size"]) + device["speed"] = dmidecode_parse_speed(device.get("speed", "Unknown")) + device["size"] = dmidecode_parse_size(device.get("size", "Unknown")) array["devices"].append(device) @@ -262,6 +262,8 @@ def dmidecode_parse_speed(v): # into Hz (float) return float(parts[0]) def dmidecode_parse_voltage(v): + if v == "Unknown": + return None return float(v.split()[0]) def dmidecode_parse_time(v): # 155 ns