Checkmk git commits March 2016

checkmk-commits@lists.checkmk.com

7 participants
275 discussions

Added some linter ignores for situations the linter can not find the correct type

by Lars Michelsen

Module: check_mk Branch: master Commit: e608b5aa63c51bd0ed7becd2008ee21d58f37ccc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e608b5aa63c51b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 16 09:16:36 2016 +0100 Added some linter ignores for situations the linter can not find the correct type --- web/htdocs/wato.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7bd26d1..b3cd181 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2339,7 +2339,7 @@ def analyse_ruleset(rulespec, ruleset, hostname, service): effectiverules.append((folder, nr)) elif rulespec["match"] == "dict": - new_result = value.copy() + new_result = value.copy() # pylint: disable=no-member new_result.update(resultdict) resultdict = new_result effectiverules.append((folder, nr)) @@ -9278,7 +9278,7 @@ def mode_edit_site(phase): if type(method) == str and method.startswith("unix:"): method = ('unix', method[5:]) elif type(method) == str and method.startswith("tcp:"): - parts = method.split(":")[1:] + parts = method.split(":")[1:] # pylint: disable=no-member method = ('tcp', (parts[0], int(parts[1]))) vs_conn_method.render_input("method", method) @@ -12276,7 +12276,7 @@ def mode_edit_ruleset(phase): title = _("This rule matches, but does not define any parameters.") img = 'imatch' else: - new_keys = set(value.keys()) + new_keys = set(value.keys()) # pylint: disable=no-member if set_is_disjoint(match_keys, new_keys): title = _("This rule matches and defines new parameters.") img = 'match'

8 years, 6 months

GUI cleanup: moved button for deleting a host to header

by Mathias Kettner

Module: check_mk Branch: master Commit: 059307146eff747c2de3724f9a510b48897b5ff6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=059307146eff74… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 15 17:17:02 2016 +0100 GUI cleanup: moved button for deleting a host to header It is now a context button just like the other buttons, and not anymore a submit button of the form --- web/htdocs/wato.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 14bb805..7bd26d1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1217,9 +1217,13 @@ def mode_edit_host(phase, new, is_cluster): html.context_button(_("Clustered Services"), folder_preserving_link([("mode", "edit_ruleset"), ("varname", "clustered_services")]), "rulesets") - if config.may("wato.rename_hosts") and not Folder.current().locked_hosts(): - html.context_button(_("Rename %s") % (is_cluster and _("Cluster") or _("Host")), - folder_preserving_link([("mode", "rename_host"), ("host", hostname)]), "rename_host") + if not Folder.current().locked_hosts(): + if config.may("wato.rename_hosts"): + html.context_button(is_cluster and _("Rename Cluster") or _("Rename Host"), + folder_preserving_link([("mode", "rename_host"), ("host", hostname)]), "rename_host") + html.context_button(is_cluster and _("Delete Cluster") or _("Delete Host"), + html.makeactionuri([("delete", "1")]), "delete") + if not is_cluster: html.context_button(_("Diagnostic"), folder_preserving_link([("mode", "diag_host"), ("host", hostname)]), "diagnose") @@ -1308,8 +1312,6 @@ def mode_edit_host(phase, new, is_cluster): html.image_button("save", _("Save & Finish"), "submit") if not is_cluster: html.image_button("diag_host", _("Save & Test"), "submit") - if not new: - html.image_button("delete", _("Delete host!"), "submit") html.hidden_fields() html.end_form()

8 years, 6 months

Improved background color of forms in screenshot mode

by Mathias Kettner

