Checkmk git commits May 2018

checkmk-commits@lists.checkmk.com

10 participants
375 discussions

Cleaned up log_exception() to logger.exception()

by Lars Michelsen

Module: check_mk Branch: master Commit: 252ec15aa376e063bd5ab68dfbe8f32b7a6e914c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=252ec15aa376e0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 16 22:07:22 2018 +0100 Cleaned up log_exception() to logger.exception() Change-Id: I55b624dcddb57f3f9e35d0dbf47b93ccd988599a --- web/htdocs/bi.py | 2 +- web/htdocs/index.py | 7 ++++--- web/htdocs/lib.py | 8 -------- web/htdocs/log.py | 16 ++++++++++++++++ web/htdocs/sidebar.py | 4 ++-- web/htdocs/userdb.py | 2 +- web/htdocs/views.py | 3 ++- web/htdocs/visuals.py | 3 ++- web/htdocs/wato.py | 19 +++++++++---------- web/htdocs/watolib.py | 18 +++++++++--------- web/htdocs/webapi.py | 3 ++- web/plugins/sidebar/shipped.py | 3 ++- web/plugins/userdb/ldap.py | 4 ++-- web/plugins/views/perfometer.py | 4 ++-- web/plugins/wato/omd_configuration.py | 4 ++-- 15 files changed, 56 insertions(+), 44 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=252ec15aa3…

6 years, 4 months

Cleaned up special case from age_human_readable()

by Lars Michelsen

Module: check_mk Branch: master Commit: 174d2e206770b231b46d888dde6ebcbd739c9e00 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=174d2e206770b2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 16 18:25:15 2018 +0100 Cleaned up special case from age_human_readable() Change-Id: Icbc0cee746d8cff5afc101c49ca32a8da425fc57 --- web/htdocs/lib.py | 10 +++++----- web/plugins/perfometer/check_mk.py | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 984aeff..7c98ba0 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -354,26 +354,26 @@ def number_human_readable(n, precision=1, unit="B"): return (f + "%s") % (n, unit) -def age_human_readable(secs, min_only=False): +def age_human_readable(secs): if secs < 0: - return "- " + age_human_readable(-secs, min_only) + return "- " + age_human_readable(-secs) elif secs > 0 and secs < 1: # ms return physical_precision(secs, 3, _("s")) - elif min_only: - mins = secs / 60.0 - return "%.1f %s" % (mins, _("m")) elif secs < 10: return "%.2f %s" % (secs, _("s")) elif secs < 60: return "%.1f %s" % (secs, _("s")) elif secs < 240: return "%d %s" % (secs, _("s")) + mins = secs / 60 if mins < 360: return "%d %s" % (mins, _("m")) + hours = mins / 60 if hours < 48: return "%d %s" % (hours, _("h")) + days = hours / 24.0 if days < 6: d = ("%.1f" % days).rstrip("0").rstrip(".") diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index b89a44f..c5d845a 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -1058,8 +1058,7 @@ def perfometer_veeam_client(row, check_command, perf_data): h = perfometer_logarithmic_dual_independent(avgspeed_bytes, '#54b948', 10000000, 2, duration_secs, '#2098cb', 500, 2) avgspeed = cmk.render.bytes(avgspeed_bytes) - # Return Value always as minutes - duration = age_human_readable(duration_secs, True) + duration = age_human_readable(duration_secs) return "%s/s   %s" % (avgspeed, duration), h

6 years, 4 months

Moved date specific human rendering methods to more specific places and more often use cmk.render

by Lars Michelsen

