[checkmk-commits] Check_MK Git: check_mk: FIX: Multisite: correctly display sub-minute check/ retry intervals

Module: check_mk Branch: master Commit: 49e8754c03b31d54dc177dc1e70204058d0970e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49e8754c03b31d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Sep 29 21:08:14 2013 +0200 FIX: Multisite: correctly display sub-minute check/retry intervals --- ChangeLog | 1 + web/plugins/views/painters.py | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 367dacb..12b71fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -398,6 +398,7 @@ e.g. alert statistics source * FIX: Folder Tree Snapin: make folder filter also work for remote folders that do not exist locally + * FIX: correctly display sub-minute check/retry intervals WATO: * FIX: fix layout of Auxiliary tags table diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index bb450e0..d459b13 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -560,20 +560,20 @@ multisite_painters["svc_normal_interval"] = { "title" : _("Service normal check interval"), "short" : _("Check int."), "columns" : [ "service_check_interval" ], - "paint" : lambda row: (None, "%ds" % (row["service_check_interval"] * 60)), + "paint" : lambda row: (None, "%.0fs" % (row["service_check_interval"] * 60.0)), } multisite_painters["svc_retry_interval"] = { "title" : _("Service retry check interval"), "short" : _("Retry"), "columns" : [ "service_retry_interval" ], - "paint" : lambda row: (None, "%ds" % (row["service_retry_interval"] * 60)), + "paint" : lambda row: (None, "%.0fs" % (row["service_retry_interval"] * 60.0)), } multisite_painters["svc_check_interval"] = { "title" : _("Service normal/retry check interval"), "short" : _("Interval"), "columns" : [ "service_check_interval", "service_retry_interval" ], - "paint" : lambda row: (None, "%ds/%ds" % ( - row["service_check_interval"] * 60, row["service_retry_interval"] * 60)), + "paint" : lambda row: (None, "%.0fs/%.0fs" % ( + row["service_check_interval"] * 60.0, row["service_retry_interval"] * 60.0)), } multisite_painters["svc_check_type"] = { @@ -918,20 +918,20 @@ multisite_painters["host_normal_interval"] = { "title" : _("Normal check interval"), "short" : _("Check int."), "columns" : [ "host_check_interval" ], - "paint" : lambda row: (None, "%ds" % (row["host_check_interval"] * 60)), + "paint" : lambda row: (None, "%.0fs" % (row["host_check_interval"] * 60.0)), } multisite_painters["host_retry_interval"] = { "title" : _("Retry check interval"), "short" : _("Retry"), "columns" : [ "host_retry_interval" ], - "paint" : lambda row: (None, "%ds" % (row["host_retry_interval"] * 60)), + "paint" : lambda row: (None, "%.0fs" % (row["host_retry_interval"] * 60.0)), } multisite_painters["host_check_interval"] = { "title" : _("Normal/retry check interval"), "short" : _("Interval"), "columns" : [ "host_check_interval", "host_retry_interval" ], - "paint" : lambda row: (None, "%ds/%ds" % ( - row["host_check_interval"] * 60, row["host_retry_interval"] * 60)), + "paint" : lambda row: (None, "%.0fs/%.0fs" % ( + row["host_check_interval"] * 60.0, row["host_retry_interval"] * 60.0)), } multisite_painters["host_check_type"] = {