Module: check_mk Branch: master Commit: 25432f1231f50e597bfea2bd61877b7af936e6ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25432f1231f50e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 15 17:05:42 2016 +0100 Improved background color of forms in screenshot mode --- web/htdocs/pages.css | 2 +- web/htdocs/views.css | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 69446bb..0bfd74f 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -75,7 +75,7 @@ body.main { on the URL */ body.main.screenshotmode { background-image: url(""); - background-color: white; + background-color: white; /* #5893af; */ } body.main div.main { diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 3168d25..1ce7ec2 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -68,6 +68,10 @@ div.floatfilter { color: black; } +body.main.screenshotmode div.floatfilter { + background-color: #5893af; +} + div.floatfilter input[type=text].neg { width: 229px; }

8 years, 6 months

Updated bug entries #2429

by Mathias Kettner

Module: check_mk Branch: master Commit: 1b7bc9f8c49290921a1fc9b9136974de11bfaa0c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b7bc9f8c49290… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 15 17:05:22 2016 +0100 Updated bug entries #2429 --- .bugs/2429 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/2429 b/.bugs/2429 new file mode 100644 index 0000000..572b641 --- /dev/null +++ b/.bugs/2429 @@ -0,0 +1,10 @@ +Title: OMD site with AUTOSTART off is partially started after server boot +Component: core +State: open +Date: 2016-03-15 17:04:31 +Targetversion: 1.2.8 +Class: bug + +If you boot your server then a site with AUTOSTART off +is partially started due to the crontab entry being started. +This prevents e.g. omd config.

8 years, 6 months

3102 added option to availability to include host alias in reports

by Sebastian Herbord

Module: check_mk Branch: master Commit: c925cd06c6f54cb9a3ffc2667eb74f665b6cdea1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c925cd06c6f54c… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Mar 15 16:44:12 2016 +0100 3102 added option to availability to include host alias in reports In addition to the new option to display the host alias, the option "do not display the host name" now works in host availability views as well, but only if the alias is selected to be displayed. You still can't have a table with only the availability column. --- .werks/3102 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/availability.py | 36 +++++++++++++++++++++++++++--------- 3 files changed, 39 insertions(+), 9 deletions(-) diff --git a/.werks/3102 b/.werks/3102 new file mode 100644 index 0000000..19db742 --- /dev/null +++ b/.werks/3102 @@ -0,0 +1,11 @@ +Title: added option to availability to include host alias in reports +Level: 1 +Component: reporting +Compatible: compat +Version: 1.2.9i1 +Date: 1458056479 +Class: feature + +In addition to the new option to display the host alias, the option "do not display the host name" +now works in host availability views as well, but only if the alias is selected to be displayed. You still +can't have a table with only the availability column. diff --git a/ChangeLog b/ChangeLog index 974f177..72b8788 100644 --- a/ChangeLog +++ b/ChangeLog @@ -145,6 +145,7 @@ Reporting & Availability: * 3267 New availability option for reclassifying host state "unreachable"... + * 3102 added option to availability to include host alias in reports... * 3249 FIX: Fix missing filter for non-OK services when report is called via context button * 3268 FIX: Availability options were invalid after resetting them... * 3269 FIX: Fix rendering of floating point values < 1 in graphs (e.g. CPU load) diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index 4e004b2..bef5903 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -149,6 +149,7 @@ def get_avoption_entries(what): choices = [ ( "omit_headers", _("Do not display column headers")), ( "omit_host", _("Do not display the host name")), + ( "show_alias", _("Display the host alias")), ( "use_display_name", _("Use alternative display name for services")), ( "omit_buttons", _("Do not display icons for history and timeline")), ( "display_timeline_legend", _("Display legend for timeline")), @@ -589,6 +590,8 @@ def get_availability_rawdata(what, filterheaders, only_sites, av_object, include columns.append("log_output") if "use_display_name" in avoptions["labelling"]: columns.append("service_display_name") + if "show_alias" in avoptions["labelling"]: + columns.append("host_alias") # If we group by host/service group then make sure that that information is available if avoptions["grouping"] not in [ None, "host" ]: @@ -665,6 +668,7 @@ def compute_availability(what, av_rawdata, avoptions): display_name = span.get("service_display_name", service) state = span["state"] + host_alias = span.get("host_alias", site_host[1]) consider = True if state == -1: @@ -741,6 +745,7 @@ def compute_availability(what, av_rawdata, avoptions): availability_entry = { "site" : site_host[0], "host" : site_host[1], + "alias" : host_alias, "service" : service, "display_name" : display_name, "states" : states, @@ -917,15 +922,24 @@ def layout_availability_table(what, group_title, availability_table, avoptions): } # Titles for the columns that specify the object + titles = [] if what == "bi": - av_table["object_titles"] = [ _("Aggregate") ] - elif what == "host": - av_table["object_titles"] = [ _("Host") ] - else: # service - if "omit_host" in labelling: - av_table["object_titles"] = [ _("Service") ] - else: - av_table["object_titles"] = [ _("Host"), _("Service") ] + titles.append(_("Aggregate")) + else: + # in service availability we can only omit the host. In the + # host availability this is only possible if the alias is + # being displayed, Otherwise the table wouldn't make sense + # and the pdf renderer would crash + if "omit_host" not in labelling or\ + (what == "host" and "show_alias" not in labelling): + titles.append(_("Host")) + if "show_alias" in labelling: + titles.append(_("Alias")) + + if what != "host": + titles.append(_("Service")) + + av_table["object_titles"] = titles # Headers for availability cells av_table["cell_titles"] = [] @@ -947,6 +961,7 @@ def layout_availability_table(what, group_title, availability_table, avoptions): for entry in availability_table: site = entry["site"] host = entry["host"] + alias = entry["alias"] service = entry["service"] row = {} @@ -975,8 +990,11 @@ def layout_availability_table(what, group_title, availability_table, avoptions): objectcells.append((service, bi_url)) else: host_url = "view.py?" + html.urlencode_vars([("view_name", "hoststatus"), ("site", site), ("host", host)]) - if not "omit_host" in labelling or what == "host": + if "omit_host" not in labelling or\ + (what == "host" and "show_alias" not in labelling): objectcells.append((host, host_url)) + if "show_alias" in labelling: + objectcells.append((alias, host_url)) if what == "service": if "use_display_name" in labelling: service_name = entry["display_name"]

8 years, 6 months

3101 zpool: new check to monitor usage of zfs pools

by Sebastian Herbord

Module: check_mk Branch: master Commit: 27f3b0777d06d7a0037e8868347b2332ef9e5412 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27f3b0777d06d7… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Mar 15 14:24:34 2016 +0100 3101 zpool: new check to monitor usage of zfs pools There is already a check (zfsget) to monitor usage of zfs mountpoints, but in complex setups where the pools don't map 1:1 to mountpoints, the existing check doesn't give a correct picture of the underlying pools. --- .werks/3101 | 11 +++++++ ChangeLog | 1 + agents/check_mk_agent.solaris | 3 ++ checkman/zpool | 16 +++++++++ checks/zpool | 72 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 103 insertions(+) diff --git a/.werks/3101 b/.werks/3101 new file mode 100644 index 0000000..c41d185 --- /dev/null +++ b/.werks/3101 @@ -0,0 +1,11 @@ +Title: zpool: new check to monitor usage of zfs pools +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1458048130 +Class: feature + +There is already a check (zfsget) to monitor usage of zfs mountpoints, but in complex setups where +the pools don't map 1:1 to mountpoints, the existing check doesn't give a correct picture of the +underlying pools. diff --git a/ChangeLog b/ChangeLog index d82beae..974f177 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ * 3004 agent_vsphere: now able to configure used piggyback name for virtualmachines... * 3095 prism_info, prism_containers, prism_alerts: added checks to monitor a Nutanix Prism cluster * 3096 check_mailboxes: new active check to monitor age and count of mails in imap mailboxes + * 3101 zpool: new check to monitor usage of zfs pools... * 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/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 3cf8046..cfccfda 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -239,6 +239,9 @@ echo $load 1/$ps $$ $procs # zpool status if [ -x /sbin/zpool ]; then run_cached -s zpool_status 120 "/sbin/zpool status -x" + + echo '<<<zpool>>>' + zpool list fi diff --git a/checkman/zpool b/checkman/zpool new file mode 100644 index 0000000..f0ceb69 --- /dev/null +++ b/checkman/zpool @@ -0,0 +1,16 @@ +title: ZFS Storage Pool sizes +agents: solaris +catalog: os/storage +license: GPL +distribution: check_mk +description: + Checks the current size and usage of ZFS storage pools. The information + is read by the agent from {zpool list}. This check can be configured + using the filesystem rule. + + In a simple setup where a pool is mapped 1:1 to a mountpoint and where no + snapshots are used, this will report the same information as the zfsget + check. + +inventory: + The inventory will create one service per pool. diff --git a/checks/zpool b/checks/zpool new file mode 100644 index 0000000..d4b995b --- /dev/null +++ b/checks/zpool @@ -0,0 +1,72 @@ +#!/usr/bin/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. + + +# NAME SIZE ALLOC FREE CAP HEALTH ALTROOT +# app02 39.8G 14.1G 25.6G 35% ONLINE - +# rpool 39.8G 32.9G 6.81G 82% ONLINE - + + +def parse_zpool(info): + result = {} + header = [item.lower() for item in info[0]] + for line in info[1:]: + result[line[0]] = dict(zip(header, line)) + return result + +def inventory_zpool(parsed): + return df_inventory(parsed.keys()) + + +def check_zpool(item, params, parsed): + def mb(val): + # split number from unit + for idx, ch in enumerate(val): + if ch not in "0123456789.-": + break + num = float(val[:idx]) + unit = val[idx:].lstrip().lower() + unit = ["b", "k", "m", "g", "t"].index(unit) + + return num * (1024 ** (unit - 2)) + + fslist = [] + for pool, entry in parsed.iteritems(): + if "patterns" in params or item == pool: + fslist.append((pool, mb(entry['size']), mb(entry['free']), 0)) + + return df_check_filesystem_list(item, params, fslist) + + +check_info['zpool'] = { + "check_function" : check_zpool, + "inventory_function" : inventory_zpool, + "parse_function" : parse_zpool, + "service_description" : "Pool %s", + "has_perfdata" : True, + "group" : "filesystem", +} +

8 years, 6 months

3100 FIX fixed exception when trying to create a wato folder when that folder already exists

by Sebastian Herbord

Module: check_mk Branch: master Commit: 7cb51b792f1339f9c79d1c35edc94a40641e8cd2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7cb51b792f1339… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Mar 15 13:28:32 2016 +0100 3100 FIX fixed exception when trying to create a wato folder when that folder already exists --- .werks/3100 | 9 +++++++++ ChangeLog | 1 + web/htdocs/watolib.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/3100 b/.werks/3100 new file mode 100644 index 0000000..01259a6 --- /dev/null +++ b/.werks/3100 @@ -0,0 +1,9 @@ +Title: fixed exception when trying to create a wato folder when that folder already exists +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458044804 + diff --git a/ChangeLog b/ChangeLog index 8d9191a..d82beae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -131,6 +131,7 @@ * 3283 FIX: Bulk import of hosts: It is now possible again to import a simple list of hosts... * 3284 FIX: Bulk import of hosts: Fixed disabling of reading first line as header... * 3270 FIX: Fix button [Deprecated Rulesets] within deprecated manual checks rulesets + * 3100 FIX: fixed exception when trying to create a wato folder when that folder already exists Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index b6536f0..e0e8ccc 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -4517,7 +4517,7 @@ def must_be_in_contactgroups(cgspec): def check_wato_foldername(htmlvarname, name, just_name = False): - if not just_name and name in Folder.current().has_subfolder(name): + if not just_name and Folder.current().has_subfolder(name): raise MKUserError(htmlvarname, _("A folder with that name already exists.")) if not name:

8 years, 6 months

Fixed recently introduced bug

by Lars Michelsen

Module: check_mk Branch: master Commit: 30d942faf4848d5fb4412100e3bc4e61ba3d4932 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30d942faf4848d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 15 13:08:46 2016 +0100 Fixed recently introduced bug --- web/htdocs/dashboard.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 8388315..06d5804 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -1198,7 +1198,15 @@ def check_ajax_update(): ident = int(html.var('id')) load_dashboards(lock=True) - dashlet = get_dashlet(board, ident) + + if board not in available_dashboards: + raise MKGeneralException(_('The requested dashboard does not exist.')) + dashboard = available_dashboards[board] + + try: + dashlet = dashboard['dashlets'][ident] + except IndexError: + raise MKGeneralException(_('The dashlet does not exist.')) return dashlet, dashboard

8 years, 6 months

Updated styling of grouped services in table views

by Lars Michelsen

Module: check_mk Branch: master Commit: 839408f3ea52552c92e68b89523515c6b534cd5e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=839408f3ea5255… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 15 12:53:09 2016 +0100 Updated styling of grouped services in table views --- web/htdocs/pages.css | 4 ++ web/plugins/views/layouts.py | 74 +++++++++++++++++----------- web/plugins/wato/check_mk_configuration.py | 3 +- 3 files changed, 52 insertions(+), 29 deletions(-) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 7265dd4..69446bb 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -562,6 +562,10 @@ tr.data.grouped_row_header img.treeangle { margin-left: 0; } +tr.data.group_end { + border-bottom: 2px solid #ccc; +} + /* state in group header must have fixed width */ .groupheader td.state { border: 1px solid #000000; diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index fc6274f..da9a95d 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -184,7 +184,7 @@ def render_grouped_boxes(rows, view, group_painters, painters, num_columns, show html.write("</tr></table>\n") html.write("<table class=data>") - trclass = None + odd = "even" def show_header_line(): html.write("<tr>") @@ -202,7 +202,7 @@ def render_grouped_boxes(rows, view, group_painters, painters, num_columns, show groups = calculate_grouping_of_services(rows_with_ids) visible_row_number = 0 - hide_grouped_rows = 0 + group_hidden, num_grouped_rows = None, 0 for index, row in rows_with_ids: if view.get("column_headers") == "repeat": if visible_row_number > 0 and visible_row_number % repeat_heading_every == 0: @@ -211,7 +211,7 @@ def render_grouped_boxes(rows, view, group_painters, painters, num_columns, show register_events(row) # needed for playing sounds - trclass = trclass == "odd" and "even" or "odd" + odd = odd == "odd" and "even" or "odd" # state = row.get("service_state", row.get("aggr_state")) state = saveint(row.get("service_state")) @@ -220,23 +220,33 @@ def render_grouped_boxes(rows, view, group_painters, painters, num_columns, show if state > 0: state +=1 # 1 is critical for hosts - stale = '' - if is_stale(row): - stale = ' stale' - num_painters = len(painters) if index in groups: - group_spec, num_rows = groups[index] - hide_grouped_rows = grouped_row_title(index, group_spec, num_rows, trclass, num_painters) - trclass = trclass == "odd" and "even" or "odd" + group_spec, num_grouped_rows = groups[index] + group_hidden = grouped_row_title(index, group_spec, num_grouped_rows, odd, num_painters) + odd = odd == "odd" and "even" or "odd" + + + css_classes = [] + + if is_stale(row): + css_classes.append("stale") hide = "" - if hide_grouped_rows: - hide = " style=\"display:none\"" - hide_grouped_rows -= 1 + if num_grouped_rows > 0: + num_grouped_rows -= 1 + if group_hidden: + hide = " style=\"display:none\"" + + if group_hidden != None and num_grouped_rows == 0: + # last row in group + css_classes.append("group_end") + group_hidden = None - html.write('<tr class="data %s%d%s"%s>' % (trclass, state, stale, hide)) + css_classes.append("%s%d" % (odd, state)) + + html.write('<tr class="data %s"%s>' % (" ".join(css_classes), hide)) if show_checkboxes: render_checkbox_td(view, row, num_painters) @@ -273,12 +283,7 @@ def grouped_row_title(index, group_spec, num_rows, trclass, num_painters): html.write("%s (%d)</td>" % (html.attrencode(group_spec["title"]), num_rows)) html.write("</tr>") - if not is_open: - hide_grouped_rows = num_rows - else: - hide_grouped_rows = 0 - - return hide_grouped_rows + return not is_open # Produces a dictionary where the row index of the first row is used as key @@ -514,7 +519,7 @@ def render_grouped_list(rows, view, group_painters, painters, num_columns, show_ groups = calculate_grouping_of_services(rows_with_ids) visible_row_number = 0 - hide_grouped_rows = 0 + group_hidden, num_grouped_rows = None, 0 for index, row in rows_with_ids: register_events(row) # needed for playing sounds # Show group header, if a new group begins. But only if grouping @@ -583,18 +588,31 @@ def render_grouped_list(rows, view, group_painters, painters, num_columns, show_ state = 0 if index in groups: - group_spec, num_rows = groups[index] - hide_grouped_rows = grouped_row_title(index, group_spec, num_rows, odd, num_painters) + group_spec, num_grouped_rows = groups[index] + group_hidden = grouped_row_title(index, group_spec, num_grouped_rows, odd, num_painters) odd = odd == "odd" and "even" or "odd" + css_classes = [] + hide = "" - if hide_grouped_rows: - hide = " style=\"display:none\"" - hide_grouped_rows -= 1 + if num_grouped_rows > 0: + num_grouped_rows -= 1 + if group_hidden: + hide = " style=\"display:none\"" + + if group_hidden != None and num_grouped_rows == 0: + # last row in group + css_classes.append("group_end") + group_hidden = None odd = odd == "odd" and "even" or "odd" - html.write('<tr class="data %s %s%d"%s>' % - (num_columns > 1 and "multicolumn" or "", odd, state, hide)) + + if num_columns > 1: + css_classes.append("multicolumn") + css_classes += ["%s%d" % (odd, state)] + + + html.write('<tr class="data %s"%s>' % (" ".join(css_classes), hide)) # Not first columns: Create one empty column as separator else: diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 5729ce7..ebbeee0 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -629,13 +629,14 @@ register_configvar(group, default_value = 2, )), ], - optional_keys = ["min_items"], + optional_keys = [], ), title = _("Grouping of services in table views"), help = _("You can use this option to make the service table views fold services matching " "the given patterns into groups. Only services in state <i>OK</i> will be folded " "together. Groups of only one service will not be rendered. If multiple patterns " "match a service, the service will be added to the first matching group."), + add_label = _("Add new grouping definition"), ), domain = "multisite", )

8 years, 6 months

3291 FIX Improved error handling when searching for BI aggregations with invalid regex

by Lars Michelsen

Module: check_mk Branch: master Commit: 718c22a90aeea9e8ad09ef2b1c456760145efa41 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=718c22a90aeea9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 15 12:00:15 2016 +0100 3291 FIX Improved error handling when searching for BI aggregations with invalid regex --- .werks/3291 | 10 ++++++++++ ChangeLog | 1 + web/plugins/visuals/bi.py | 7 ++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/3291 b/.werks/3291 new file mode 100644 index 0000000..69582c9 --- /dev/null +++ b/.werks/3291 @@ -0,0 +1,10 @@ +Title: Improved error handling when searching for BI aggregations with invalid regex +Level: 1 +Component: bi +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458039590 + + diff --git a/ChangeLog b/ChangeLog index 998860d..8d9191a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -139,6 +139,7 @@ BI: * 3247 FIX: Do not allow multiple BI aggregates with the same title... * 3232 FIX: BI: Only querying site of host for specific host status info... + * 3291 FIX: Improved error handling when searching for BI aggregations with invalid regex Reporting & Availability: * 3267 New availability option for reclassifying host state "unreachable"... diff --git a/web/plugins/visuals/bi.py b/web/plugins/visuals/bi.py index cd4ac8d..b2e5ed0 100644 --- a/web/plugins/visuals/bi.py +++ b/web/plugins/visuals/bi.py @@ -82,7 +82,12 @@ class BITextFilter(Filter): if not val: return rows if self.how == "regex": - reg = re.compile(val.lower()) + try: + reg = re.compile(val.lower()) + except re.error, e: + html.add_user_error(None, "Invalid regular expression: %s" % e) + return rows + return [ row for row in rows if reg.search(row[self.column].lower()) ] else: return [ row for row in rows if row[self.column] == val ]

8 years, 6 months

← Newer
1
...
10
11
12
13
14
15
16
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2016