[checkmk-commits] Check_MK Git: check_mk: FIX: Fixed date parsing code ignoring the seconds value in several checks ( ad_replication, cups_queues, heartbeat_crm, mssql_backup, smbios_sel)

Module: check_mk Branch: master Commit: 9ad83fc73146044581b18bd7095a128ac49de4a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ad83fc7314604… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Fri Feb 15 15:02:31 2013 +0100 FIX: Fixed date parsing code ignoring the seconds value in several checks (ad_replication, cups_queues, heartbeat_crm, mssql_backup, smbios_sel) --- ChangeLog | 4 ++++ checks/ad_replication | 2 +- checks/cups_queues | 2 +- checks/heartbeat_crm | 2 +- checks/mssql_backup | 2 +- checks/smbios_sel | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e314a58..80ec012 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,10 @@ * Add: Monitoring of ESX (VMware) Hosts 1.2.2b3 + Checks & Agents: + * FIX: Fixed date parsing code ignoring the seconds value in several checks + (ad_replication, cups_queues, heartbeat_crm, mssql_backup, smbios_sel) + Multisite: * FIX: Removed uuid module dependency to be compatible to python < 2.5 * FIX: remove Javascript debug popup from multi-string input fields diff --git a/checks/ad_replication b/checks/ad_replication index af0f004..08a24e4 100644 --- a/checks/ad_replication +++ b/checks/ad_replication @@ -44,7 +44,7 @@ def parse_ad_replication_dates(s): if s == '0' or s == '(never)': return None else: - return datetime.datetime(*time.strptime(s, '%Y-%m-%d %H:%M:%S')[0:5]) + return datetime.datetime(*time.strptime(s, '%Y-%m-%d %H:%M:%S')[:6]) def parse_ad_replication_info(info): lines = [] diff --git a/checks/cups_queues b/checks/cups_queues index 24724b0..827b0bf 100644 --- a/checks/cups_queues +++ b/checks/cups_queues @@ -82,7 +82,7 @@ def check_cups_queues(item, params, info): elif line[0].startswith(item+'-'): # This is a queue item count the number of items and check the max age numJobs += 1 - dt = datetime.datetime(*time.strptime(' '.join(line[3:]), '%a %b %d %H:%M:%S %Y')[0:5]) + dt = datetime.datetime(*time.strptime(' '.join(line[3:]), '%a %b %d %H:%M:%S %Y')[:6]) if dt < oldest: oldest = dt diff --git a/checks/heartbeat_crm b/checks/heartbeat_crm index 90d3351..032b56c 100644 --- a/checks/heartbeat_crm +++ b/checks/heartbeat_crm @@ -95,7 +95,7 @@ def check_heartbeat_crm(item, params, info): # Check the freshness of the crm_mon output and terminate with CRITICAL # when too old information are found - dt = int(datetime.datetime(*time.strptime(lastUpdated, '%a %b %d %H:%M:%S %Y')[0:5]).strftime("%s")) + dt = int(datetime.datetime(*time.strptime(lastUpdated, '%a %b %d %H:%M:%S %Y')[:6]).strftime("%s")) now = time.time() delta = now - dt if delta > param_max_age: diff --git a/checks/mssql_backup b/checks/mssql_backup index 9b966f0..20de1ed 100644 --- a/checks/mssql_backup +++ b/checks/mssql_backup @@ -40,7 +40,7 @@ def check_mssql_backup(item, params, info): for line in info: inst, tablespace, last_backup_date, last_backup_time = line if item == inst + ' ' + tablespace: - dt = datetime.datetime(*time.strptime(last_backup_date + ' ' + last_backup_time, '%Y-%m-%d %H:%M:%S')[0:5]) + dt = datetime.datetime(*time.strptime(last_backup_date + ' ' + last_backup_time, '%Y-%m-%d %H:%M:%S')[:6]) state = 0 # Would be so nice to use delta.total_seconds(). But we must care about python < 2.7 diff --git a/checks/smbios_sel b/checks/smbios_sel index 862d8fc..98d36c7 100644 --- a/checks/smbios_sel +++ b/checks/smbios_sel @@ -143,7 +143,7 @@ def check_smbios_sel(_no_item, _no_params, info): sum_status = smbios_sel_msg_types[type][1] # Save the date when the current entry is newer - dt = datetime.datetime(*time.strptime(isodate, "%Y-%m-%d %H:%M:%S")[0:5]) + dt = datetime.datetime(*time.strptime(isodate, "%Y-%m-%d %H:%M:%S")[:6]) if smbios_sel_msg_types[type][3] == None or smbios_sel_msg_types[type][3] < dt: smbios_sel_msg_types[type][3] = dt; else: