Checkmk git commits July 2016

checkmk-commits@lists.checkmk.com

10 participants
213 discussions

Fix display of help after recent style change

by Mathias Kettner

Module: check_mk Branch: master Commit: de6cfd4aceb60344966575c1c864bdab1a92b5a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de6cfd4aceb603… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 25 14:38:33 2016 +0200 Fix display of help after recent style change --- web/htdocs/check_mk.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 2f0d0cd..eefa989 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -377,6 +377,10 @@ table.dictionary td.dictleft { white-space: nowrap; } +table.dictionary td.dictleft div.help { + white-space: normal; +} + td.dictleft div.dictelement * { font-size: 8pt; }

8 years, 1 month

3736 New option for discontinuing counting on open event after configured time

by Mathias Kettner

Module: check_mk Branch: master Commit: 43fe6d227ef3fbf6ce0895665398cddc8eb2b031 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43fe6d227ef3fb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 25 14:42:32 2016 +0200 3736 New option for discontinuing counting on open event after configured time In the {{Counting}} section of a rule the Event Console has now a new option {{Discontinue counting after time as elapsed}}. Normally new messages matching an existing open event that is configured for counting will simply increase the counter and not open a new event. When you activate the new option you can limit this phase to a certain duration, e.g. to 10 minutes. Any messages arriving 10 minutes after the first matching message will then open a new event instead of just increasing the counter of the existing one. --- .werks/3736 | 17 +++++++++++++++++ ChangeLog | 1 + bin/mkeventd | 4 ++++ web/plugins/wato/mkeventd.py | 12 ++++++++++++ 4 files changed, 34 insertions(+) diff --git a/.werks/3736 b/.werks/3736 new file mode 100644 index 0000000..01f07d1 --- /dev/null +++ b/.werks/3736 @@ -0,0 +1,17 @@ +Title: New option for discontinuing counting on open event after configured time +Level: 1 +Component: ec +Compatible: compat +Version: 1.4.0i1 +Date: 1469449843 +Class: feature + +In the {{Counting}} section of a rule the Event Console has now a new option +{{Discontinue counting after time as elapsed}}. Normally new messages matching +an existing open event that is configured for counting will simply increase +the counter and not open a new event. + +When you activate the new option you can limit this phase to a certain +duration, e.g. to 10 minutes. Any messages arriving 10 minutes after the +first matching message will then open a new event instead of just increasing +the counter of the existing one. diff --git a/ChangeLog b/ChangeLog index e0025af..b2882a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -553,6 +553,7 @@ * 3716 New sites now have a default rule pack from the start * 3717 Added search to EC settings and structured the options in multiple settings * 3720 The Event Console views are now supporting distributed setups... + * 3736 New option for discontinuing counting on open event after configured time... * 3058 FIX: Event Console is now allowing non loadable MIB modules on startup... * 3097 FIX: mkeventd: fixed crash with non-descriptive error message if mibs couldn't be loaded * 3335 FIX: Improved error handling when requested rule pack does not exist diff --git a/bin/mkeventd b/bin/mkeventd index c0f73c6..0be8705 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -3349,6 +3349,10 @@ class EventStatus(): if count["separate_match_groups"] and ev["match_groups"] != event["match_groups"]: continue + if count.get("count_duration") != None and ev["first"] + count["count_duration"] < event["time"]: + # Counting has been discontinued on this event after a certain time + continue + found = ev self.count_event_up(found, event) break diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 19b8131..20dcf0d 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -397,6 +397,18 @@ vs_mkeventd_rule = Dictionary( ], default_value = "interval") ), + ( "count_duration", + Optional( + Age( + label = _("Count only for"), + help = _("When the event is in the state <i>open</i> for that time span " + "then no further messages of the same time will be added to the " + "event. It will stay open, but the count does not increase anymore. " + "Any further matching message will create a new event."), + ), + label = _("Discontinue counting after time as elapsed"), + none_label = _("Bar"), + )), ( "count_ack", Checkbox( label = _("Continue counting when event is <b>acknowledged</b>"),

