Checkmk git commits August 2016

checkmk-commits@lists.checkmk.com

8 participants
256 discussions

Fixed error reporting of MKParseFunctionError ( keeping original exception and trace)

by Lars Michelsen

Module: check_mk Branch: master Commit: 67974b7191c95cccf065778657ac18973d39cd5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67974b7191c95c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 25 14:43:14 2016 +0200 Fixed error reporting of MKParseFunctionError (keeping original exception and trace) --- modules/check_mk_base.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index dabc466..2a900f6 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -203,11 +203,16 @@ class MKAgentError(Exception): return self.reason class MKParseFunctionError(Exception): - def __init__(self, orig_exception, backtrace): - self.orig_exception = orig_exception + def __init__(self, exception_type, exception, backtrace): + self.exception_type = exception_type + self.exception = exception self.backtrace = backtrace + + def exc_info(self): + return self.exception_type, self.exception, self.backtrace + def __str__(self): - return str(str(self.orig_exception) + "\n" + self.backtrace) + return "%s\n%s" % (self.exception, self.backtrace) class MKSNMPError(Exception): def __init__(self, reason): @@ -252,9 +257,11 @@ def apply_parse_function(info, section_name): except Exception, e: if opt_debug: raise + # In case of a failed parse function return the exception instead of # an empty result. - raise MKParseFunctionError(e, traceback.format_exc()) + raise MKParseFunctionError(*sys.exc_info()) + return info def get_info_for_check(hostname, ipaddress, section_name, max_cachefile_age=None, ignore_check_interval=False): @@ -1461,7 +1468,8 @@ def do_all_checks_on_host(hostname, ipaddress, only_check_types = None, fetch_ag reset_wrapped_counters() if isinstance(info, MKParseFunctionError): - raise Exception(str(info)) + x = info.exc_info() + raise x[0], x[1], x[2] # re-raise the original exception to not destory the trace result = sanitize_check_result(check_function(item, params, info), check_uses_snmp(checkname)) raise_counter_wrap()

7 years, 10 months

3767 FIX Fixed possible UnicodeDecodeError when having users with umlauts in the user ID

by Lars Michelsen

Module: check_mk Branch: master Commit: a6edf6239a3a5554b6ed81cb33b86451b865fac9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6edf6239a3a55… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 25 13:54:45 2016 +0200 3767 FIX Fixed possible UnicodeDecodeError when having users with umlauts in the user ID --- .werks/3767 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/config.py | 2 +- web/htdocs/userdb.py | 3 ++- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/3767 b/.werks/3767 new file mode 100644 index 0000000..919ecfd --- /dev/null +++ b/.werks/3767 @@ -0,0 +1,10 @@ +Title: Fixed possible UnicodeDecodeError when having users with umlauts in the user ID +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1472126075 + + diff --git a/ChangeLog b/ChangeLog index 369e1ae..07ddcfe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -455,6 +455,7 @@ * 3561 FIX: Removing a comment now also removes any linked acknowledgements... * 3763 FIX: Fixed playing sounds in views when using current Firefox... * 3779 FIX: availability: added validation of availability options + * 3767 FIX: Fixed possible UnicodeDecodeError when having users with umlauts in the user ID WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 90fb6f6..a9175de 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -337,7 +337,7 @@ def roles_of_user(user): return [ "guest" ] elif users != None and user in users: return [ "user" ] - elif os.path.exists(config_dir + "/" + user + "/automation.secret"): + elif os.path.exists(config_dir + "/" + user.encode("utf-8") + "/automation.secret"): return [ "guest" ] # unknown user with automation account elif 'roles' in default_user_profile: return existing_role_ids(default_user_profile['roles']) diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 043df3c..6890de4 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -229,7 +229,8 @@ def _user_exists_according_to_profile(username): def _user_exists_htpasswd(username): for line in open(defaults.htpasswd_file): - if line.startswith("%s:" % username): + l = line.decode("utf-8") + if l.startswith("%s:" % username): return True return False

7 years, 10 months

3766 FIX palo_alto_sessions: Fixed possible division by zero error

by Lars Michelsen

