[checkmk-commits] no current timestamp in inventory anymore

Module: check_mk Branch: master Commit: 63ce9f987096bbc254ed232c236aa955d306a931 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63ce9f987096bb… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Oct 12 11:42:53 2016 +0200 no current timestamp in inventory anymore --- inventory/snmp_uptime | 4 +--- inventory/uptime | 4 +--- web/plugins/views/inventory.py | 1 - 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/inventory/snmp_uptime b/inventory/snmp_uptime index 59ef36c..1289149 100644 --- a/inventory/snmp_uptime +++ b/inventory/snmp_uptime @@ -26,11 +26,9 @@ def inv_snmp_uptime(info): uptime = parse_snmp_uptime(info[0][0]) - current = time.time() - since = time.strftime("%c", time.localtime(current - float(uptime))) + since = time.strftime("%c", time.localtime(time.time() - float(uptime))) node = inv_tree("software.os.") node["since"] = since - node["last"] = time.strftime("%c", time.localtime(current)) inv_info['snmp_uptime'] = { diff --git a/inventory/uptime b/inventory/uptime index 8419180..112c4c9 100644 --- a/inventory/uptime +++ b/inventory/uptime @@ -30,11 +30,9 @@ def inv_uptime(info): uptime = float(info[0][0]) - current = time.time() - since = time.strftime("%c", time.localtime(current - float(info[0][0])) ) + since = time.strftime("%c", time.localtime(time.time() - float(info[0][0])) ) node = inv_tree("software.os.") node["since"] = since - node["last"] = time.strftime("%c", time.localtime(current)) inv_info['uptime'] = { "inv_function" : inv_uptime, diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index ed31b23..8c4dbdc 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -681,7 +681,6 @@ inventory_displayhints.update({ ".software.os.service_packs:" : { "title" : _("Service Packs"), "render" : render_inv_dicttable, "keyorder" : [ "name" ] }, ".software.os.since" : { "title" : _("Up since"), }, - ".software.os.last" : { "title" : _("Last response"), }, ".software.configuration." : { "title" : _("Configuration"), }, ".software.configuration.snmp_info." : { "title" : _("SNMP Information"), }, ".software.configuration.snmp_info.contact" : { "title" : _("Contact"), },