Checkmk git commits May 2016

checkmk-commits@lists.checkmk.com

6 participants
231 discussions

3456 FIX bluecoat_diskcpu: Fixed visualization of graph

by Lars Michelsen

Module: check_mk Branch: master Commit: 962578f4bed24f458c839d8ca350db348ecf8e51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=962578f4bed24f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 2 15:21:25 2016 +0200 3456 FIX bluecoat_diskcpu: Fixed visualization of graph --- .werks/3456 | 10 ++++++++++ ChangeLog | 1 + web/plugins/metrics/check_mk.py | 16 ++++++++++++++++ 3 files changed, 27 insertions(+) diff --git a/.werks/3456 b/.werks/3456 new file mode 100644 index 0000000..34d03a6 --- /dev/null +++ b/.werks/3456 @@ -0,0 +1,10 @@ +Title: bluecoat_diskcpu: Fixed visualization of graph +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1462195245 + + diff --git a/ChangeLog b/ChangeLog index b6e114b..a1f2faa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -201,6 +201,7 @@ * 3525 FIX: Nagios Core: fixed bug, incomplete cleanup of process tree on service check timeout... * 3241 FIX: Fixed broken apt plugin * 3430 FIX: apc_inrow_temp: fixed wrong data handling if data is not available or incomplete + * 3456 FIX: bluecoat_diskcpu: Fixed visualization of graph Multisite: * 3187 notification view: new filter for log command via regex diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 4832c39..481061d 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1143,6 +1143,12 @@ metric_info["fpga_util"] = { "color" : "#60f020", } +metric_info["generic_util"] = { + "title" : _("Utilization"), + "unit" : "%", + "color" : "26/a", +} + metric_info["util"] = { "title" : _("CPU utilization"), "unit" : "%", @@ -3533,6 +3539,10 @@ check_metrics["check_mk-dell_powerconnect_temp"] = { "temperature" : { "name" : "temp" } } +check_metrics["check_mk-bluecoat_diskcpu"] = { + "value" : { "name" : "generic_util" } +} + check_metrics["check_mk-ipmi_sensors"] = { "value" : { "name" : "temp" } } @@ -4300,6 +4310,12 @@ perfometer_info.append({ perfometer_info.append({ "type" : "linear", + "segments" : [ "generic_util", ], + "total" : 100.0, +}) + +perfometer_info.append({ + "type" : "linear", "segments" : [ "util1", ], "total" : 100.0, })

8 years, 2 months

3455 FIX Fixed broken switch port filtering/sorting view

by Lars Michelsen

Module: check_mk Branch: master Commit: 1f7caa2a992451bcb8bac146fcaa9ea55d5901ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f7caa2a992451… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 2 15:20:11 2016 +0200 3455 FIX Fixed broken switch port filtering/sorting view --- .werks/3455 | 10 ++++++++++ ChangeLog | 1 + web/plugins/views/inventory.py | 6 ++---- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.werks/3455 b/.werks/3455 new file mode 100644 index 0000000..7d74ce6 --- /dev/null +++ b/.werks/3455 @@ -0,0 +1,10 @@ +Title: Fixed broken switch port filtering/sorting view +Level: 1 +Component: inv +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1462195112 + + diff --git a/ChangeLog b/ChangeLog index 7dee61b..b6e114b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -397,6 +397,7 @@ * 3340 FIX: Fixed exception when searching for software package sizes * 3025 FIX: solaris_pkginfo: the last element of the reported software package list was always missing * 3526 FIX: Inventory scripts are no longer called when no data is available for their section... + * 3455 FIX: Fixed broken switch port filtering/sorting view 1.2.8b1: diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 15905c2..c1cc7c4 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -781,10 +781,8 @@ def inv_multisite_table(infoname, invpath, columns, add_headers, only_sites, lim header = filt.filter(infoname) if not header.startswith("Sites:"): filter_code += header - host_columns = list(set([ "host_name" ] + filter(lambda c: c.startswith("host_"), columns))) - - sites.live().set_only_sites(only_sites) - sites.live().set_prepend_site(True) + host_columns = [ "host_name" ] + list(set(filter(lambda c: c.startswith("host_") + and c != "host_name", columns))) query = "GET hosts\n" query += "Columns: " + (" ".join(host_columns)) + "\n"

8 years, 2 months

New Livestatus command for removing mk_logwatch logfiles

by Mathias Kettner

Module: check_mk Branch: master Commit: 5cc3f0135cc47eacdd035b7b5174091cf5bfcc48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5cc3f0135cc47e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 2 14:36:47 2016 +0200 New Livestatus command for removing mk_logwatch logfiles --- livestatus/src/Store.cc | 23 ++++++++++++++++++++++- livestatus/src/Store.h | 1 + livestatus/src/mk_logwatch.cc | 23 ++++++++++++++++++++++- livestatus/src/mk_logwatch.h | 1 + 4 files changed, 46 insertions(+), 2 deletions(-) diff --git a/livestatus/src/Store.cc b/livestatus/src/Store.cc index e293188..05e783b 100644 --- a/livestatus/src/Store.cc +++ b/livestatus/src/Store.cc @@ -34,6 +34,7 @@ #include "global_counters.h" #include "logger.h" #include "strutil.h" +#include "mk_logwatch.h" // TODO(sp): Remove this hack. #ifdef EXTERN @@ -180,7 +181,9 @@ bool Store::answerRequest(InputBuffer *input, OutputBuffer *output) { } void Store::answerCommandRequest(const char *command) { - logger(LOG_WARNING, "Das Kommando ist [%s]", command); + if (answerLogwatchCommandRequest(command)) + return; + lock_guard<mutex> lg(_command_mutex); #ifdef NAGIOS4 process_external_command1((char *)command); @@ -191,6 +194,24 @@ void Store::answerCommandRequest(const char *command) { #endif } +bool Store::answerLogwatchCommandRequest(const char *command) { + // Handle special command "[1462191638] MK_LOGWATCH_ACKNOWLEDGE;host123;\var\log\syslog" + if (strlen(command) >= 37 && + command[0] == '[' && + command[11] == ']' && + !strncmp(command + 13, "MK_LOGWATCH_ACKNOWLEDGE;", 24)) { + const char *host_name_begin = command + 37; + const char *host_name_end = strchr(host_name_begin, ';'); + if (!host_name_end) + return false; + std::string host_name(host_name_begin, host_name_end - host_name_begin); + std::string file_name(host_name_end + 1); + mk_logwatch_acknowledge(host_name, file_name); + return true; + } + return false; +} + void Store::answerGetRequest(const list<string> &lines, OutputBuffer *output, const char *tablename) { output->reset(); diff --git a/livestatus/src/Store.h b/livestatus/src/Store.h index b1b8f72..e5079ce 100644 --- a/livestatus/src/Store.h +++ b/livestatus/src/Store.h @@ -94,6 +94,7 @@ private: void answerGetRequest(const std::list<std::string> &lines, OutputBuffer *, const char *); void answerCommandRequest(const char *); + bool answerLogwatchCommandRequest(const char *); }; #endif // Store_h diff --git a/livestatus/src/mk_logwatch.cc b/livestatus/src/mk_logwatch.cc index 3b6d805..7be473b 100644 --- a/livestatus/src/mk_logwatch.cc +++ b/livestatus/src/mk_logwatch.cc @@ -23,7 +23,9 @@ // Boston, MA 02110-1301 USA. - +#include <stdio.h> +#include <string.h> +#include "logger.h" #include "mk_logwatch.h" #include "pnp4nagios.h" @@ -36,3 +38,22 @@ std::string mk_logwatch_path_of_host(const char *host_name) path += pnp_cleanup(host_name); return path; } + +void mk_logwatch_acknowledge(const std::string &host_name, const std::string &file_name) +{ + if (file_name.find('/') != std::string::npos) { + logger(LOG_WARNING, "Invalid character / in mk_logfile filename '%s' of host '%s'", file_name.c_str(), host_name.c_str()); + return; + } + + std::string path(MK_LOGWATCH_PATH); + if (path == "") + return; + path += pnp_cleanup(host_name); + path += "/"; + path += file_name; + + int r = remove(path.c_str()); + if (r != 0) + logger(LOG_WARNING, "Cannot acknowledge mk_logfile file '%s' of host '%s': %s", file_name.c_str(), host_name.c_str(), strerror(errno)); +} diff --git a/livestatus/src/mk_logwatch.h b/livestatus/src/mk_logwatch.h index 9ee8201..856bab0 100644 --- a/livestatus/src/mk_logwatch.h +++ b/livestatus/src/mk_logwatch.h @@ -37,6 +37,7 @@ extern char g_mk_logwatch_path[]; #endif std::string mk_logwatch_path_of_host(const char *); +void mk_logwatch_acknowledge(const std::string &host_name, const std::string &file_name); #endif // mk_logwatch_h

8 years, 2 months

Added new livestatus columns for querying mk_logwatch files

by Mathias Kettner

Module: check_mk Branch: master Commit: 334efd4eab3c89bf2b511cafdde5df0cd64c906b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=334efd4eab3c89… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 2 12:29:02 2016 +0200 Added new livestatus columns for querying mk_logwatch files --- livestatus/src/DynamicLogwatchFileColumn.cc | 98 +++++++++++++++++++++++++++ livestatus/src/DynamicLogwatchFileColumn.h | 44 ++++++++++++ livestatus/src/HostFileColumn.cc | 1 + livestatus/src/LogwatchListColumn.cc | 79 +++++++++++++++++++++ livestatus/src/LogwatchListColumn.h | 39 +++++++++++ livestatus/src/Makefile.am | 3 + livestatus/src/Query.cc | 4 +- livestatus/src/TableHosts.cc | 12 ++++ livestatus/src/mk_logwatch.cc | 38 +++++++++++ livestatus/src/mk_logwatch.h | 42 ++++++++++++ livestatus/src/module.c | 16 ++++- 11 files changed, 371 insertions(+), 5 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=334efd4eab…

8 years, 2 months

Reclassified some bugs

by Mathias Kettner

Module: check_mk Branch: master Commit: 7a7e2c53a242d94c213c52bfba1d846e0f6ebe53 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a7e2c53a242d9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 2 13:24:04 2016 +0200 Reclassified some bugs --- .bugs/2461 | 2 +- .bugs/2487 | 2 +- livestatus/src/Store.cc | 1 + web/htdocs/sites.py | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.bugs/2461 b/.bugs/2461 index 5c37818..4724f48 100644 --- a/.bugs/2461 +++ b/.bugs/2461 @@ -2,7 +2,7 @@ Title: Predictive icon for Interface outbound traffic missing Component: multisite State: open Date: 2016-04-05 16:25:10 -Targetversion: 1.2.8 +Targetversion: 1.2.8p1 Class: bug There is only one icon created by the icon plugin for the first diff --git a/.bugs/2487 b/.bugs/2487 index 775ec15..658ba91 100644 --- a/.bugs/2487 +++ b/.bugs/2487 @@ -2,7 +2,7 @@ Title: Availability: Changing time range of an annotation duplicates it Component: multisite State: open Date: 2016-04-07 16:50:29 -Targetversion: 1.2.8 +Targetversion: 1.2.8p1 Class: bug The start/end is used as a key. If you edit an existing annotation and diff --git a/livestatus/src/Store.cc b/livestatus/src/Store.cc index 9659154..e293188 100644 --- a/livestatus/src/Store.cc +++ b/livestatus/src/Store.cc @@ -180,6 +180,7 @@ bool Store::answerRequest(InputBuffer *input, OutputBuffer *output) { } void Store::answerCommandRequest(const char *command) { + logger(LOG_WARNING, "Das Kommando ist [%s]", command); lock_guard<mutex> lg(_command_mutex); #ifdef NAGIOS4 process_external_command1((char *)command); diff --git a/web/htdocs/sites.py b/web/htdocs/sites.py index 41bd63c..176110f 100644 --- a/web/htdocs/sites.py +++ b/web/htdocs/sites.py @@ -97,6 +97,7 @@ def connect_multiple_sites(): "program_start" : ps, "num_hosts" : num_hosts, "num_services" : num_services, + "core" : v2.startswith("Check_MK") and "cmc" or "nagios", }) _live.set_prepend_site(False)

8 years, 2 months

3454 FIX Fixed scaling of numbers in graphs (e.g. inodes of filesystems)

by Lars Michelsen

Module: check_mk Branch: master Commit: 07f408b2bb79ef8ad4fdf14118019a7101da2a18 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07f408b2bb79ef… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 2 13:52:20 2016 +0200 3454 FIX Fixed scaling of numbers in graphs (e.g. inodes of filesystems) --- .werks/3454 | 10 ++++++++ ChangeLog | 1 + web/htdocs/lib.py | 53 +++++++++++++++++++++++++++++++-------- web/plugins/metrics/check_mk.py | 2 +- 4 files changed, 55 insertions(+), 11 deletions(-) diff --git a/.werks/3454 b/.werks/3454 new file mode 100644 index 0000000..848ab50 --- /dev/null +++ b/.werks/3454 @@ -0,0 +1,10 @@ +Title: Fixed scaling of numbers in graphs (e.g. inodes of filesystems) +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1462189904 + + diff --git a/ChangeLog b/ChangeLog index 4d14c9f..7dee61b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -264,6 +264,7 @@ * 3442 FIX: Fixed double escaping of single quotes in comment texts * 3452 FIX: Fixed vertical label of Bytes/day graphs (like filesystem growth) * 3453 FIX: apache_status: Fixed wrong graph labels and improved wordings + * 3454 FIX: Fixed scaling of numbers in graphs (e.g. inodes of filesystems) 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 4b70bd7..e1abf31 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -714,6 +714,7 @@ def date_human_readable(timestamp): # This can be localized: return time.strftime(_("%m/%d/%Y"), 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) @@ -743,23 +744,23 @@ def date_month_human_readable(timestamp): return time.strftime(_("%B %Y"), time.localtime(timestamp)) -def calculate_bytes_human_readable(b, base=1024.0, bytefrac=True): +def calculate_scaled_number(v, base=1024.0, precision=1): base = float(base) digits = 1 - if b >= base ** 4: + if v >= base ** 4: symbol = "T" scale = base ** 4 - elif b >= base ** 3: + elif v >= base ** 3: symbol = "G" scale = base ** 3 - elif b >= base ** 2: + elif v >= base ** 2: symbol = "M" scale = base ** 2 - elif b >= base: + elif v >= base: symbol = "k" scale = base @@ -767,16 +768,20 @@ def calculate_bytes_human_readable(b, base=1024.0, bytefrac=True): symbol = "" scale = 1 + return symbol, precision, scale + + +def calculate_scaled_bytes(v, base=1024.0, bytefrac=True): if not bytefrac: digits = 0 - elif b >= 100: + elif v >= 100: digits = 0 - elif b >= 10: + elif v >= 10: digits = 1 else: digits = 2 - return symbol, digits, scale + return calculate_scaled_number(v, base, precision=digits) def bytes_human_readable(b, *args, **kwargs): @@ -788,7 +793,7 @@ def bytes_human_readable(b, *args, **kwargs): else: unit = "B" - scale_symbol, places_after_comma, scale_factor = calculate_bytes_human_readable(b, *args, **kwargs) + scale_symbol, places_after_comma, scale_factor = calculate_scaled_bytes(b, *args, **kwargs) scaled_value = float(b) / scale_factor return (u"%%.%df %%s%%s" % places_after_comma) % (scaled_value, scale_symbol, unit) @@ -805,7 +810,7 @@ def bytes_human_readable_list(values, *args, **kwargs): else: unit = "B" - scale_symbol, places_after_comma, scale_factor = calculate_bytes_human_readable(reference, *args, **kwargs) + scale_symbol, places_after_comma, scale_factor = calculate_scaled_bytes(reference, *args, **kwargs) units = [] scaled_values = [] @@ -816,6 +821,34 @@ def bytes_human_readable_list(values, *args, **kwargs): return "%s%s" % (scale_symbol, unit), scaled_values +def metric_number_with_precision(v, *args, **kwargs): + if v < 0: + return "-" + metric_number_with_precision(-v, *args, **kwargs) + + kwargs["base"] = 1000.0 + scale_symbol, places_after_comma, scale_factor = calculate_scaled_number(v, *args, **kwargs) + scaled_value = float(v) / scale_factor + return (u"%%.%df %%s" % places_after_comma) % (scaled_value, scale_symbol) + + +def metric_number_with_precision_list(values, *args, **kwargs): + if not values: + reference = 0 + else: + reference = min([ abs(v) for v in values ]) + + kwargs["base"] = 1000.0 + scale_symbol, places_after_comma, scale_factor = calculate_scaled_number(reference, *args, **kwargs) + + units = [] + scaled_values = [] + for value in values: + scaled_value = float(value) / scale_factor + scaled_values.append(("%%.%df" % places_after_comma) % scaled_value) + + return "%s" % scale_symbol, scaled_values + + def file_size_human_readable(file_size): if file_size < 10000: return str(file_size) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 399521b..4832c39 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -71,7 +71,7 @@ unit_info[""] = { unit_info["count"] = { "title" : _("Count"), "symbol" : "", - "render" : lambda v: "%d" % v, + "render" : lambda v: metric_number_with_precision(v), "stepping" : "integer", # for vertical graph labels }

8 years, 2 months

3453 FIX apache_status: Fixed wrong graph labels and improved wordings

by Lars Michelsen

Module: check_mk Branch: master Commit: ae850c8a49be57140d4ccebe14cce3a48e68def1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae850c8a49be57… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 2 11:45:28 2016 +0200 3453 FIX apache_status: Fixed wrong graph labels and improved wordings --- .werks/3453 | 10 ++++++++++ ChangeLog | 1 + web/plugins/metrics/check_mk.py | 12 ++++++------ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.werks/3453 b/.werks/3453 new file mode 100644 index 0000000..b9f1f90 --- /dev/null +++ b/.werks/3453 @@ -0,0 +1,10 @@ +Title: apache_status: Fixed wrong graph labels and improved wordings +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1462182308 + + diff --git a/ChangeLog b/ChangeLog index e56afc8..4d14c9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -263,6 +263,7 @@ * 3125 FIX: fixed grouping of werk list by version... * 3442 FIX: Fixed double escaping of single quotes in comment texts * 3452 FIX: Fixed vertical label of Bytes/day graphs (like filesystem growth) + * 3453 FIX: apache_status: Fixed wrong graph labels and improved wordings WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 9fddf71..399521b 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -2640,7 +2640,7 @@ metric_info["apache_state_startingup"] = { } metric_info["apache_state_waiting"] = { - "title" : _("Writing"), + "title" : _("Waiting"), "unit" : "count", "color" : "14/a", } @@ -2652,7 +2652,7 @@ metric_info["apache_state_logging"] = { } metric_info["apache_state_dns"] = { - "title" : _("DNS"), + "title" : _("DNS lookup"), "unit" : "count", "color" : "24/a", } @@ -2670,25 +2670,25 @@ metric_info["apache_state_reading_request"] = { } metric_info["apache_state_closing"] = { - "title" : _("Closing"), + "title" : _("Closing connection"), "unit" : "count", "color" : "41/a", } metric_info["apache_state_idle_cleanup"] = { - "title" : _("Idle clean up"), + "title" : _("Idle clean up of worker"), "unit" : "count", "color" : "44/a", } metric_info["apache_state_finishing"] = { - "title" : _("Finishing"), + "title" : _("Gracefully finishing"), "unit" : "count", "color" : "46/b", } metric_info["apache_state_keep_alive"] = { - "title" : _("Keep alive"), + "title" : _("Keepalive"), "unit" : "count", "color" : "53/b", }

8 years, 2 months

3452 FIX Fixed vertical label of Bytes/day graphs (like filesystem growth)

by Lars Michelsen

Module: check_mk Branch: master Commit: e617fb7b621ea40b9f448a23afca3fddd36a5e43 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e617fb7b621ea4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 2 11:15:55 2016 +0200 3452 FIX Fixed vertical label of Bytes/day graphs (like filesystem growth) --- .werks/3452 | 10 +++++++ ChangeLog | 1 + web/htdocs/lib.py | 57 +++++++++++++++++++++++++++++++-------- web/plugins/metrics/check_mk.py | 10 ++++--- 4 files changed, 63 insertions(+), 15 deletions(-) diff --git a/.werks/3452 b/.werks/3452 new file mode 100644 index 0000000..3e5f94f --- /dev/null +++ b/.werks/3452 @@ -0,0 +1,10 @@ +Title: Fixed vertical label of Bytes/day graphs (like filesystem growth) +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1462180507 + + diff --git a/ChangeLog b/ChangeLog index 7b5380d..e56afc8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -262,6 +262,7 @@ * 3029 FIX: rule editor icon: fixed query of invalid livestatus column... * 3125 FIX: fixed grouping of werk list by version... * 3442 FIX: Fixed double escaping of single quotes in comment texts + * 3452 FIX: Fixed vertical label of Bytes/day graphs (like filesystem growth) 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 af50f06..4b70bd7 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -743,33 +743,29 @@ def date_month_human_readable(timestamp): return time.strftime(_("%B %Y"), time.localtime(timestamp)) -def bytes_human_readable(b, base=1024.0, bytefrac=True, unit="B"): +def calculate_bytes_human_readable(b, base=1024.0, bytefrac=True): base = float(base) - # Handle negative bytes correctly - prefix = '' - if b < 0: - prefix = '-' - b *= -1 digits = 1 if b >= base ** 4: symbol = "T" - b /= base ** 4 + scale = base ** 4 elif b >= base ** 3: symbol = "G" - b /= base ** 3 + scale = base ** 3 elif b >= base ** 2: symbol = "M" - b /= base ** 2 + scale = base ** 2 elif b >= base: symbol = "k" - b /= base + scale = base else: symbol = "" + scale = 1 if not bytefrac: digits = 0 @@ -780,7 +776,45 @@ def bytes_human_readable(b, base=1024.0, bytefrac=True, unit="B"): else: digits = 2 - return "%%s%%.%df %%s%%s" % digits % (prefix, b, symbol, unit) + return symbol, digits, scale + + +def bytes_human_readable(b, *args, **kwargs): + if b < 0: + return "-" + bytes_human_readable(-b, *args, **kwargs) + + if "unit" in kwargs: + unit = kwargs.pop("unit") + else: + unit = "B" + + scale_symbol, places_after_comma, scale_factor = calculate_bytes_human_readable(b, *args, **kwargs) + + scaled_value = float(b) / scale_factor + return (u"%%.%df %%s%%s" % places_after_comma) % (scaled_value, scale_symbol, unit) + + +def bytes_human_readable_list(values, *args, **kwargs): + if not values: + reference = 0 + else: + reference = min([ abs(v) for v in values ]) + + if "unit" in kwargs: + unit = kwargs.pop("unit") + else: + unit = "B" + + scale_symbol, places_after_comma, scale_factor = calculate_bytes_human_readable(reference, *args, **kwargs) + + units = [] + scaled_values = [] + for value in values: + scaled_value = float(value) / scale_factor + scaled_values.append(("%%.%df" % places_after_comma) % scaled_value) + + return "%s%s" % (scale_symbol, unit), scaled_values + def file_size_human_readable(file_size): if file_size < 10000: @@ -793,6 +827,7 @@ def file_size_human_readable(file_size): result = as_string + result return result + try: import ast literal_eval = ast.literal_eval diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 9a823aa..9fddf71 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -129,10 +129,12 @@ unit_info["bits/s"] = { # Output in bytes/days, value is in bytes/s unit_info["bytes/d"] = { - "title" : _("Bytes per day"), - "symbol" : _("B/d"), - "render" : lambda v: bytes_human_readable(v * 86400.0) + _("/d"), - "stepping" : "binary", # for vertical graph labels + "title" : _("Bytes per day"), + "symbol" : _("B/d"), + "render" : lambda v: bytes_human_readable(v * 86400.0, unit="B/d"), + "graph_unit" : lambda values: bytes_human_readable_list( + [ v * 86400.0 for v in values ], unit=_("B/d")), + "stepping" : "binary", # for vertical graph labels } unit_info["c"] = {

8 years, 2 months

Fixed error handling on WATO host/ service parameter page for not existing objects

by Lars Michelsen

Module: check_mk Branch: master Commit: 44fa75fc21419b762a37622bebcb40021bf6478c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44fa75fc21419b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 2 09:00:39 2016 +0200 Fixed error handling on WATO host/service parameter page for not existing objects --- web/htdocs/wato.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3969f91..17ee641 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2033,6 +2033,8 @@ def render_renaming_actions(action_counts): def mode_object_parameters(phase): hostname = html.var("host") # may be empty in new/clone mode host = Folder.current().host(hostname) + if host is None: + raise MKGeneralException(_('The given host does not exist.')) host.need_permission("read") service = html.var("service")

8 years, 2 months

3451 FIX Fixed exception in host list when no local site configured

by Lars Michelsen

Module: check_mk Branch: master Commit: 3c5bade4b194e41facfe317affd1469a8de5e885 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c5bade4b194e4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 2 08:53:52 2016 +0200 3451 FIX Fixed exception in host list when no local site configured --- .werks/3451 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/watolib.py | 5 ++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/3451 b/.werks/3451 new file mode 100644 index 0000000..811157d --- /dev/null +++ b/.werks/3451 @@ -0,0 +1,10 @@ +Title: Fixed exception in host list when no local site configured +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1462172016 + + diff --git a/ChangeLog b/ChangeLog index ca39c73..7b5380d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -329,6 +329,7 @@ * 3382 FIX: Fixed exception when moving multiple folder levels to another folder * 3383 FIX: Host search: Don't preselect any optional field (Searched for empty values) * 3450 FIX: Site properties: It was not possible to switch a site back to "local site" connection + * 3451 FIX: Fixed exception in host list when no local site configured Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 67a6c33..690d4da 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -3431,7 +3431,10 @@ class SiteAttribute(Attribute): return html.var(varprefix + "site") def get_tag_list(self, value): - return [ "site:" + value ] + if value != None: + return [ "site:" + value ] + else: + return [] # The replication status contains information about each # site. It is a dictionary from the site id to a dict with

8 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2016