Module: check_mk Branch: master Commit: 6b551fd2f4d8100085345687f987d213910a7976 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b551fd2f4d810… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 25 13:40:16 2016 +0200 3766 FIX palo_alto_sessions: Fixed possible division by zero error --- .werks/3766 | 10 ++++++++++ ChangeLog | 1 + checks/palo_alto_sessions | 8 +++++--- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.werks/3766 b/.werks/3766 new file mode 100644 index 0000000..a42585f --- /dev/null +++ b/.werks/3766 @@ -0,0 +1,10 @@ +Title: palo_alto_sessions: Fixed possible division by zero error +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1472125205 + + diff --git a/ChangeLog b/ChangeLog index b8f9aec..369e1ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -353,6 +353,7 @@ * 3762 FIX: local: Fixed long output handling with Microcore... * 3764 FIX: netapp_api_vs_traffic: Fixed exception when no NFSv4 infos available * 3765 FIX: oracle_asm_diskgroup: Made check more robust against invalid data received from agent... + * 3766 FIX: palo_alto_sessions: Fixed possible division by zero error Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/palo_alto_sessions b/checks/palo_alto_sessions index 3ce5269..c8af7b9 100644 --- a/checks/palo_alto_sessions +++ b/checks/palo_alto_sessions @@ -35,7 +35,11 @@ def inventory_palo_alto_sessions(info): def check_palo_alto_sessions(_no_item, params, info): sessions_supported, total, tcp, udp, icmp, sslproxy = map(int, info[0]) - sessions_used_perc = float(total)*100 / sessions_supported + + if sessions_supported == 0: + sessions_used_perc = 0 + else: + sessions_used_perc = float(total)*100 / sessions_supported infotext = "%d total active sessions: %d TCP, %d UDP, %d ICMP, %d SSL Proxy." % \ (total, tcp, udp, icmp, sslproxy) @@ -52,8 +56,6 @@ def check_palo_alto_sessions(_no_item, params, info): ("sslproxy_active_sessions", sslproxy), ] - - if sessions_used_perc >= crit: status = 2 elif sessions_used_perc >= warn:

7 years, 10 months

3764 FIX netapp_api_vs_traffic: Fixed exception when no NFSv4 infos available

by Lars Michelsen

Module: check_mk Branch: master Commit: 9fa48a4429789674e80ddee2a9632f0029aeaa7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9fa48a44297896… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 25 13:18:35 2016 +0200 3764 FIX netapp_api_vs_traffic: Fixed exception when no NFSv4 infos available --- .werks/3764 | 10 ++++++++++ ChangeLog | 1 + checks/netapp_api_vs_traffic | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/.werks/3764 b/.werks/3764 new file mode 100644 index 0000000..f83e543 --- /dev/null +++ b/.werks/3764 @@ -0,0 +1,10 @@ +Title: netapp_api_vs_traffic: Fixed exception when no NFSv4 infos available +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1472123889 + + diff --git a/ChangeLog b/ChangeLog index 4f4d3cb..b8f9aec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -351,6 +351,7 @@ * 3774 FIX: apc_symmetra: fixed wrong status and values handling * 3761 FIX: windows_tasks: Fixed possible exception in discovery in case of unexpected agent data * 3762 FIX: local: Fixed long output handling with Microcore... + * 3764 FIX: netapp_api_vs_traffic: Fixed exception when no NFSv4 infos available * 3765 FIX: oracle_asm_diskgroup: Made check more robust against invalid data received from agent... Multisite: diff --git a/checks/netapp_api_vs_traffic b/checks/netapp_api_vs_traffic index 4a23ace..5e9a9d7 100644 --- a/checks/netapp_api_vs_traffic +++ b/checks/netapp_api_vs_traffic @@ -83,7 +83,11 @@ def check_netapp_api_vs_traffic(item, _no_params, parsed): data = parsed.get("%s.%s" % (protocol, item)) if not data: continue + for what, perfname, perftext, scale, format_func in values: + if what not in data: + continue + rate = get_rate(what, now, int(data[what]) * scale) yield 0, "%s %s: %s" % (protoname, perftext, format_func(rate)), [(perfname, rate)]