Module: check_mk Branch: master Commit: 648922f00d41ae663572af5f38fd37b11721ad1f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=648922f00d41ae… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 16 17:04:39 2018 +0100 Moved date specific human rendering methods to more specific places and more often use cmk.render Change-Id: Icab44fdfb7c6c9e75e8b9d0458cf3095256ec7bc --- cmk/render.py | 6 +++--- web/htdocs/key_mgmt.py | 3 ++- web/htdocs/lib.py | 37 ------------------------------------- web/htdocs/notifications.py | 3 ++- 4 files changed, 7 insertions(+), 42 deletions(-) diff --git a/cmk/render.py b/cmk/render.py index 29d7df8..b470398 100644 --- a/cmk/render.py +++ b/cmk/render.py @@ -43,15 +43,15 @@ except NameError: def date(timestamp): - return time.strftime("%Y-%m-%d", time.localtime(timestamp)) + return time.strftime(_("%Y-%m-%d"), time.localtime(timestamp)) def date_and_time(timestamp): - return time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(timestamp)) + return time.strftime(_("%Y-%m-%d %H:%M:%S"), time.localtime(timestamp)) def time_of_day(timestamp): - return time.strftime("%H:%M:%S", time.localtime(timestamp)) + return time.strftime(_("%H:%M:%S"), time.localtime(timestamp)) def timespan(seconds): diff --git a/web/htdocs/key_mgmt.py b/web/htdocs/key_mgmt.py index be3ab60..d233225 100644 --- a/web/htdocs/key_mgmt.py +++ b/web/htdocs/key_mgmt.py @@ -33,6 +33,7 @@ os.environ["CRYPTOGRAPHY_ALLOW_OPENSSL_098"] = "1" from OpenSSL import crypto +import cmk.render import cmk.store as store import table @@ -176,7 +177,7 @@ class PageKeyManagement(object): ("mode", self.download_mode), ("key", key_id)]) html.icon_button(download_url, _("Download this key"), "download") table.cell(_("Description"), html.render_text(key["alias"])) - table.cell(_("Created"), date_human_readable(key["date"])) + table.cell(_("Created"), cmk.render.date(key["date"])) table.cell(_("By"), html.render_text(key["owner"])) table.cell(_("Digest (MD5)"), html.render_text(cert.digest("md5"))) table.end() diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 5f4562d..438ae65 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -427,40 +427,3 @@ def age_human_readable(secs, min_only=False): return "%.1f %s" % (years, _("y")) else: return "%.0f %s" % (years, _("y")) - - -def date_human_readable(timestamp): - # This can be localized: - return time.strftime(_("%m/%d/%Y"), time.localtime(timestamp)) - -def datetime_human_readable(timestamp): - # This can be localized: - return time.strftime(_("%m/%d/%Y %H:%M:%S"), time.localtime(timestamp)) - -def date_range_human_readable(start_time, end_time): - start_time_local = time.localtime(start_time) - end_time_local = time.localtime(end_time) - if start_time_local[:3] == end_time_local[:3]: # same day - return date_human_readable(start_time) - - elif start_time_local[:2] == end_time_local[:2]: # same month - date_format = _("%m/%d1-%d2/%Y") - f = date_format.replace("%d2", time.strftime("%d", end_time_local)) - f = f.replace("%d1", "%d") - return time.strftime(f, start_time_local) - - elif start_time_local[0] == end_time_local[0]: # same year - date_format = _("%m1/%d1/%Y - %m2/%d2/%Y") - f = date_format.replace("%d2", time.strftime("%d", end_time_local)) - f = f.replace("%m2", time.strftime("%m", end_time_local)) - f = f.replace("%d1", "%d").replace("%m1", "%m") - return time.strftime(f, start_time_local) - - else: - return date_human_readable(start_time) + " - " + \ - date_human_readable(end_time) - -# Just print year and month, no day -def date_month_human_readable(timestamp): - # TODO: %B will currently not be localized - return time.strftime(_("%B %Y"), time.localtime(timestamp)) diff --git a/web/htdocs/notifications.py b/web/htdocs/notifications.py index efd47c6..32b0032 100644 --- a/web/htdocs/notifications.py +++ b/web/htdocs/notifications.py @@ -24,6 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +import cmk.render import config import lib import sites @@ -170,7 +171,7 @@ def render_page_confirm(acktime, prev_url, failed_notifications): if failed_notifications: html.write('<div class="really">\n') html.write(_("Do you really want to acknowledge all failed notifications up to %s?") %\ - lib.datetime_human_readable(acktime)) + cmk.render.date_and_time(acktime)) html.begin_form("confirm", method="GET", action=prev_url) html.hidden_field('acktime', acktime), html.button('_confirm', _("Yes"))

6 years, 4 months

Moved make_utf8() helper to cmk.utils

by Lars Michelsen

