[checkmk-commits] 6600 FIX inv_win_wmi_updates: Fixed parsing install date;

regard all possible formats Message-ID: &lt;5ba35849.c9LZZRkRyGuLGxRd%si(a)mathias-kettner.de&gt; User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 8b12b14494264a501c656f625fa38e9f042ad6fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b12b14494264a… Author: Simon Betz &lt;si(a)mathias-kettner.de&gt; Date: Wed Sep 19 13:27:32 2018 +0200 6600 FIX inv_win_wmi_updates: Fixed parsing install date; regard all possible formats Change-Id: I24dc6ade5122d0d7daa5e6dad497eecc139c57f8 --- .werks/6600 | 11 +++++++++++ inventory/win_wmi_updates | 33 +++++++++++++++++++++++++++------ 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/.werks/6600 b/.werks/6600 new file mode 100644 index 0000000..ecdf7bc --- /dev/null +++ b/.werks/6600 @@ -0,0 +1,11 @@ +Title: inv_win_wmi_updates: Fixed parsing install date; regard all possible formats +Level: 1 +Component: inv +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1537356416 + + diff --git a/inventory/win_wmi_updates b/inventory/win_wmi_updates index d6451b8..496c673 100644 --- a/inventory/win_wmi_updates +++ b/inventory/win_wmi_updates @@ -24,7 +24,6 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. - # Example output #<<<win_wmi_updates:sep(44):cached(1494868004,3600)>>> #Node,Description,HotFixID,InstalledOn^M @@ -35,6 +34,31 @@ #S050MWSIZ001,Update,KB2841134,5/10/2017^M # Microsoft Office Professional Plus 2010|Microsoft Corporation|14.0.7015.1000 +# InstalledOn may have different formats, see +# https://docs.microsoft.com/de-de/windows/desktop/CIMWin32Prov/win32-quickfi… +# Examples: +# - 20170523 +# - 23-10-2013 +# - 5/23/2017 +# - 01ce83596afd20a7 + + +def _parse_install_date(install_date_str): + for format_ in ["%Y%m%d", "%m/%d/%Y", "%d-%m-%Y"]: + try: + return time.mktime(time.strptime(install_date_str, format_)) + except ValueError: + pass + # However, some systems may return a 64-bit hexidecimal value in the Win32 + # FILETIME format: + # Contains a 64-bit value representing the number of 100-nanosecond intervals + # since January 1, 1601 (UTC). + try: + return float(install_date_str, 16) / 10**7 + except ValueError: + pass + return + def inv_win_wmi_updates(info): paclist = inv_tree_list("software.packages:") @@ -42,15 +66,12 @@ def inv_win_wmi_updates(info): if len(line) <> 4: continue - _, description, knowledge_base, install_date = line - date_number = None - if re.match(".*20.", install_date): - date_number = int(time.mktime(time.strptime(install_date, "%m/%d/%Y"))) + _, description, knowledge_base, install_date_str = line paclist.append({ "name" : "Windows Update " + knowledge_base, "version" : knowledge_base, "vendor" : "Micorosoft " + description, - "install_date" : date_number, + "install_date" : _parse_install_date(install_date_str), "package_type" : "wmi", })