7 years, 10 months

3765 FIX oracle_asm_diskgroup: Made check more robust against invalid data received from agent

by Lars Michelsen

Module: check_mk Branch: master Commit: 3d0b294ecf22e458d9be5c7c6856f7d8409c9e58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d0b294ecf22e4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 25 13:33:39 2016 +0200 3765 FIX oracle_asm_diskgroup: Made check more robust against invalid data received from agent It may happen, at least with older version of the agent plugin, that the help text of SQLPlus is sent in the agent sections. This could lead to ~50 services being created by accident. The changed check now ignores these unexpected lines from the agent and only processes lines which match the known format. --- .werks/3765 | 13 +++++++++++++ ChangeLog | 1 + checks/oracle_asm_diskgroup | 9 ++++++--- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.werks/3765 b/.werks/3765 new file mode 100644 index 0000000..3dd9e99 --- /dev/null +++ b/.werks/3765 @@ -0,0 +1,13 @@ +Title: oracle_asm_diskgroup: Made check more robust against invalid data received from agent +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1472124723 + +It may happen, at least with older version of the agent plugin, that the help text of SQLPlus +is sent in the agent sections. This could lead to ~50 services being created by accident. The +changed check now ignores these unexpected lines from the agent and only processes lines which +match the known format. diff --git a/ChangeLog b/ChangeLog index bf35bd5..4f4d3cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -351,6 +351,7 @@ * 3774 FIX: apc_symmetra: fixed wrong status and values handling * 3761 FIX: windows_tasks: Fixed possible exception in discovery in case of unexpected agent data * 3762 FIX: local: Fixed long output handling with Microcore... + * 3765 FIX: oracle_asm_diskgroup: Made check more robust against invalid data received from agent... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/oracle_asm_diskgroup b/checks/oracle_asm_diskgroup index c2516ab..3a74d31 100644 --- a/checks/oracle_asm_diskgroup +++ b/checks/oracle_asm_diskgroup @@ -41,10 +41,10 @@ factory_settings["asm_diskgroup_default_levels"] = { } def inventory_oracle_asm_diskgroup(info): - return [ (line[-1].rstrip("/"), {}) for line in info ] + return [ (line[-1].rstrip("/"), {}) for line in info + if len(line) in [ 12, 13 ] and line[0] in [ "MOUNTED", "DISMOUNTED" ] ] def check_oracle_asm_diskgroup(item, params, info): - for line in info: voting_files = 'N' @@ -57,7 +57,10 @@ def check_oracle_asm_diskgroup(item, params, info): free_mb, req_mir_free_mb, usable_file_mb, offline_disks, \ name = line else: - name = "" + continue # Invalid data, skip this line + + if state not in [ "MOUNTED", "DISMOUNTED" ]: + continue # Invalid data, skip this line dg_name = name.rstrip('/')

7 years, 10 months

fixed crash but availability option 'log row limit' is still missing

by Simon Betz

Module: check_mk Branch: master Commit: 83d312f0ec895086f313ac6931c139d88156ca07 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83d312f0ec8950… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Aug 25 11:11:06 2016 +0200 fixed crash but availability option 'log row limit' is still missing --- web/plugins/views/availability.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 317d50a..a76129d 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -560,7 +560,9 @@ def render_bi_availability(title, aggr_rows): htmlcode + \ '</td></tr></table>' - av_rawdata = availability.spans_by_object(spans) + # FIXME non implemented log row limit + av_rawdata, has_reached_logrow_limit = availability.spans_by_object(spans, None) + av_data = availability.compute_availability("bi", av_rawdata, avoptions) if html.output_format == "csv_export":

7 years, 10 months

Also remove eval(json_data) from the jolokia special agent

by Konstantin Büttner