Module: check_mk Branch: master Commit: 9b8c6ed9a35be9b365206792078124f2af8d61aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b8c6ed9a35be9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 16 18:34:38 2018 +0100 Moved make_utf8() helper to cmk.utils Change-Id: I7442d12b0106647aca5489e48e8b498723fe74db --- cmk/utils.py | 36 ++++++++++++++++++++++++++++++++++++ cmk_base/utils.py | 8 +------- web/htdocs/html_mod_python.py | 6 +++--- web/htdocs/lib.py | 8 -------- web/htdocs/mkeventd.py | 3 ++- web/htdocs/userdb.py | 5 +++-- web/htdocs/watolib.py | 11 ++++++----- 7 files changed, 51 insertions(+), 26 deletions(-) diff --git a/cmk/utils.py b/cmk/utils.py new file mode 100644 index 0000000..3afbc1c --- /dev/null +++ b/cmk/utils.py @@ -0,0 +1,36 @@ +#!/usr/bin/env python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +"""This is an unsorted collection of small unrelated helper functions which are +usable in all components of Check_MK + +Please try to find a better place for the things you want to put here.""" + +def make_utf8(x): + if type(x) == unicode: + return x.encode('utf-8') + else: + return x diff --git a/cmk_base/utils.py b/cmk_base/utils.py index 1c27cd7..ac6c052 100644 --- a/cmk_base/utils.py +++ b/cmk_base/utils.py @@ -32,6 +32,7 @@ import signal import time from cmk.exceptions import MKGeneralException, MKTerminate +from cmk.utils import make_utf8 # TODO: Try to find a better place for them. @@ -39,13 +40,6 @@ import sys import itertools -def make_utf8(x): - if type(x) == unicode: - return x.encode('utf-8') - else: - return x - - # Aggegates several monitoring states to the worst state def worst_service_state(*states): if 2 in states: diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index 1320476..1ea9286 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -25,13 +25,13 @@ # Boston, MA 02110-1301 USA. from mod_python import Cookie, util, apache # pylint: disable=import-error -from lib import make_utf8 from gui_exceptions import MKGeneralException, MKException from log import logger import htmllib import os, time, config, weblib, re import mobile import cmk.paths +import cmk.utils # Is used to end the HTTP request processing from deeper code levels class FinalizeRequest(Exception): @@ -176,9 +176,9 @@ class html_mod_python(htmllib.html): # httponly tells the browser not to make this cookie available to Javascript. # But it is only available from Python 2.6+. Be compatible. try: - c = Cookie.Cookie(varname, make_utf8(value), path='/', httponly=True) + c = Cookie.Cookie(varname, cmk.utils.make_utf8(value), path='/', httponly=True) except AttributeError: - c = Cookie.Cookie(varname, make_utf8(value), path='/') + c = Cookie.Cookie(varname, cmk.utils.make_utf8(value), path='/') if self.is_ssl_request(): c.secure = True diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 7c98ba0..5bdd54f 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -32,14 +32,6 @@ import cmk.paths from log import logger - -def make_utf8(x): - if type(x) == unicode: - return x.encode('utf-8') - else: - return x - - # We should use /dev/random here for cryptographic safety. But # that involves the great problem that the system might hang # because of loss of entropy. So we hope /dev/urandom is enough. diff --git a/web/htdocs/mkeventd.py b/web/htdocs/mkeventd.py index c9da43a..8061acc 100644 --- a/web/htdocs/mkeventd.py +++ b/web/htdocs/mkeventd.py @@ -39,6 +39,7 @@ import cmk.paths import cmk.ec.settings import cmk.ec.export import cmk.store +import cmk.utils if cmk.is_managed_edition(): import managed @@ -174,7 +175,7 @@ def send_event(event): event["ipaddress"], event["application"], event["text"]), ] - execute_command("CREATE", map(make_utf8, rfc), site=event["site"]) + execute_command("CREATE", map(cmk.utils.make_utf8, rfc), site=event["site"]) return ";".join(rfc) diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index eccbd06..20bcfa0 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -33,6 +33,7 @@ from gui_exceptions import MKGeneralException, MKUserError, MKInternalError from log import logger import time, os, pprint, shutil, traceback from valuespec import * +import cmk.utils import cmk.paths import cmk.store as store @@ -648,7 +649,7 @@ def load_users(lock = False): def custom_attr_path(userid, key): - return cmk.paths.var_dir + "/web/" + make_utf8(userid) + "/" + key + ".mk" + return cmk.paths.var_dir + "/web/" + cmk.utils.make_utf8(userid) + "/" + key + ".mk" def load_custom_attr(userid, key, conv_func, default = None): @@ -868,7 +869,7 @@ def _save_auth_serials(updated_profiles): # Write out the users serials serials = "" for user_id, user in updated_profiles.items(): - serials += '%s:%d\n' % (make_utf8(user_id), user.get('serial', 0)) + serials += '%s:%d\n' % (cmk.utils.make_utf8(user_id), user.get('serial', 0)) store.save_file('%s/auth.serials' % os.path.dirname(cmk.paths.htpasswd_file), serials) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 46d677a..fd6c44a 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -64,6 +64,7 @@ from gui_exceptions import MKGeneralException, MKAuthException, MKUserError import cmk.paths import cmk.defines +import cmk.utils import cmk.store as store import cmk.render as render import cmk.ec.defaults @@ -193,7 +194,7 @@ def log_entry(linkinfo, action, message, user_id=None): # at the last possible time: When rendering. But this here is the last # place where we can distinguish between HTML() encapsulated (already) # escaped / allowed HTML and strings to be escaped. - message = make_utf8(html.attrencode(message)).strip() + message = cmk.utils.make_utf8(html.attrencode(message)).strip() # linkinfo is either a Folder, or a Host or a hostname or None if isinstance(linkinfo, Folder): @@ -603,7 +604,7 @@ class ConfigDomainOMD(ConfigDomain): p = subprocess.Popen(["omd", "config", "change"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, stdin=subprocess.PIPE, close_fds=True) - stdout = p.communicate(make_utf8("\n".join(config_change_commands)))[0] + stdout = p.communicate(cmk.utils.make_utf8("\n".join(config_change_commands)))[0] self._logger.debug(" Exit code: %d" % p.returncode) self._logger.debug(" Output: %r" % stdout) if p.returncode != 0: @@ -7011,7 +7012,7 @@ def check_mk_local_automation(command, args=None, indata="", stdin_data=None, ti if command in [ 'restart', 'reload' ]: call_hook_pre_activate_changes() - cmd = [ make_utf8(a) for a in cmd ] + cmd = [ cmk.utils.make_utf8(a) for a in cmd ] try: # This debug output makes problems when doing bulk inventory, because # it garbles the non-HTML response output @@ -7442,7 +7443,7 @@ class Rulespecs(object): if group_name.startswith(main_group_name + "/"): # TODO: Move this subgroup title calculation to some generic place sub_group_title = group_name.split("/", 1)[1] - choices.append((make_utf8(group_name), u"  ⌙ %s" % sub_group_title)) + choices.append((cmk.utils.make_utf8(group_name), u"  ⌙ %s" % sub_group_title)) return choices @@ -7462,7 +7463,7 @@ class Rulespecs(object): group_names = [] for group_name in self._sorted_groups: - main_group = make_utf8(group_name.split('/')[0]) + main_group = cmk.utils.make_utf8(group_name.split('/')[0]) if main_group not in seen: group_names.append(main_group) seen.add(main_group)

6 years, 4 months

Moved quote_shell_string() to cmk.utils

by Lars Michelsen