8 years, 1 month

Reserved 6 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: f6a42bb1e01cd7a54e0eaa902e76f6d38dbc1088 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6a42bb1e01cd7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 25 14:30:34 2016 +0200 Reserved 6 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 0877ca9..a746e3c 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3736 +3742

8 years, 1 month

Better styling of nested dictionaries

by Mathias Kettner

Module: check_mk Branch: master Commit: fce77a00aece2a243b1beb1d0bc6cf42ffabca16 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fce77a00aece2a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 25 14:30:01 2016 +0200 Better styling of nested dictionaries --- web/htdocs/check_mk.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index d3cbb08..2f0d0cd 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -369,6 +369,12 @@ table.dictionary td.dictright { white-space: nowrap; padding: 0px; border-style: none; + width: 99%; +} + +table.dictionary td.dictleft { + width: 1%; + white-space: nowrap; } td.dictleft div.dictelement * {

8 years, 1 month

Fix for recent pending log entry change

by Lars Michelsen

Module: check_mk Branch: master Commit: cbb2909d1d408235f8d74e46d51b95b66a4ee9e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cbb2909d1d4082… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 25 14:14:28 2016 +0200 Fix for recent pending log entry change --- web/htdocs/watolib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index eb5435d..049f1b7 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -227,7 +227,7 @@ def log_pending(status, linkinfo, what, message, user_id = None): need_to_bake_agents() # Only add pending log entries when a restart is needed - if has_wato_slave_sites() or status in [ RESTART, SYNCRESTART, LOCALRESTART ]: + if has_wato_slave_sites() or status != SYNC: log_entry(linkinfo, what, message, "pending.log", user_id) # Currently we add the pending to each site, regardless if

8 years, 1 month

Fixed wrong parameter

by Lars Michelsen

Module: check_mk Branch: master Commit: 9c2430d94297d930c6f920b67303593f41a030ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c2430d94297d9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 25 14:00:38 2016 +0200 Fixed wrong parameter --- modules/automation.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/automation.py b/modules/automation.py index c44b3bd..fc3a492 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -1090,7 +1090,8 @@ def load_resource_file(macros): # here. We could read the Nagios resource.cfg file, but we do not # know for sure the place of that either. def replace_core_macros(hostname, commandline): - macros = get_host_macros_from_attributes(hostname, get_host_attributes(hostname)) + macros = get_host_macros_from_attributes(hostname, + get_host_attributes(hostname, tags_of_host(hostname))) load_resource_file(macros) for varname, value in macros.items(): commandline = commandline.replace(varname, str(value))

8 years, 1 month

Function has been renamed

by Lars Michelsen

Module: check_mk Branch: master Commit: e2e0110d78605c435d589b8c8bd1c77630c0cac4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2e0110d78605c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 25 13:53:05 2016 +0200 Function has been renamed --- modules/automation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/automation.py b/modules/automation.py index 5b98d83..c44b3bd 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -1090,7 +1090,7 @@ def load_resource_file(macros): # here. We could read the Nagios resource.cfg file, but we do not # know for sure the place of that either. def replace_core_macros(hostname, commandline): - macros = get_basic_host_macros_from_attributes(hostname, get_host_attributes(hostname)) + macros = get_host_macros_from_attributes(hostname, get_host_attributes(hostname)) load_resource_file(macros) for varname, value in macros.items(): commandline = commandline.replace(varname, str(value))

8 years, 1 month

Cleaned up host macro and attribute computation

by Lars Michelsen

Module: check_mk Branch: master Commit: 00a05075fc1720a8fe78417421a5dacf1921e60e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00a05075fc1720… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 25 11:43:07 2016 +0200 Cleaned up host macro and attribute computation --- modules/check_mk.py | 31 ++++++++++++++++++++++++------- modules/nagios.py | 17 +---------------- 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index fc6beef..3261a82 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2126,9 +2126,8 @@ def get_sorted_check_table(hostname, remove_duplicates=False, world="config"): -# Determine, which program to call to get data. Should -# be None in most cases -> to TCP connect on port 6556 - +# Determine, which program to call to get the agent data. This is an alternative to fetch +# the agent data via TCP port, mostly used for special agents. def get_datasource_program(hostname, ipaddress): special_agents_dir = agents_dir + "/special" @@ -2143,13 +2142,19 @@ def get_datasource_program(hostname, ipaddress): path = local_special_agents_dir + "/agent_" + agentname else: path = special_agents_dir + "/agent_" + agentname - return path + " " + cmd_arguments + return replace_datasource_program_macros(path + " " + cmd_arguments) programs = host_extra_conf(hostname, datasource_programs) - if len(programs) == 0: + if not programs: return None else: - return programs[0].replace("<IP>", ipaddress).replace("<HOST>", hostname) + return replace_datasource_program_macros( + programs[0].replace("<IP>", ipaddress).replace("<HOST>", hostname)) + + +def replace_datasource_program_macros(cmd): + return cmd + # Variables needed during the renaming of hosts (see automation.py) ignore_ip_lookup_failures = False @@ -3405,9 +3410,11 @@ def get_basic_host_macros_from_attributes(hostname, attrs): return macros -def get_host_attributes(hostname): +def get_host_attributes(hostname, tags): attrs = extra_host_attributes(hostname) + attrs["_TAGS"] = " ".join(tags) + if "alias" not in attrs: attrs["alias"] = alias_of(hostname, hostname) @@ -3430,6 +3437,16 @@ def get_host_attributes(hostname): attrs["address"] = attrs["_ADDRESS_4"] attrs["_ADDRESS_FAMILY"] = "4" + # Add the optional WATO folder path + path = host_paths.get(hostname) + if path: + attrs["_FILENAME"] = path + + # Add custom user icons and actions + actions = icons_and_actions_of("host", hostname) + if actions: + attrs["_ACTIONS"] = ",".join(actions) + return attrs diff --git a/modules/nagios.py b/modules/nagios.py index 2a6ee1a..da657cb 100644 --- a/modules/nagios.py +++ b/modules/nagios.py @@ -113,7 +113,7 @@ def create_nagios_config_host(outfile, hostname): outfile.write("\n# ----------------------------------------------------\n") outfile.write("# %s\n" % hostname) outfile.write("# ----------------------------------------------------\n") - host_attrs = get_host_attributes(hostname) + host_attrs = get_host_attributes(hostname, tags_of_host(hostname)) if generate_hostconf: create_nagios_hostdefs(outfile, hostname, host_attrs) create_nagios_servicedefs(outfile, hostname, host_attrs) @@ -139,7 +139,6 @@ def create_nagios_hostdefs(outfile, hostname, attrs): outfile.write(" host_name\t\t\t%s\n" % hostname) outfile.write(" use\t\t\t\t%s\n" % (is_clust and cluster_template or host_template)) outfile.write(" address\t\t\t%s\n" % (ip and make_utf8(ip) or fallback_ip_for(hostname))) - outfile.write(" _TAGS\t\t\t\t%s\n" % " ".join(tags_of_host(hostname))) # Add custom macros for key, value in attrs.items(): @@ -152,11 +151,6 @@ def create_nagios_hostdefs(outfile, hostname, attrs): if command: outfile.write(" check_command\t\t\t%s\n" % command) - # WATO folder path - path = host_paths.get(hostname) - if path: - outfile.write(" _FILENAME\t\t\t%s\n" % path) - # Host groups: If the host has no hostgroups it gets the default # hostgroup (Nagios requires each host to be member of at least on # group. @@ -198,11 +192,6 @@ def create_nagios_hostdefs(outfile, hostname, attrs): else: alias = make_utf8(alias) - # Add custom user icons and actions - actions = icons_and_actions_of('host', hostname) - if actions: - outfile.write(" _ACTIONS\t\t\t%s\n" % ','.join(actions)) - # Custom configuration last -> user may override all other values outfile.write(make_utf8(extra_host_conf_of(hostname))) @@ -220,7 +209,6 @@ def create_nagios_hostdefs(outfile, hostname, attrs): outfile.write(" use\t\t\t\t%s-summary\n" % (is_clust and cluster_template or host_template)) outfile.write(" alias\t\t\t\tSummary of %s\n" % alias) outfile.write(" address\t\t\t%s\n" % (ip and ip or fallback_ip_for(hostname))) - outfile.write(" _TAGS\t\t\t\t%s\n" % " ".join(tags_of_host(hostname))) outfile.write(" __REALNAME\t\t\t%s\n" % hostname) outfile.write(" parents\t\t\t%s\n" % hostname) @@ -229,9 +217,6 @@ def create_nagios_hostdefs(outfile, hostname, attrs): if key[0] == '_': outfile.write(" %s\t\t\t%s\n" % (key, value)) - if path: - outfile.write(" _FILENAME\t\t\t%s\n" % path) - hgs = summary_hostgroups_of(hostname) hostgroups = ",".join(hgs) if len(hgs) == 0:

8 years, 1 month

3721 Host macros are now replaced in datasource program command lines

by Lars Michelsen

Module: check_mk Branch: master Commit: 15315aed635b1a56f314e9da0ce249dc15f2b4b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15315aed635b1a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 25 12:50:54 2016 +0200 3721 Host macros are now replaced in datasource program command lines You can now use all host macros including custom variables in the command line of datasource programs, just like for active checks. --- .werks/3721 | 10 +++++++ ChangeLog | 1 + modules/check_mk.py | 44 ++++++++++++++++++++++++++----- web/htdocs/wato.py | 15 +++++++++++ web/plugins/wato/active_checks.py | 17 +++--------- web/plugins/wato/datasource_programs.py | 3 +-- 6 files changed, 69 insertions(+), 21 deletions(-) diff --git a/.werks/3721 b/.werks/3721 new file mode 100644 index 0000000..f2b2d83 --- /dev/null +++ b/.werks/3721 @@ -0,0 +1,10 @@ +Title: Host macros are now replaced in datasource program command lines +Level: 1 +Component: core +Compatible: compat +Version: 1.4.0i1 +Date: 1469443786 +Class: feature + +You can now use all host macros including custom variables in the command line of +datasource programs, just like for active checks. diff --git a/ChangeLog b/ChangeLog index 9284fb8..e0025af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ * 3531 Reduced Check_MK helper size for certain dists/python versions... * 3580 The macro $HOSTNAME$ is now available for host checks which are based on service states * 3155 implemented dual monitoring for systems with management boards (like HP iLO) + * 3721 Host macros are now replaced in datasource program command lines... * 3193 FIX: Fixed fake check results for hosts... * 3214 FIX: Removing SNMP checks for non SNMP hosts and agent based checks for non agent hosts... * 3220 FIX: Check_MK HW/SW Inventory is now always disabled for "No Agent" hosts diff --git a/modules/check_mk.py b/modules/check_mk.py index 3261a82..7bc9c7c 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2142,18 +2142,31 @@ def get_datasource_program(hostname, ipaddress): path = local_special_agents_dir + "/agent_" + agentname else: path = special_agents_dir + "/agent_" + agentname - return replace_datasource_program_macros(path + " " + cmd_arguments) + return replace_datasource_program_macros(hostname, ipaddress, + path + " " + cmd_arguments) programs = host_extra_conf(hostname, datasource_programs) if not programs: return None else: - return replace_datasource_program_macros( - programs[0].replace("<IP>", ipaddress).replace("<HOST>", hostname)) + return replace_datasource_program_macros(hostname, ipaddress, programs[0]) -def replace_datasource_program_macros(cmd): - return cmd +def replace_datasource_program_macros(hostname, ipaddress, cmd): + # Make "legacy" translation. The users should use the $...$ macros in future + cmd = cmd.replace("<IP>", ipaddress).replace("<HOST>", hostname) + + is_clust = is_cluster(hostname) + + tags = tags_of_host(hostname) + attrs = get_host_attributes(hostname, tags) + if is_cluster(hostname): + parents_list = get_cluster_nodes_for_config(hostname) + attrs.setdefault("alias", "cluster of %s" % ", ".join(parents_list)) + attrs.update(get_cluster_attributes(hostname, parents_list)) + + macros = get_host_macros_from_attributes(hostname, attrs) + return replace_macros(cmd, macros) # Variables needed during the renaming of hosts (see automation.py) @@ -3393,7 +3406,7 @@ def get_cluster_nodes_for_config(hostname): return nodes -def get_basic_host_macros_from_attributes(hostname, attrs): +def get_host_macros_from_attributes(hostname, attrs): macros = { "$HOSTNAME$" : hostname, "$HOSTADDRESS$" : attrs['address'], @@ -3517,6 +3530,25 @@ def fallback_ip_for(hostname, family=None): return "::" +def replace_macros(s, macros): + for key, value in macros.items(): + if type(value) in (int, long, float): + value = str(value) # e.g. in _EC_SL (service level) + + # TODO: Clean this up + try: + s = s.replace(key, value) + except: # Might have failed due to binary UTF-8 encoding in value + try: + s = s.replace(key, value.decode("utf-8")) + except: + # If this does not help, do not replace + if opt_debug: + raise + + return s + + #. # .--Main Functions------------------------------------------------------. # | __ __ _ _____ _ _ | diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 95185c4..2095ba9 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -16511,6 +16511,21 @@ def some_host_hasnt_set(folder, attrname): return False +def monitoring_macro_help(): + return " " + _("You can use monitoring macros here. The most important are: " + "<ul>" + "<li><tt>$HOSTADDRESS$</tt>: The IP address of the host</li>" + "<li><tt>$HOSTNAME$</tt>: The name of the host</li>" + "<li><tt>$USER1$</tt>: user macro 1 (usually path to shipped plugins)</li>" + "<li><tt>$USER2$</tt>: user marco 2 (usually path to your own plugins)</li>" + "<li><tt>$_HOSTTAGS$</tt>: List of host tags</li>" + "<li><tt>$_HOSTADDRESS_4$</tt>: The IPv4 address of the host</li>" + "<li><tt>$_HOSTADDRESS_6$</tt>: The IPv6 address of the host</li>" + "<li><tt>$_HOSTADDRESS_FAMILY$</tt>: The primary address family of the host</li>" + "</ul>" + "All custom variables defined for the host are available as <tt>$_HOST[VARNAME]$</tt>.") + + #. # .--Plugins-------------------------------------------------------------. # | ____ _ _ | diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 8de8bfc..8abc66e 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -1421,19 +1421,10 @@ register_rule(group, def PluginCommandLine(addhelp = ""): return TextAscii( title = _("Command line"), - help = _("Please enter the complete shell command including " - "path name and arguments to execute. You can use monitoring " - "macros here. The most important are:<ul>" - "<li><tt>$HOSTADDRESS$</tt>: The IP address of the host</li>" - "<li><tt>$HOSTNAME$</tt>: The name of the host</li>" - "<li><tt>$USER1$</tt>: user macro 1 (usually path to shipped plugins)</li>" - "<li><tt>$USER2$</tt>: user marco 2 (usually path to your own plugins)</li>" - "</ul>" - "If you are using OMD, you can omit the path and just specify " - "the command (e.g. <tt>check_foobar</tt>). This command will be " - "searched first in the local plugins directory " - "(<tt>~/local/lib/nagios/plugins</tt>) and then in the shipped plugins " - "directory (<tt>~/lib/nagios/plugins</tt>) within your site directory."), + help = _("Please enter the complete shell command including path name and arguments to execute. " + "If the plugin you like to execute is located in either <tt>~/local/lib/nagios/plugins</tt> " + "or <tt>~/lib/nagios/plugins</tt> within your site directory, you can strip the path name and " + "just configure the plugin file name as command <tt>check_foobar</tt>.") + monitoring_macro_help(), size = "max", ) diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index 0d55a62..cd6c249 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -37,8 +37,7 @@ register_rule(group, "program that should be called by Check_MK instead of connecting the agent " "via TCP. That program must output the agent's data on standard output in " "the same format the agent would do. This is for example useful for monitoring " - "via SSH. The command line may contain the placeholders <tt><IP></tt> and " - "<tt><HOST></tt>."), + "via SSH.") + monitoring_macro_help(), label = _("Command line to execute"), empty_text = _("Access Check_MK Agent via TCP"), size = 80,

8 years, 1 month

3622 FIX Fix labelling of V-Achsis on graphs with very large numbers

by Mathias Kettner

Module: check_mk Branch: master Commit: 1218e3c48444619d9e99603819cfff74bb793bf0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1218e3c4844461… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 25 12:21:44 2016 +0200 3622 FIX Fix labelling of V-Achsis on graphs with very large numbers If you create an own check that outputs very large metrics then the labelling of the vertical axis in a graph would try to display numbers like 1000000000000, with the problem that the prefix 1000... is not visible. Number larger than 99999 are now being displayed in exponential syntax, e.g. 1.0e6 and are thus correctly being displayed. --- .werks/3622 | 17 +++++++++++++++++ ChangeLog | 1 + web/htdocs/lib.py | 9 +++++++++ web/plugins/metrics/check_mk.py | 2 +- 4 files changed, 28 insertions(+), 1 deletion(-) diff --git a/.werks/3622 b/.werks/3622 new file mode 100644 index 0000000..7411638 --- /dev/null +++ b/.werks/3622 @@ -0,0 +1,17 @@ +Title: Fix labelling of V-Achsis on graphs with very large numbers +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1469441963 + +If you create an own check that outputs very large metrics then the +labelling of the vertical axis in a graph would try to display numbers +like 1000000000000, with the problem that the prefix 1000... is not +visible. + +Number larger than 99999 are now being displayed in exponential +syntax, e.g. 1.0e6 and are thus correctly being displayed. + diff --git a/ChangeLog b/ChangeLog index fabe220..9284fb8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -403,6 +403,7 @@ * 3668 FIX: Fixed slow loading of GUI pages when using a localized GUI * 3669 FIX: LDAP: Fixed very long running LDAP sync when using group based sync plugins * 3670 FIX: Fixed empty AV PDF report when exporting it from a quicksearch result view + * 3622 FIX: Fix labelling of V-Achsis on graphs with very large numbers... WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index a737416..79c77f4 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -484,6 +484,13 @@ def frexp10(x): return frexpb(x, 10) +def render_scientific(v, precision=3): + mantissa, exponent = frexp10(float(v)) + # Render small numbers without exponent + if exponent >= -3 and exponent <= 4: + return "%%.%df" % max(0, precision - exponent) % v + + return "%%.%dfe%%d" % precision % (mantissa, exponent) # Render a physical value witha precision of p @@ -624,6 +631,8 @@ def render_float_with_precision(value, precision): return "%%.%df" % digits % value + + def number_human_readable(n, precision=1, unit="B"): base = 1024.0 if unit == "Bit": diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 4eec359..27a6ab4 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -65,7 +65,7 @@ unit_info[""] = { "title" : "", "description" : _("Floating point number"), "symbol" : "", - "render" : lambda v: render_float_with_precision(v, 3), + "render" : lambda v: render_scientific(v, 2), } unit_info["count"] = {

8 years, 1 month

← Newer
1
...
5
6
7
8
9
10
11
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2016