Module: check_mk Branch: master Commit: f1988b32d63376722f12a9d46ad91b2ec8735f38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1988b32d63376… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Aug 25 10:34:11 2016 +0200 Also remove eval(json_data) from the jolokia special agent --- agents/special/agent_jolokia | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/agents/special/agent_jolokia b/agents/special/agent_jolokia index 859eaf5..0753eff 100755 --- a/agents/special/agent_jolokia +++ b/agents/special/agent_jolokia @@ -34,7 +34,10 @@ except ImportError: try: import json except ImportError: - json = None + sys.stdout.write("<<<jolokia_info>>>\n") + sys.stdout.write("Error: Missing JSON library for Agent Plugin mk_jolokia\n") + exit() + # assigned in parse_arguments opt_verbose = False @@ -155,21 +158,15 @@ def fetch_var(protocol, server, port, path, suburi, cert_path, itemspec): return [] try: - true = True - false = False - null = None - if json: - obj = json.loads(data) - else: - obj = eval(data) + obj = json.loads(json_data) except Exception, e: sys.stderr.write('ERROR: Invalid json code (%s)\n' % e) - sys.stderr.write(' Response %s\n' % data) + sys.stderr.write(' Response %s\n' % json_data) return [] if obj.get('status', 200) != 200: sys.stderr.write('ERROR: Invalid response when fetching url %s\n' % url) - sys.stderr.write(' Response: %s\n' % data) + sys.stderr.write(' Response: %s\n' % json_data) return [] # Only take the value of the object. If the value is an object

7 years, 10 months

3743 SEC mk_jolokia: Use JSON library to parse JSON output in lieu of eval ()

by Konstantin Büttner

Module: check_mk Branch: master Commit: 7a6546083ab368a97e05710fbdd9f10b7a88053e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a6546083ab368… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Aug 25 10:04:58 2016 +0200 3743 SEC mk_jolokia: Use JSON library to parse JSON output in lieu of eval() Previously, the mk_jolokia agent plugin would try to parse the JSON data returned from jolokia with eval(). Now, the simplejson or json python libraries are a prerequisite for the plugin to work. --- .werks/3743 | 12 ++++++++++++ ChangeLog | 2 ++ agents/plugins/mk_jolokia | 12 ++++-------- checks/jolokia_info | 5 +++++ 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/.werks/3743 b/.werks/3743 new file mode 100644 index 0000000..aa07db4 --- /dev/null +++ b/.werks/3743 @@ -0,0 +1,12 @@ +Title: mk_jolokia: Use JSON library to parse JSON output in lieu of eval() +Level: 1 +Component: checks +Class: security +Compatible: incomp +State: unknown +Version: 1.4.0i1 +Date: 1472111893 + +Previously, the mk_jolokia agent plugin would try to parse the JSON data +returned from jolokia with eval(). Now, the simplejson or json python +libraries are a prerequisite for the plugin to work. diff --git a/ChangeLog b/ChangeLog index 6df1a19..bf35bd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -138,6 +138,8 @@ * 3790 f5_bigip_cluster_status: New check to monitor integrity of active/active and standby/active clusters * 3791 f5_bigip_vserver: now reports lots of additional performance data... NOTE: Please refer to the migration notes! + * 3743 SEC: mk_jolokia: Use JSON library to parse JSON output in lieu of eval()... + NOTE: Please refer to the migration notes! * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index 1657d79..3b29dff 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -33,7 +33,9 @@ except ImportError: try: import json except ImportError: - json = None + sys.stdout.write("<<<jolokia_info>>>\n") + sys.stdout.write("Error: Missing JSON library for Agent Plugin mk_jolokia\n") + exit() opt_verbose = '--verbose' in sys.argv opt_debug = '--debug' in sys.argv @@ -151,13 +153,7 @@ def fetch_var(protocol, server, port, path, suburi, itemspec, service_url, servi json_data = fetch_url_get(base_url, path, function) try: - true = True - false = False - null = None - if json: - obj = json.loads(json_data) - else: - obj = eval(json_data) + obj = json.loads(json_data) except Exception, e: sys.stderr.write('ERROR: Invalid json code (%s)\n' % e) sys.stderr.write(' Response %s\n' % json_data) diff --git a/checks/jolokia_info b/checks/jolokia_info index f44ce88..3dac7d0 100644 --- a/checks/jolokia_info +++ b/checks/jolokia_info @@ -28,6 +28,11 @@ def inventory_jolokia_info(info): return [ (line[0], None) for line in info if line[1] != 'ERROR' ] def check_jolokia_info(item, _no_params, info): + + # Inform user of non-working agent plugin, eg. missing json library + if info[0][0] == "Error:": + return 3, " ".join(info[0]) + for line in info: if line[0] == item: if line[1] == 'ERROR' or len(line) < 4:

7 years, 10 months

3780 availability: now limit of fetched logfile rows is configurable.

by Simon Betz

Module: check_mk Branch: master Commit: e9fde3be951de115c858f125f355f39dddbc2ae1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9fde3be951de1… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Aug 25 09:59:04 2016 +0200 3780 availability: now limit of fetched logfile rows is configurable. --- .werks/3780 | 9 ++++++++ ChangeLog | 1 + web/htdocs/availability.py | 44 ++++++++++++++++++++++++++++++++----- web/plugins/views/availability.py | 17 +++++++++++--- 4 files changed, 62 insertions(+), 9 deletions(-) diff --git a/.werks/3780 b/.werks/3780 new file mode 100644 index 0000000..ef79d9e --- /dev/null +++ b/.werks/3780 @@ -0,0 +1,9 @@ +Title: availability: now limit of fetched logfile rows is configurable. +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i1 +Date: 1472111747 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index bc606c0..6df1a19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -371,6 +371,7 @@ * 3141 added user interfaces and permissions to view and acknowledge failed notifications * 3640 new filter option for status details: can now be negated * 3713 new filter: hosts with certain service problems + * 3780 availability: now limit of fetched logfile rows is configurable. * 3059 FIX: Fixed highlighting of availability timeline time slices * 3175 FIX: Fix timeranges of graphs that are embedded in a dashboard... * 3076 FIX: fixed broken views in check_mk raw edition diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index be04b12..cdfc2ee 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -475,7 +475,6 @@ def get_avoption_entries(what): label = _("Show timeline of each object directly in table")), ), - # Timelimit ( "timelimit", "single", False, @@ -486,7 +485,18 @@ def get_avoption_entries(what): unit = _("sec"), default_value = 30, ), - ) + ), + + ( "logrow_limit", + "single", + True, + Integer( + title = _("Log row limit"), + help = _("Limit the fetched rows of logfile in order to avoid " + "a hanging system. A value of zero means no limit."), + default_value = 5000, + ), + ), ] def get_default_avoptions(): @@ -508,6 +518,7 @@ def get_default_avoptions(): "summary" : "sum", "show_timeline" : False, "timelimit" : 30, + "logrow_limit" : 5000, "downtimes" : { "include" : "honor", @@ -581,8 +592,11 @@ def get_availability_rawdata(what, filterheaders, only_sites, av_object, include else: av_filter += "Filter: service_description =\n" - query = "GET statehist\n" + av_filter + query = "GET statehist\n" + av_filter query += "Timelimit: %d\n" % avoptions["timelimit"] + logrow_limit = avoptions["logrow_limit"] + if logrow_limit: + query += "Limit: %d\n" % (logrow_limit + 1) # Add Columns needed for object identification columns = [ "host_name", "service_description" ] @@ -612,11 +626,20 @@ def get_availability_rawdata(what, filterheaders, only_sites, av_object, include sites.live().set_prepend_site(False) columns = ["site"] + columns spans = [ dict(zip(columns, span)) for span in data ] - return spans_by_object(spans) + + # Now we find out if the log row limit was exceeded or + # if the log's length is the limit by accident. + # If this limit was exceeded then we cut off the last element + # in spans_by_object because it might be incomplete. + logrow_limit_reached_entry = None + if logrow_limit and len(data) >= logrow_limit + 1: + logrow_limit_reached_entry = dict(zip(columns, data[-1])) + + return spans_by_object(spans, logrow_limit_reached_entry) # Sort the raw spans into a tree of dicts, so that we # have easy access to the timeline of each object -def spans_by_object(spans): +def spans_by_object(spans, logrow_limit_reached_entry): # Sort by site/host and service, while keeping native order av_rawdata = {} for span in spans: @@ -624,7 +647,16 @@ def spans_by_object(spans): service = span["service_description"] av_rawdata.setdefault(site_host, {}) av_rawdata[site_host].setdefault(service, []).append(span) - return av_rawdata + + if logrow_limit_reached_entry: + site_host = (logrow_limit_reached_entry["site"], logrow_limit_reached_entry["host_name"]) + if logrow_limit_reached_entry["service_description"]: + del av_rawdata[site_host][logrow_limit_reached_entry["service_description"]] + else: + del av_rawdata[site_host] + + # We have to remember if rawdata was modified + return av_rawdata, logrow_limit_reached_entry != None # Compute an availability table. what is one of "bi", "host", "service". diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index b990f86..317d50a 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -136,6 +136,7 @@ def render_availability_options(what): # is (currently) called by views.py, when showing a view but # availability mode is activated. def render_availability_page(view, datasource, filterheaders, only_sites, limit): + if handle_edit_annotations(): return @@ -187,8 +188,9 @@ def render_availability_page(view, datasource, filterheaders, only_sites, limit) # Now compute all data, we need this also for CSV export if not html.has_user_errors(): - av_rawdata = availability.get_availability_rawdata(what, filterheaders, only_sites, - av_object, av_mode == "timeline", avoptions) + av_rawdata, has_reached_logrow_limit = \ + availability.get_availability_rawdata(what, filterheaders, only_sites, + av_object, av_mode == "timeline", avoptions) av_data = availability.compute_availability(what, av_rawdata, avoptions) # Do CSV ouput @@ -206,7 +208,6 @@ def render_availability_page(view, datasource, filterheaders, only_sites, limit) html.write(confirmation_html_code) - # Remove variables for editing annotations, otherwise they will make it into the uris html.del_all_vars("editanno_") html.del_all_vars("anno_") @@ -237,6 +238,16 @@ def render_availability_page(view, datasource, filterheaders, only_sites, limit) avoptions = render_availability_options(what) if not html.has_user_errors(): + # If we abolish the limit we have to fetch the data again + # with changed logrow_limit = 0, which means no limit + if has_reached_logrow_limit: + text = _("Your query matched more than %d log entries. " + "<b>Note:</b> The number of shown rows does not necessarily reflect the " + "matched entries and the result might be incomplete. ") % avoptions["logrow_limit"] + text += '<a href="%s">%s</a>' % \ + (html.makeuri([("avo_logrow_limit", 0)]), _('Repeat query without limit.')) + html.show_warning(text) + do_render_availability(what, av_rawdata, av_data, av_mode, av_object, avoptions) if DisplayOptions.enabled(DisplayOptions.Z):

7 years, 10 months

3779 FIX availability: added validation of availability options

by Simon Betz

Module: check_mk Branch: master Commit: 734598258febe3a2644011abfecc6aaf3a043e45 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=734598258febe3… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Aug 25 09:28:37 2016 +0200 3779 FIX availability: added validation of availability options --- .werks/3779 | 10 ++++++++++ ChangeLog | 1 + web/plugins/views/availability.py | 1 + 3 files changed, 12 insertions(+) diff --git a/.werks/3779 b/.werks/3779 new file mode 100644 index 0000000..a6fadbb --- /dev/null +++ b/.werks/3779 @@ -0,0 +1,10 @@ +Title: availability: added validation of availability options +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1472110040 + + diff --git a/ChangeLog b/ChangeLog index 85d0291..bc606c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -448,6 +448,7 @@ * 3758 FIX: Fixed wrong sorting of events in main dashboard in distributed environments * 3561 FIX: Removing a comment now also removes any linked acknowledgements... * 3763 FIX: Fixed playing sounds in views when using current Firefox... + * 3779 FIX: availability: added validation of availability options WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 34961d0..b990f86 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -76,6 +76,7 @@ def render_availability_options(what): for name, height, show_in_reporting, vs in avoption_entries: try: avoptions[name] = vs.from_html_vars("avo_" + name) + vs.validate_value(avoptions[name], "avo_" + name) except MKUserError, e: html.add_user_error(e.varname, e) is_open = True

7 years, 10 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2016