Module: check_mk Branch: master Commit: 164bd22aaa1625f29aa1be434f0d010e93d281ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=164bd22aaa1625… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 16 18:41:21 2018 +0100 Moved quote_shell_string() to cmk.utils Change-Id: I39f70a4d1c07e66d611e9aac3aa94de02f115940 --- cmk/utils.py | 5 +++++ cmk_base/utils.py | 11 +++++------ web/htdocs/lib.py | 6 ------ web/htdocs/metrics.py | 5 +++-- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/cmk/utils.py b/cmk/utils.py index 3afbc1c..9baf269 100644 --- a/cmk/utils.py +++ b/cmk/utils.py @@ -34,3 +34,8 @@ def make_utf8(x): return x.encode('utf-8') else: return x + + +def quote_shell_string(s): + """Quote string for use as arguments on the shell""" + return "'" + s.replace("'", "'\"'\"'") + "'" diff --git a/cmk_base/utils.py b/cmk_base/utils.py index ac6c052..22acd96 100644 --- a/cmk_base/utils.py +++ b/cmk_base/utils.py @@ -32,7 +32,11 @@ import signal import time from cmk.exceptions import MKGeneralException, MKTerminate -from cmk.utils import make_utf8 + +# TODO: Clean up the call sites +from cmk.utils import \ + make_utf8, \ + quote_shell_string # TODO: Try to find a better place for them. @@ -48,11 +52,6 @@ def worst_service_state(*states): return max(states) -def quote_shell_string(s): - """Quote string for use as arguments on the shell""" - return "'" + s.replace("'", "'\"'\"'") + "'" - - # Works with Check_MK version (without tailing .cee and/or .demo) def is_daily_build_version(v): return len(v) == 10 or '-' in v diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 5bdd54f..9118a5f 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -128,12 +128,6 @@ def pnp_cleanup(s): .replace('\\', '_') -# Quote string for use as arguments on the shell -# TODO: Move to Check_MK library -def quote_shell_string(s): - return "'" + s.replace("'", "'\"'\"'") + "'" - - def log_exception(msg=None): if msg is None: msg = _('Internal error') diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 1a9c9a4..6d74088 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -47,6 +47,7 @@ from gui_exceptions import MKGeneralException, MKUserError, MKInternalError, \ MKUnauthenticatedException, MKAuthException import livestatus +import cmk.utils from cmk.regex import regex import json @@ -1569,8 +1570,8 @@ def render_graph_pnp(graph_template, translated_metrics): vertical_label = graph_template.get("vertical_label", vertical_label) rrdgraph_arguments += " --vertical-label %s --title %s " % ( - quote_shell_string(vertical_label or " "), - quote_shell_string(graph_title)) + cmk.utils.quote_shell_string(vertical_label or " "), + cmk.utils.quote_shell_string(graph_title)) min_value, max_value = get_graph_range(graph_template, translated_metrics) if min_value != None and max_value != None:

6 years, 4 months

Moved pnp_cleanup() to cmk.utils

by Lars Michelsen

Module: check_mk Branch: master Commit: 48f3ebd485ade37275f7a0d514f203e482a408dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48f3ebd485ade3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 16 18:48:52 2018 +0100 Moved pnp_cleanup() to cmk.utils Change-Id: I47977771bf42db7e51581085229bd83c46ea32a7 --- cmk/utils.py | 10 ++++++++++ cmk_base/prediction.py | 11 ++--------- web/htdocs/lib.py | 8 -------- web/htdocs/metrics.py | 10 +++++----- web/htdocs/prediction.py | 5 ++++- web/plugins/icons/builtin.py | 6 ++++-- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/cmk/utils.py b/cmk/utils.py index 9baf269..2918bf2 100644 --- a/cmk/utils.py +++ b/cmk/utils.py @@ -39,3 +39,13 @@ def make_utf8(x): def quote_shell_string(s): """Quote string for use as arguments on the shell""" return "'" + s.replace("'", "'\"'\"'") + "'" + + +# TODO: Change to better name like: quote_pnp_string() +def pnp_cleanup(s): + """Quote a string (host name or service description) in PNP4Nagios format""" + return s \ + .replace(' ', '_') \ + .replace(':', '_') \ + .replace('/', '_') \ + .replace('\\', '_') diff --git a/cmk_base/prediction.py b/cmk_base/prediction.py index be6bc7a..ee57d51 100644 --- a/cmk_base/prediction.py +++ b/cmk_base/prediction.py @@ -35,6 +35,7 @@ import livestatus import cmk.paths import cmk.debug +import cmk.utils from cmk.exceptions import MKGeneralException @@ -219,7 +220,7 @@ def get_levels(hostname, service_description, dsname, params, cf, levels_factor= # Compute directory for prediction data dir = "%s/prediction/%s/%s/%s" % (cmk.paths.var_dir, hostname, - pnp_cleanup(service_description), pnp_cleanup(dsname)) + cmk.utils.pnp_cleanup(service_description), cmk.utils.pnp_cleanup(dsname)) if not os.path.exists(dir): os.makedirs(dir) @@ -320,11 +321,3 @@ def get_levels(hostname, service_description, dsname, params, cf, levels_factor= levels.append((None, None)) return ref_value, levels - - -def pnp_cleanup(s): - return s \ - .replace(' ', '_') \ - .replace(':', '_') \ - .replace('/', '_') \ - .replace('\\', '_') diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 9118a5f..e1a1c0c 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -120,14 +120,6 @@ def local_web_plugins_have_changed(): return have_changed -def pnp_cleanup(s): - return s \ - .replace(' ', '_') \ - .replace(':', '_') \ - .replace('/', '_') \ - .replace('\\', '_') - - def log_exception(msg=None): if msg is None: msg = _('Internal error') diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 6d74088..3480381 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -565,7 +565,7 @@ def parse_perf_data(perf_data_string, check_command=None): for part in parts: try: varname, values = part.split("=", 1) - varname = pnp_cleanup(varname.replace("\"", "").replace("\'", "")) + varname = cmk.utils.pnp_cleanup(varname.replace("\"", "").replace("\'", "")) value_parts = values.split(";") while len(value_parts) < 5: @@ -1703,8 +1703,8 @@ def page_host_service_graph_popup(): def host_service_graph_popup_pnp(site, host_name, service_description): - pnp_host = pnp_cleanup(host_name) - pnp_svc = pnp_cleanup(service_description) + pnp_host = cmk.utils.pnp_cleanup(host_name) + pnp_svc = cmk.utils.pnp_cleanup(service_description) url_prefix = config.site(site)["url_prefix"] if html.mobile: @@ -1821,8 +1821,8 @@ def host_service_graph_dashlet_pnp(graph_identification): site = graph_identification[1]["site"] source = int(graph_identification[1]["graph_index"]) - pnp_host = pnp_cleanup(graph_identification[1]["host_name"]) - pnp_svc = pnp_cleanup(graph_identification[1]["service_description"]) + pnp_host = cmk.utils.pnp_cleanup(graph_identification[1]["host_name"]) + pnp_svc = cmk.utils.pnp_cleanup(graph_identification[1]["service_description"]) url_prefix = config.site(site)["url_prefix"] html.write(url_prefix + "pnp4nagios/index.php/image?host=%s&srv=%s&source=%d&view=%s&theme=multisite" % \ diff --git a/web/htdocs/prediction.py b/web/htdocs/prediction.py index 74744ac..6fadc5e 100644 --- a/web/htdocs/prediction.py +++ b/web/htdocs/prediction.py @@ -34,6 +34,7 @@ import sites import livestatus from lib import * from gui_exceptions import MKGeneralException +import cmk.utils import cmk.store as store @@ -54,7 +55,9 @@ def page_graph(): current_value = get_current_perfdata(host, service, dsname) dir = "%s/prediction/%s/%s/%s" % ( - cmk.paths.var_dir, host, pnp_cleanup(service), pnp_cleanup(dsname)) + cmk.paths.var_dir, host, + cmk.utils.pnp_cleanup(service), + cmk.utils.pnp_cleanup(dsname)) if not os.path.exists(dir): raise MKGeneralException(_("There is currently no prediction information " diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index ab96cdd..c7ab694 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -57,6 +57,8 @@ # 'paint': paint_icon_image, #}) +import cmk.utils + # .--Action Menu---------------------------------------------------------. # | _ _ _ __ __ | # | / \ ___| |_(_) ___ _ __ | \/ | ___ _ __ _ _ | @@ -280,11 +282,11 @@ multisite_icons_and_actions['status_acknowledged'] = { # Intelligent Links to PNP4Nagios 0.6.X def pnp_url(row, what, how = 'graph'): sitename = row["site"] - host = pnp_cleanup(row["host_name"]) + host = cmk.utils.pnp_cleanup(row["host_name"]) if what == "host": svc = "_HOST_" else: - svc = pnp_cleanup(row["service_description"]) + svc = cmk.utils.pnp_cleanup(row["service_description"]) url_prefix = config.site(sitename)["url_prefix"] if html.mobile: url = url_prefix + ("pnp4nagios/index.php?kohana_uri=/mobile/%s/%s/%s" % \

6 years, 4 months

Moved percent_human_redable() to cmk.render.percent()

by Lars Michelsen

Module: check_mk Branch: master Commit: d33e465541e969f06585be70446a70862a6dabd4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d33e465541e969… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 16 17:09:50 2018 +0100 Moved percent_human_redable() to cmk.render.percent() Change-Id: I1be8ab644065b19e93e61a680d429fcd0b383495 --- cmk/render.py | 45 +++++++++++++++++++++++++++++++++++++++++ web/htdocs/lib.py | 11 ---------- web/plugins/metrics/check_mk.py | 4 ++-- web/plugins/views/painters.py | 3 ++- 4 files changed, 49 insertions(+), 14 deletions(-) diff --git a/cmk/render.py b/cmk/render.py index b470398..f17a0a6 100644 --- a/cmk/render.py +++ b/cmk/render.py @@ -32,6 +32,7 @@ are just for optical output purposes.""" # THIS IS STILL EXPERIMENTAL import time +import math # TODO: Clean this up one day by using the way recommended by gettext. # (See https://docs.python.org/2/library/gettext.html). For this we @@ -41,6 +42,15 @@ try: except NameError: _ = lambda x: x # Fake i18n when not available +#. +# .--Date/Time-----------------------------------------------------------. +# | ____ _ _______ _ | +# | | _ \ __ _| |_ ___ / /_ _(_)_ __ ___ ___ | +# | | | | |/ _` | __/ _ \ / / | | | | '_ ` _ \ / _ \ | +# | | |_| | (_| | || __// / | | | | | | | | | __/ | +# | |____/ \__,_|\__\___/_/ |_| |_|_| |_| |_|\___| | +# | | +# '----------------------------------------------------------------------' def date(timestamp): return time.strftime(_("%Y-%m-%d"), time.localtime(timestamp)) @@ -88,6 +98,15 @@ class Age(object): def __float__(self): return float(self.__secs) +#. +# .--Bits/Bytes----------------------------------------------------------. +# | ____ _ _ ______ _ | +# | | __ )(_) |_ ___ / / __ ) _ _| |_ ___ ___ | +# | | _ \| | __/ __| / /| _ \| | | | __/ _ \/ __| | +# | | |_) | | |_\__ \/ / | |_) | |_| | || __/\__ \ | +# | |____/|_|\__|___/_/ |____/ \__, |\__\___||___/ | +# | |___/ | +# '----------------------------------------------------------------------' def bytes(b, base=1024.0, bytefrac=True, unit="B"): """Formats byte values to be used in texts for humans. @@ -130,3 +149,29 @@ def filesize(size): return str(size)[:-6] + dec_sep + str(size)[-6:-3] + dec_sep + str(size)[-3:] else: return str(size)[:-9] + dec_sep + str(size)[-9:-6] + dec_sep + str(size)[-6:-3] + dec_sep + str(size)[-3:] + + +#. +# .--Misc.Numbers--------------------------------------------------------. +# | __ __ _ _ _ _ | +# | | \/ (_)___ ___ | \ | |_ _ _ __ ___ | |__ ___ _ __ ___ | +# | | |\/| | / __|/ __| | \| | | | | '_ ` _ \| '_ \ / _ \ '__/ __| | +# | | | | | \__ \ (__ _| |\ | |_| | | | | | | |_) | __/ | \__ \ | +# | |_| |_|_|___/\___(_)_| \_|\__,_|_| |_| |_|_.__/ \___|_| |___/ | +# | | +# '----------------------------------------------------------------------' + +def percent(perc, precision=2, drop_zeroes=True): + """Renders a given number as string""" + if perc > 0: + perc_precision = max(1, 2 - int(round(math.log(perc, 10)))) + else: + perc_precision = 1 + + text = "%%.%df" % perc_precision % perc + + if drop_zeroes: + text = text.rstrip("0").rstrip(".") + + return text + "%" + diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 438ae65..e8620c5 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -384,17 +384,6 @@ def number_human_readable(n, precision=1, unit="B"): return (f + "%s") % (n, unit) -def percent_human_redable(perc, precision=2, drop_zeroes=True): - if perc > 0: - perc_precision = max(1, 2 - int(round(math.log(perc, 10)))) - else: - perc_precision = 1 - text = "%%.%df" % perc_precision % perc - if drop_zeroes: - text = text.rstrip("0").rstrip(".") - return text + "%" - - def age_human_readable(secs, min_only=False): if secs < 0: return "- " + age_human_readable(-secs, min_only) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 2725392..e3de931 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -126,7 +126,7 @@ unit_info["%"] = { "title" : _("%"), "description" : _("Percentage (0...100)"), "symbol" : _("%"), - "render" : lambda v: percent_human_redable(v, 3), + "render" : lambda v: cmk.render.percent(v, precision=3), } unit_info["s"] = { @@ -279,7 +279,7 @@ unit_info["ppm"] = { unit_info["%/m"] = { "title" : _("Percent Per Meter"), "symbol" : _("%/m"), - "render" : lambda v: percent_human_redable(v, 3) + _("/m"), + "render" : lambda v: cmk.render.percent(v, precision=3) + _("/m"), } unit_info["bar"] = { diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 0710d41..80c5c69 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -70,6 +70,7 @@ import bi # Needed for BI Icon. For arkane reasons (ask htdocs/module.py) this import config import cmk.paths +import cmk.render import cmk.man_pages as man_pages from cmk.regex import regex from cmk.defines import short_service_state_name, short_host_state_name @@ -820,7 +821,7 @@ def render_cache_info(what, row): if cache_interval: percentage = 100.0 * cache_age / cache_interval - text += _(", elapsed cache lifespan: %s") % percent_human_redable(percentage) + text += _(", elapsed cache lifespan: %s") % cmk.render.percent(percentage) return text

6 years, 4 months

Moved more formating functions to cmk.render

by Lars Michelsen

Module: check_mk Branch: master Commit: 7b2be3810a7ea5f66dd4d59ba38c619b5830e333 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b2be3810a7ea5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 19 07:22:50 2018 +0100 Moved more formating functions to cmk.render Change-Id: Icff6d0e88c155429d1c8741c0c6159c5360ccb8c --- cmk/render.py | 165 +++++++++++++++++++++++++++++++++---- web/htdocs/lib.py | 142 ------------------------------- web/htdocs/metrics.py | 7 +- web/htdocs/notifications.py | 2 +- web/plugins/metrics/check_mk.py | 46 +++++++---- web/plugins/perfometer/check_mk.py | 6 +- web/plugins/views/inventory.py | 2 +- web/plugins/views/painters.py | 28 +++---- 8 files changed, 206 insertions(+), 192 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7b2be3810a…

6 years, 4 months

Cleaned up store.*lock() call sites; Removed aliases in lib

by Lars Michelsen

Module: check_mk Branch: master Commit: 858b0e3ce1194da96f8cbed5ba0f1d0b0547f0c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=858b0e3ce1194d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 16 19:36:50 2018 +0100 Cleaned up store.*lock() call sites; Removed aliases in lib Change-Id: If539cc81d28200dd885db6b4efd574c94aae0d29 --- web/htdocs/cron.py | 3 ++- web/htdocs/index.py | 3 ++- web/htdocs/lib.py | 5 ----- web/htdocs/userdb.py | 2 +- web/htdocs/watolib.py | 16 ++++++++-------- web/plugins/userdb/hook_auth.py | 4 ++-- 6 files changed, 15 insertions(+), 18 deletions(-) diff --git a/web/htdocs/cron.py b/web/htdocs/cron.py index 1346fd4..5c14737 100644 --- a/web/htdocs/cron.py +++ b/web/htdocs/cron.py @@ -29,6 +29,7 @@ import traceback from lib import * from log import logger import cmk.paths +import cmk.store as store from gui_exceptions import MKGeneralException @@ -68,7 +69,7 @@ def page_run_cron(): if time.time() - last_run < 59: raise MKGeneralException("Cron called too early. Skipping.") file(lock_file, "w") # touches the file - aquire_lock(lock_file) + store.aquire_lock(lock_file) logger.debug("Starting cron jobs") diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 621c15f..22ea98a 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -39,6 +39,7 @@ from lib import * import log from html_mod_python import html_mod_python, FinalizeRequest import cmk.paths +import cmk.store as store from gui_exceptions import \ MKUserError, \ @@ -210,7 +211,7 @@ def ensure_general_access(): def finalize_request(): - release_all_locks() + store.release_all_locks() userdb.finalize() sites.disconnect() html.finalize() diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index e1a1c0c..712f20a 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -151,11 +151,6 @@ def tryint(x): return x -aquire_lock = store.aquire_lock -release_lock = store.release_lock -have_lock = store.have_lock -release_all_locks = store.release_all_locks - # Splits a word into sequences of numbers and non-numbers. # Creates a tuple from these where the number are converted # into int datatype. That way a naturual sort can be diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 20bcfa0..e02d1ce 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -700,7 +700,7 @@ def save_users(profiles): # Release the lock to make other threads access possible again asap # This lock is set by load_users() only in the case something is expected # to be written (like during user syncs, wato, ...) - release_lock(root_dir + "contacts.mk") + store.release_lock(root_dir + "contacts.mk") # populate the users cache # TODO: Can we clean this up? diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index fd6c44a..ff0b175 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -4613,7 +4613,7 @@ class ActivateChanges(object): path = site_changes_path(site_id) if lock: - aquire_lock(path) + store.aquire_lock(path) changes = [] try: @@ -4627,7 +4627,7 @@ class ActivateChanges(object): raise except: if lock: - release_lock(path) + store.release_lock(path) raise return changes @@ -4656,7 +4656,7 @@ class ActivateChanges(object): def _save_change(self, site_id, change_spec): path = site_changes_path(site_id) try: - aquire_lock(path) + store.aquire_lock(path) with open(path, "a+") as f: f.write(repr(change_spec)+"\0") @@ -4669,7 +4669,7 @@ class ActivateChanges(object): raise MKGeneralException(_("Cannot write file \"%s\": %s") % (path, e)) finally: - release_lock(path) + store.release_lock(path) # Returns a list of changes ordered by time and grouped by the change. @@ -6269,7 +6269,7 @@ def export_hosttags_to_php(hosttags, auxtags): tempfile = path + '.tmp' lockfile = path + '.state' file(lockfile, 'a') - aquire_lock(lockfile) + store.aquire_lock(lockfile) # Transform WATO internal data structures into easier usable ones hosttags_dict = {} @@ -6333,7 +6333,7 @@ function all_taggroup_choices($object_tags) { ''' % (format_php(hosttags_dict), format_php(auxtags_dict))) # Now really replace the destination file os.rename(tempfile, path) - release_lock(lockfile) + store.release_lock(lockfile) os.unlink(lockfile) @@ -9822,11 +9822,11 @@ def folder_preserving_link(add_vars): def lock_exclusive(): - aquire_lock(cmk.paths.default_config_dir + "/multisite.mk") + store.aquire_lock(cmk.paths.default_config_dir + "/multisite.mk") def unlock_exclusive(): - release_lock(cmk.paths.default_config_dir + "/multisite.mk") + store.release_lock(cmk.paths.default_config_dir + "/multisite.mk") def git_command(args): diff --git a/web/plugins/userdb/hook_auth.py b/web/plugins/userdb/hook_auth.py index b31ba6f..6ad4ae8 100644 --- a/web/plugins/userdb/hook_auth.py +++ b/web/plugins/userdb/hook_auth.py @@ -100,7 +100,7 @@ def create_php_file(callee, users, role_permissions, groups): tempfile = g_auth_base_dir + '/auth.php.tmp' lockfile = g_auth_base_dir + '/auth.php.state' file(lockfile, "a") - aquire_lock(lockfile) + store.aquire_lock(lockfile) # First write a temp file and then do a move to prevent syntax errors # when reading half written files during creating that new file @@ -214,7 +214,7 @@ function permitted_maps($username) { # Now really replace the file os.rename(tempfile, g_auth_base_dir + '/auth.php') - release_lock(lockfile) + store.release_lock(lockfile) def create_auth_file(callee, users):

6 years, 4 months

Moved drop_dotzero() from lib to utils

by Lars Michelsen

