[checkmk-commits] Check_MK Git: check_mk: #1293 FIX dmidecode: Sanitized CPU Vendor field for some Intel CPUs

Module: check_mk Branch: master Commit: 6c0dbd0cb35fdd4ca5fd367a919132deede7b11c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c0dbd0cb35fdd… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Sep 24 09:36:17 2015 +0200 #1293 FIX dmidecode: Sanitized CPU Vendor field for some Intel CPUs There is not longer a mix of CPU vendor information in the cases when the vendor id was Intel(R) Corporation. --- .werks/1293 | 10 ++++++++++ ChangeLog | 1 + inventory/dmidecode | 1 + 3 files changed, 12 insertions(+) diff --git a/.werks/1293 b/.werks/1293 new file mode 100644 index 0000000..7195f3d --- /dev/null +++ b/.werks/1293 @@ -0,0 +1,10 @@ +Title: dmidecode: Sanitized CPU Vendor field for some Intel CPUs +Level: 1 +Component: inv +Compatible: compat +Version: 1.2.7i3 +Date: 1443080002 +Class: fix + +There is not longer a mix of CPU vendor information in the cases when the vendor id was Intel(R) Corporation. + diff --git a/ChangeLog b/ChangeLog index 1f5b67a..c1e3927 100644 --- a/ChangeLog +++ b/ChangeLog @@ -314,6 +314,7 @@ * 2541 FIX: Round last state change of network interfaces to one day, avoid history spam... * 2553 FIX: solaris_prtdiag: Can now handle Supermicro servers using Solaris 10 * 2624 FIX: fixed vbscript based inventory script (windows) only sending updated data every 39 years + * 1293 FIX: dmidecode: Sanitized CPU Vendor field for some Intel CPUs... 1.2.7i2: diff --git a/inventory/dmidecode b/inventory/dmidecode index 4feeb3c..11bbf4a 100644 --- a/inventory/dmidecode +++ b/inventory/dmidecode @@ -146,6 +146,7 @@ def inv_dmidecode_parse_processor(lines): if line[0] == "Manufacturer": cpu_info["vendor"] = { "GenuineIntel" : "intel", + "Intel(R) Corporation" : "intel", "AuthenticAMD" : "amd", }.get(line[1], line[1]) elif line[0] == "Max Speed": # 2530 MHz