Module: check_mk
Branch: master
Commit: 44198f6a435ba2cfabe85caab1e1c4972744c589
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44198f6a435ba2…
Author: Goetz Golla <gg(a)mathias-kettner.de>
Date: Mon Jan 19 10:14:01 2015 +0100
#1851 FIX win_exefiles: inventory check can now handle time stamps in us english locale
---
.werks/1851 | 9 +++++++++
ChangeLog | 3 +++
inventory/win_exefiles | 2 ++
3 files changed, 14 insertions(+)
diff --git a/.werks/1851 b/.werks/1851
new file mode 100644
index 0000000..fa47638
--- /dev/null
+++ b/.werks/1851
@@ -0,0 +1,9 @@
+Title: win_exefiles: inventory check can now handle time stamps in us english locale
+Level: 1
+Component: inv
+Compatible: compat
+Version: 1.2.7i1
+Date: 1421658742
+Class: fix
+
+
diff --git a/ChangeLog b/ChangeLog
index db6f41e..b2d0de2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -135,6 +135,9 @@
* 1839 FIX: Fix exception when notifying EC alert into monitoring for traps (because
PID is missing)
* 1813 FIX: Fixed bug in event console rule editor when no contact groups configured
+ HW/SW-Inventory:
+ * 1851 FIX: win_exefiles: inventory check can now handle time stamps in us english
locale
+
1.2.6b1:
Core & Setup:
diff --git a/inventory/win_exefiles b/inventory/win_exefiles
index 6d277c2..f533f46 100644
--- a/inventory/win_exefiles
+++ b/inventory/win_exefiles
@@ -38,6 +38,8 @@ def inv_win_exefiles(info):
# 14.02.2014 23:12:04
if re.match("^\d{2}\.\d{2}\.20\d{2} \d{2}:\d{2}:\d{2}", write_time):
install_date = int(time.mktime(time.strptime(write_time, "%d.%m.%Y
%H:%M:%S")))
+ elif re.match("^\d{1,2}/d{1,2}/20\d{2} \d{1,2}:\d{2}:\d{2} (AM|PM)",
write_time):
+ install_date = int(time.mktime(time.strptime(write_time, "%m/%d/%Y
%H:%M:%S %p")))
else:
install_date = write_time