Module: check_mk Branch: master Commit: a7e71423f401f0d5ba9e2ddff404e9ce11d35b64 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7e71423f401f0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 19 07:26:31 2018 +0100 Moved drop_dotzero() from lib to utils Change-Id: I167bc01256b67dfbd387dece919c75b9cd2425dc --- web/htdocs/lib.py | 45 -------------------------------------- web/plugins/metrics/check_mk.py | 9 ++++---- web/plugins/perfometer/check_mk.py | 19 ++++++++++++++++ web/plugins/views/inventory.py | 21 ++++++++++++++++-- 4 files changed, 43 insertions(+), 51 deletions(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 609ecc0..7a57927 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -164,48 +164,3 @@ def cmp_version(a, b): aa = map(tryint, a.split(".")) bb = map(tryint, b.split(".")) return cmp(aa, bb) - - -def nic_speed_human_readable(bits_per_second): - if bits_per_second == 10000000: - return "10 Mbit/s" - elif bits_per_second == 100000000: - return "100 Mbit/s" - elif bits_per_second == 1000000000: - return "1 Gbit/s" - elif bits_per_second < 1500: - return "%d bit/s" % bits_per_second - elif bits_per_second < 1000000: - return "%s Kbit/s" % drop_dotzero(bits_per_second / 1000.0, digits=1) - elif bits_per_second < 1000000000: - return "%s Mbit/s" % drop_dotzero(bits_per_second / 1000000.0, digits=2) - else: - return "%s Gbit/s" % drop_dotzero(bits_per_second / 1000000000.0, digits=2) - -# Converts a number into a floating point number -# and drop useless zeroes at the end of the fraction -# 45.1 -> "45.1" -# 45.0 -> "45" -def drop_dotzero(v, digits=2): - t = "%%.%df" % digits % v - if "." in t: - return t.rstrip("0").rstrip(".") - else: - return t - - -def number_human_readable(n, precision=1, unit="B"): - base = 1024.0 - if unit == "Bit": - base = 1000.0 - - n = float(n) - f = "%." + str(precision) + "f" - if abs(n) > base * base * base: - return (f + "G%s") % (n / (base * base * base), unit) - elif abs(n) > base * base: - return (f + "M%s") % (n / (base * base), unit) - elif abs(n) > base: - return (f + "k%s") % (n / base, unit) - else: - return (f + "%s") % (n, unit) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 3d4184f..fe2054f 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -24,6 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +import utils import cmk.render # TODO Graphingsystem: @@ -141,7 +142,7 @@ unit_info["1/s"] = { "title" : _("per second"), "description" : _("Frequency (displayed in events/s)"), "symbol" : _("/s"), - "render" : lambda v: "%s%s" % (drop_dotzero(v), _("/s")), + "render" : lambda v: "%s%s" % (utils.drop_dotzero(v), _("/s")), } unit_info["hz"] = { @@ -233,7 +234,7 @@ unit_info["bytes/d"] = { unit_info["c"] = { "title" : _("Degree Celsius"), "symbol" : u"°C", - "render" : lambda v: "%s %s" % (drop_dotzero(v), u"°C"), + "render" : lambda v: "%s %s" % (utils.drop_dotzero(v), u"°C"), } unit_info["a"] = { @@ -269,13 +270,13 @@ unit_info["wh"] = { unit_info["dbm"] = { "title" : _("Decibel-milliwatts"), "symbol" : _("dBm"), - "render" : lambda v: "%s %s" % (drop_dotzero(v), _("dBm")), + "render" : lambda v: "%s %s" % (utils.drop_dotzero(v), _("dBm")), } unit_info["dbmv"] = { "title" : _("Decibel-millivolt"), "symbol" : _("dBmV"), - "render" : lambda v: "%s %s" % (drop_dotzero(v), _("dBmV")), + "render" : lambda v: "%s %s" % (utils.drop_dotzero(v), _("dBmV")), } unit_info["db"] = { diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 8469ffe..0a79c91 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -36,6 +36,25 @@ import cmk.render # 3. The parsed performance data as a list of 7-tuples of # (varname, value, unit, warn, crit, min, max) + +# TODO: Migrate to cmk.render.* +def number_human_readable(n, precision=1, unit="B"): + base = 1024.0 + if unit == "Bit": + base = 1000.0 + + n = float(n) + f = "%." + str(precision) + "f" + if abs(n) > base * base * base: + return (f + "G%s") % (n / (base * base * base), unit) + elif abs(n) > base * base: + return (f + "M%s") % (n / (base * base), unit) + elif abs(n) > base: + return (f + "k%s") % (n / base, unit) + else: + return (f + "%s") % (n, unit) + + def perfometer_esx_vsphere_datastores(row, check_command, perf_data): used_mb = perf_data[0][1] maxx = perf_data[0][-1] diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 15e9c09..68604fb 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. - +import utils import inventory from cmk.regex import regex import cmk.defines as defines @@ -254,10 +254,27 @@ def inv_paint_bytes_rounded(b): return "number", "%d %s" % (b, units[0]) +def _nic_speed_human_readable(bits_per_second): + if bits_per_second == 10000000: + return "10 Mbit/s" + elif bits_per_second == 100000000: + return "100 Mbit/s" + elif bits_per_second == 1000000000: + return "1 Gbit/s" + elif bits_per_second < 1500: + return "%d bit/s" % bits_per_second + elif bits_per_second < 1000000: + return "%s Kbit/s" % utils.drop_dotzero(bits_per_second / 1000.0, digits=1) + elif bits_per_second < 1000000000: + return "%s Mbit/s" % utils.drop_dotzero(bits_per_second / 1000000.0, digits=2) + else: + return "%s Gbit/s" % utils.drop_dotzero(bits_per_second / 1000000000.0, digits=2) + + @decorate_inv_paint def inv_paint_nic_speed(bits_per_second): if bits_per_second: - return "number", nic_speed_human_readable(int(bits_per_second)) + return "number", _nic_speed_human_readable(int(bits_per_second)) else: return "", ""

6 years, 4 months

← Newer
1
...
29
30
31
32
33
34
35
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2018