Checkmk git commits May 2018

checkmk-commits@lists.checkmk.com

10 participants
375 discussions

Fixed non working docker display hints; Added some more

by Lars Michelsen

Module: check_mk Branch: master Commit: 1965c92bd611e796fc249f676b8afad1af73bdbe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1965c92bd611e7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 2 07:52:01 2018 +0200 Fixed non working docker display hints; Added some more Change-Id: Iff4f29fe12125901634f510e43ce6b67bb097616 --- web/plugins/views/inventory.py | 41 ++++++++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 3d00f97..5c1b5ef 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -761,34 +761,57 @@ inventory_displayhints.update({ ".software.applications.docker.images:*.amount_containers" : { "title" : _("# Containers"), }, + ".software.applications.docker.networks.*.": { + "title": "Network %s", + }, + ".software.applications.docker.networks.*.network_id": { + "title": "Network ID", + }, + ".software.applications.docker.container.": { "title" : _("Container"), }, ".software.applications.docker.container.node_name": { "title" : _("Node name"), }, + ".software.applications.docker.container.ports:": { + "title" : _("Ports"), + "keyorder" : [ "port", "protocol", "host_addresses" ], + }, + ".software.applications.docker.container.networks:": { "title" : _("Networks"), "keyorder" : [ "name", "ip_address", "ip_prefixlen", "gateway", "mac_address", "network_id" ], }, - ".software.applications.docker.container.ports:": { - "title" : _("Ports"), - "keyorder" : [ "port", "protocol", "host_addresses" ], + ".software.applications.docker.container.networks:*.ip_address": { + "title" : _("IP address"), }, - - ".software.applications.docker.networks:*.": { - "title": "Network %d", + ".software.applications.docker.container.networks:*.ip_prefixlen": { + "title" : _("IP Prefix"), + }, + ".software.applications.docker.container.networks:*.mac_address": { + "title" : _("MAC address"), }, - ".software.applications.docker.networks:*.containers:": { + ".software.applications.docker.container.networks:*.network_id": { + "title" : _("Network ID"), + }, + + ".software.applications.docker.networks.*.containers:": { "keyorder" : [ "name", "id", "ipv4_address", "ipv6_address", "mac_address" ], }, - ".software.applications.docker.networks:*.containers:*.ipv4_address": { + ".software.applications.docker.networks.*.containers:*.id": { + "title" : _("ID"), + }, + ".software.applications.docker.networks.*.containers:*.ipv4_address": { "title" : _("IPv4 address"), }, - ".software.applications.docker.networks:*.containers:*.ipv6_address": { + ".software.applications.docker.networks.*.containers:*.ipv6_address": { "title" : _("IPv6 address"), }, + ".software.applications.docker.networks.*.containers:*.mac_address": { + "title" : _("MAC address"), + }, ".software.applications.citrix." : { "title" : _("Citrix") }, ".software.applications.citrix.controller." : { "title" : _("Controller") },

6 years, 4 months

corrected description

by Marcel Arentz

Module: check_mk Branch: master Commit: f8bd05f2396850593d584a3ad199a4e4a5d201f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8bd05f2396850… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon May 7 10:30:24 2018 +0200 corrected description Change-Id: Ic490a8fdeafd052ce2830fc54cc68ea5552b5d8b --- web/plugins/wato/active_checks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 170a8ad..79be0d7 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -241,7 +241,7 @@ register_rule(group, choices = [ ("address", _("Ping the normal IP address")), ("alias", _("Use the alias as DNS name / IP address")), - ("explicit", _("Ping the following explicity address / DNS name"), Hostname()), + ("explicit", _("Ping the following explicit address / DNS name"), Hostname()), ("all_ipv4addresses", _("Ping all IPv4 addresses")), ("all_ipv6addresses", _("Ping all IPv6 addresses")), ("additional_ipv4addresses", _("Ping additional IPv4 addresses")),

6 years, 4 months

5996 FIX Fixed lookup of management protocol and credentials

by Simon Betz

Module: check_mk Branch: master Commit: 7cf365e365a95a31759d52aa1dd852b44ccb47fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7cf365e365a95a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed May 2 12:43:52 2018 +0200 5996 FIX Fixed lookup of management protocol and credentials If a host has configured a SNMP management board in Check_MK version 1.4.0 and the site was upgraded to 1.5.0 or later versions, then the SNMP management board protocol and credentials were not found. Fixed that! Change-Id: Ica7446639b802c0924d5f3740007723a2291c838 --- .werks/5996 | 13 +++++++++++++ cmk_base/config.py | 21 +++++++++++++++++++++ web/htdocs/watolib.py | 4 ++-- 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/.werks/5996 b/.werks/5996 new file mode 100644 index 0000000..9e250ad --- /dev/null +++ b/.werks/5996 @@ -0,0 +1,13 @@ +Title: Fixed lookup of management protocol and credentials +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1525257689 +Class: fix + +If a host has configured a SNMP management board in Check_MK +version 1.4.0 and the site was upgraded to 1.5.0 or later versions, +then the SNMP management board protocol and credentials were not +found. Fixed that! diff --git a/cmk_base/config.py b/cmk_base/config.py index 5b297c4..43df660 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -126,6 +126,8 @@ def load(with_conf_d=True, validate_hosts=True, exclude_parents_mk=False): _load_config(with_conf_d, exclude_parents_mk) + _transform_mgmt_config_vars_from_140_to_150() + initialize_config_caches() initialize_service_levels() @@ -196,6 +198,21 @@ def _load_config(with_conf_d, exclude_parents_mk): del global_dict[helper_var] +def _transform_mgmt_config_vars_from_140_to_150(): + #FIXME We have to transform some configuration variables from host attributes + # to cmk_base configuration variables because during the migration step from + # 1.4.0 to 1.5.0 some config variables are not known in cmk_base. These variables + # are 'management_protocol' and 'management_snmp_community'. + # Clean this up one day! + for hostname, attributes in host_attributes.iteritems(): + for name, var in [ + ('management_protocol', management_protocol), + ('management_snmp_community', management_snmp_credentials), + ]: + if attributes.get(name): + var.setdefault(hostname, attributes[name]) + + # Create list of all files to be included during configuration loading def _get_config_file_paths(with_conf_d): if with_conf_d: @@ -594,6 +611,10 @@ def alias_of(hostname, fallback): def get_additional_ipaddresses_of(hostname): + #TODO Regarding the following configuration variables from WATO + # there's no inheritance, thus we use 'host_attributes'. + # Better would be to use cmk_base configuration variables, + # eg. like 'management_protocol'. return (host_attributes.get(hostname, {}).get("additional_ipv4addresses", []), host_attributes.get(hostname, {}).get("additional_ipv6addresses", [])) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 25adefe..a99f7d0 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -1465,9 +1465,9 @@ class CREFolder(BaseFolder): ("ipaddress", "ipaddresses", {}, "Explicit IPv4 addresses"), ("ipv6address", "ipv6addresses", {}, "Explicit IPv6 addresses"), ("snmp_community", "explicit_snmp_communities", {}, "Explicit SNMP communities"), - ("management_snmp_community", "management_snmp_credentials", {}, "Management board SNMP credentials"), + ("management_snmp_community", "management_snmp_credentials", {}, "Management board SNMP credentials"), ("management_ipmi_credentials", "management_ipmi_credentials", {}, "Management board IPMI credentials"), - ("management_protocol", "management_protocol", {}, "Management board protocol"), + ("management_protocol", "management_protocol", {}, "Management board protocol"), ] for hostname in hostnames:

6 years, 4 months

6056 Analyze configuration: Test for old omdadmin default credentials

by Lars Michelsen

Module: check_mk Branch: master Commit: ab75928e4efea0825cb31938e77f03a046fa44ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab75928e4efea0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 7 06:33:54 2018 +0200 6056 Analyze configuration: Test for old omdadmin default credentials A new "Analyze configuration" test warns you in case a omdadmin user with the pre 1.4 default password is found in the site. Change-Id: I788abe3e0eedf1021fbc77340baf34ee54608611 --- .werks/6056 | 12 ++++++++++++ web/plugins/wato/ac_tests.py | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/.werks/6056 b/.werks/6056 new file mode 100644 index 0000000..22aec27 --- /dev/null +++ b/.werks/6056 @@ -0,0 +1,12 @@ +Title: Analyze configuration: Test for old omdadmin default credentials +Level: 1 +Component: wato +Class: feature +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1525628120 + +A new "Analyze configuration" test warns you in case a omdadmin user with the pre +1.4 default password is found in the site. diff --git a/web/plugins/wato/ac_tests.py b/web/plugins/wato/ac_tests.py index 17b549a..7c662b5 100644 --- a/web/plugins/wato/ac_tests.py +++ b/web/plugins/wato/ac_tests.py @@ -256,6 +256,38 @@ class ACTestHTTPSecured(ACTest): +class ACTestOldDefaultCredentials(ACTest): + def category(self): + return ACTestCategories.security + + + def title(self): + return _("Default credentials") + + + def help(self): + return _("In versions prior to version 1.4.0 the first administrative user of the " + "site was named <tt>omdadmin</tt> with the standard password <tt>omd</tt>. " + "This test warns you in case the site uses these standard credentials. " + "It is highly recommended to change this password.") + + + def is_relevant(self): + return userdb.user_exists("omdadmin") + + + def execute(self): + if userdb.HtpasswdUserConnector({}).check_credentials("omdadmin", "omd") == "omdadmin": + yield ACResultCRIT(_("Found <tt>omdadmin</tt> with default password. " + "It is highly recommended to change this password.")) + else: + yield ACResultOK(_("Found <tt>omdadmin</tt> using custom password.")) + + + + + + class ACTestBackupConfigured(ACTest): def category(self): return ACTestCategories.reliability

6 years, 4 months

precompiling checks: Use standard store methods for writing file

by Lars Michelsen

Module: check_mk Branch: master Commit: ef943a3afa0da8f56c4bdee56f71b8f17075d216 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef943a3afa0da8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 3 11:35:02 2018 +0200 precompiling checks: Use standard store methods for writing file Change-Id: I2fec7dfbc05cca420c3105f5bea1b1b4c3f2489a --- cmk_base/checks.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk_base/checks.py b/cmk_base/checks.py index 5be485c..d639ea0 100644 --- a/cmk_base/checks.py +++ b/cmk_base/checks.py @@ -32,6 +32,7 @@ import marshal from collections import OrderedDict import cmk.paths +import cmk.store as store from cmk.exceptions import MKGeneralException, MKTerminate import cmk_base @@ -355,8 +356,7 @@ def _precompile_plugin(path, precompiled_path): if not os.path.exists(os.path.dirname(precompiled_path)): os.makedirs(os.path.dirname(precompiled_path)) - with open(precompiled_path, "w") as compiled_file: - marshal.dump(code, compiled_file) + store.save_file(precompiled_path, marshal.dumps(code)) def _precompiled_plugin_path(path):

6 years, 4 months

Another performance improvement to check loading

by Lars Michelsen

Module: check_mk Branch: master Commit: 82310aab29e5dfc9ab56dee14dd3218b20fc86e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82310aab29e5df… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 3 08:44:36 2018 +0200 Another performance improvement to check loading This change improves the execution time of different Check_MK calls, especially command line calls for discovery and checking by additional 50%. Change-Id: If52a5e209ee8bffe5f191b79dd982511e4707dd4 --- cmk/paths.py | 1 + cmk_base/checks.py | 43 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/cmk/paths.py b/cmk/paths.py index 3cb0395..226eaad 100644 --- a/cmk/paths.py +++ b/cmk/paths.py @@ -131,6 +131,7 @@ def _set_paths(): "tcp_cache_dir" : os.path.join(omd_root, "tmp/check_mk/cache"), "data_source_cache_dir" : os.path.join(omd_root, "tmp/check_mk/data_source_cache"), "snmp_scan_cache_dir" : os.path.join(omd_root, "tmp/check_mk/snmp_scan_cache"), + "include_cache_dir" : os.path.join(omd_root, "tmp/check_mk/check_includes"), "tmp_dir" : os.path.join(omd_root, "tmp/check_mk"), "logwatch_dir" : os.path.join(omd_root, "var/check_mk/logwatch"), "nagios_startscript" : os.path.join(omd_root, "etc/init.d/core"), diff --git a/cmk_base/checks.py b/cmk_base/checks.py index d639ea0..4750b0e 100644 --- a/cmk_base/checks.py +++ b/cmk_base/checks.py @@ -247,7 +247,7 @@ def new_check_context(): # Working with imports when specifying the includes would be much cleaner, # sure. But we need to deal with the current check API. def load_check_includes(check_file_path, check_context): - for include_file_name in includes_of_plugin(check_file_path): + for include_file_name in cached_includes_of_plugin(check_file_path): include_file_path = check_include_file_path(include_file_name) try: load_precompiled_plugin(include_file_path, check_context) @@ -272,6 +272,47 @@ def check_include_file_path(include_file_name): return include_file_path +def cached_includes_of_plugin(check_file_path): + cache_file_path = _include_cache_file_path(check_file_path) + try: + return _get_cached_check_includes(check_file_path, cache_file_path) + except OSError, e: + pass # No usable cache. Terminate + + includes = includes_of_plugin(check_file_path) + _write_check_include_cache(cache_file_path, includes) + return includes + + +def _get_cached_check_includes(check_file_path, cache_file_path): + check_stat = os.stat(check_file_path) + cache_stat = os.stat(cache_file_path) + + if check_stat.st_mtime >= cache_stat.st_mtime: + raise OSError("Cache is too old") + + if cache_stat.st_size == 0: + return [] # No includes + + x = open(cache_file_path).read().strip() + if not x: + return [] + return x.split("|") + + +def _write_check_include_cache(cache_file_path, includes): + if not os.path.exists(os.path.dirname(cache_file_path)): + os.makedirs(os.path.dirname(cache_file_path)) + store.save_file(cache_file_path, "|".join(includes)) + + +def _include_cache_file_path(path): + is_local = path.startswith(cmk.paths.local_checks_dir) + return os.path.join(cmk.paths.include_cache_dir, + "local" if is_local else "builtin", + os.path.basename(path)) + + # Parse the check file without executing the code to find the check include # files the check uses. The following statements are extracted: # check_info[...] = { "includes": [...] }

6 years, 4 months

5986 FIX User synchronization is now using background job mechanism

by Lars Michelsen

Module: check_mk Branch: master Commit: 824116ba7aca79f3cbb69720c0884b1045c299ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=824116ba7aca79… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 18 08:15:52 2018 +0200 5986 FIX User synchronization is now using background job mechanism To prevent timeouts of the GUI when manually starting the user synchronization the user synchronization is now performed as background job. You can either have a log at the state of the current/last job from the Users page or the list of all background jobs. Change-Id: I94a3924de2b28e46d6bead373f77079622061d12 --- .werks/5986 | 14 ++++++ web/htdocs/userdb.py | 120 ++++++++++++++++++++++++++------------------- web/htdocs/views.py | 7 --- web/htdocs/wato.py | 85 +++++++++++++++++++++++++++++--- web/plugins/userdb/ldap.py | 38 ++------------ 5 files changed, 164 insertions(+), 100 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=824116ba7a…

6 years, 4 months

Added missing variable declaration

by Lars Michelsen

Module: check_mk Branch: master Commit: 8363f96b196e035edc7ef546fa26a6c53cefbaa2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8363f96b196e03… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 7 10:03:15 2018 +0200 Added missing variable declaration Change-Id: I07ff5b6aabe7d81be8d024253a28f1752c34abd4 --- cmk/paths.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cmk/paths.py b/cmk/paths.py index 226eaad..f6fd948 100644 --- a/cmk/paths.py +++ b/cmk/paths.py @@ -62,6 +62,7 @@ counters_dir = None tcp_cache_dir = None data_source_cache_dir = None snmp_scan_cache_dir = None +include_cache_dir = None tmp_dir = None logwatch_dir = None nagios_objects_file = None

6 years, 4 months

Added missing import/qualifications.

by Sven Panne

Module: check_mk Branch: master Commit: 7bedf23e5854c838de5ae04d7fa3e5ea07dbf715 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7bedf23e5854c8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 2 16:24:24 2018 +0200 Added missing import/qualifications. Change-Id: I3c411780cd4a4cc6a53ba237a6048aee53788dae --- active_checks/check_mailboxes | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/active_checks/check_mailboxes b/active_checks/check_mailboxes index 942510e..0fe7af7 100755 --- a/active_checks/check_mailboxes +++ b/active_checks/check_mailboxes @@ -37,6 +37,7 @@ import socket import traceback from optparse import OptionParser +import cmk.render import cmk.password_store cmk.password_store.replace_passwords() @@ -220,7 +221,7 @@ def main(options): status = 0 status_icon = "" for mail in old_mails: - age = Age(now - mail.timestamp()) + age = cmk.render.Age(now - mail.timestamp()) if float(age) >= options.crit_age: report_age = age status = 2 @@ -236,16 +237,16 @@ def main(options): (status, "oldest mail in %s is at least %s old %s(warn/crit at %s/%s)" %\ (mb, report_age, status_icon, - Age(options.warn_age), Age(options.crit_age)))) + cmk.render.Age(options.warn_age), cmk.render.Age(options.crit_age)))) if options.crit_new and options.warn_new: new_mails = imap.mails(mb, after=(now - options.crit_new)) status = 2 - report_age = Age(options.crit_new) + report_age = cmk.render.Age(options.crit_new) if new_mails: new_mails = new_mails[options.retrieve_max * -1:] for mail in reversed(new_mails): - age = Age(now - mail.timestamp()) + age = cmk.render.Age(now - mail.timestamp()) if float(age) < options.warn_new: status = 0 break @@ -260,7 +261,7 @@ def main(options): if status > 0: messages.append( (status, "newest mail in %s is at least %s old %s(warn/crit at %s/%s)" %\ - (mb, report_age, status_icon, Age(options.warn_new), Age(options.crit_new)))) + (mb, report_age, status_icon, cmk.render.Age(options.warn_new), cmk.render.Age(options.crit_new)))) if messages: status = max([m[0] for m in messages])

6 years, 4 months

Reduce copy-n-paste a bit by centralizing rendering of ages.

by Sven Panne

Module: check_mk Branch: master Commit: f5df5cf581c945e44707d52d63b2fda0c38b0c1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5df5cf581c945… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 2 16:12:10 2018 +0200 Reduce copy-n-paste a bit by centralizing rendering of ages. Change-Id: I3d8de99449bc5e33b3376b91deee6fe8a0ed6b42 --- active_checks/check_mailboxes | 25 ------------------------ cmk/ec/main.py | 21 +-------------------- cmk/render.py | 44 ++++++++++++++++++++++--------------------- cmk_base/check_api.py | 2 +- 4 files changed, 25 insertions(+), 67 deletions(-) diff --git a/active_checks/check_mailboxes b/active_checks/check_mailboxes index f460bc9..942510e 100755 --- a/active_checks/check_mailboxes +++ b/active_checks/check_mailboxes @@ -132,31 +132,6 @@ class ImapWrapper(object): return MailList(self.__conn, ids[1][0].split()) -class Age(object): - def __init__(self, secs): - super(Age, self).__init__() - self.__secs = secs - - def __str__(self): - if self.__secs < 240: - return "%d sec" % self.__secs - mins = self.__secs / 60 - if mins < 120: - return "%d min" % mins - hours, mins = divmod(mins, 60) - if hours < 12 and mins > 0: - return "%d hours %d min" % (hours, mins) - elif hours < 48: - return "%d hours" % hours - days, hours = divmod(hours, 24) - if days < 7 and hours > 0: - return "%d days %d hours" % (days, hours) - return "%d days" % days - - def __float__(self): - return float(self.__secs) - - def output(message): sys.stdout.write(message+"\n") diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 68dacf5..082f7ca 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -601,7 +601,7 @@ class SNMPTrapTranslator(object): if value.__class__.__name__ in ['ObjectIdentifier', 'IpAddress']: val = value.prettyPrint() elif value.__class__.__name__ == 'TimeTicks': - val = self._fmt_timeticks(value._value) + val = str(cmk.render.Age(float(value._value) / 100)) else: val = value._value @@ -613,25 +613,6 @@ class SNMPTrapTranslator(object): return var_binds - # Format time difference seconds into approximated human readable value - @staticmethod - def _fmt_timeticks(ticks): - secs = float(ticks) / 100 - if secs < 240: - return "%d sec" % secs - mins = secs / 60 - - if mins < 120: - return "%d min" % mins - - hours, mins = divmod(mins, 60) - if hours < 48: - return "%d hours, %d min" % (hours, mins) - - days, hours = divmod(hours, 24) - return "%d days, %d hours, %d min" % (days, hours, mins) - - # Convert pysnmp datatypes to simply handable ones def _translate_via_mibs(self, ipaddress, var_bind_list): var_binds = [] diff --git a/cmk/render.py b/cmk/render.py index 92be084..29d7df8 100644 --- a/cmk/render.py +++ b/cmk/render.py @@ -64,27 +64,29 @@ def time_since(timestamp): return timespan(time.time() - timestamp) -def approx_age(secs): - """Format time difference seconds into approximated human readable text""" - - if secs < 240: - return "%d sec" % secs - - mins = secs / 60 - if mins < 120: - return "%d min" % mins - - hours, mins = divmod(mins, 60) - if hours < 12 and mins > 0: - return "%d hours %d min" % (hours, mins) - elif hours < 48: - return "%d hours" % hours - - days, hours = divmod(hours, 24) - if days < 7 and hours > 0: - return "%d days %d hours" % (days, hours) - - return "%d days" % days +class Age(object): + def __init__(self, secs): + super(Age, self).__init__() + self.__secs = secs + + def __str__(self): + if self.__secs < 240: + return "%d sec" % self.__secs + mins = self.__secs / 60 + if mins < 120: + return "%d min" % mins + hours, mins = divmod(mins, 60) + if hours < 12 and mins > 0: + return "%d hours %d min" % (hours, mins) + elif hours < 48: + return "%d hours" % hours + days, hours = divmod(hours, 24) + if days < 7 and hours > 0: + return "%d days %d hours" % (days, hours) + return "%d days" % days + + def __float__(self): + return float(self.__secs) def bytes(b, base=1024.0, bytefrac=True, unit="B"): diff --git a/cmk_base/check_api.py b/cmk_base/check_api.py index bb70f15..6c41c3b 100644 --- a/cmk_base/check_api.py +++ b/cmk_base/check_api.py @@ -231,7 +231,7 @@ nagios_illegal_chars = _config.nagios_illegal_chars is_ipv6_primary = _config.is_ipv6_primary is_cmc = _config.is_cmc -get_age_human_readable = render.approx_age +get_age_human_readable = lambda secs: str(render.Age(secs)) get_bytes_human_readable = render.bytes quote_shell_string = _utils.quote_shell_string

6 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2018