Checkmk git commits October 2011

checkmk-commits@lists.checkmk.com

2 participants
109 discussions

Check_MK Git: check_mk: FIX: fixed some localisation strings

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: a0eb40aab82b5e2499edabbc05044626c80b43e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0eb40aab82b5e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 14 12:53:24 2011 +0200 FIX: fixed some localisation strings --- ChangeLog | 1 + web/htdocs/htmllib.py | 8 ++++---- web/htdocs/index.py | 8 ++++---- web/htdocs/views.py | 4 ++-- web/htdocs/wato.py | 14 +++++++------- web/plugins/sidebar/shipped.py | 4 ++-- web/plugins/views/painters.py | 4 ++-- web/plugins/wato/builtin_attributes.py | 4 ++-- 8 files changed, 24 insertions(+), 23 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a0eb40aab8…

12 years, 8 months

Check_MK Git: check_mk: Updated bug entries

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 31a4ccf57e472fc26eb121688e7b478787890fa2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=31a4ccf57e472f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 14 12:32:06 2011 +0200 Updated bug entries --- .bugs/411 | 26 ++++++++++++++++++++++++++ .bugs/412 | 10 ++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/.bugs/411 b/.bugs/411 new file mode 100644 index 0000000..0af89a2 --- /dev/null +++ b/.bugs/411 @@ -0,0 +1,26 @@ +Title: Multisite: internationalization and localization docs missing +Component: doku +Benefit: 1 +State: open +Cost: 2 +Date: 2011-10-14 12:21:00 +Class: todo + +There are no docs for this feature. + +cmk --localize +BE AWARE: This is an experimental feature!!! + +Available commands are: + update LANG ... Creates or updates a .po file for the given language. + compile LANG ... Compiles the .po file into a .mo file which can + be used by gettext. + edit LANG ... Call update, open .po in editor and compile in one step + + The regular process for translating is: + + 1.) Create/update the .po file for the given language + 2.) Edit the .po file + 3.) Compile the .po file to get a .mo file which can be used by gettext + + Locale files are located in: /omd/sites/lancom/local/share/check_mk/locale diff --git a/.bugs/412 b/.bugs/412 new file mode 100644 index 0000000..7c8ddfa --- /dev/null +++ b/.bugs/412 @@ -0,0 +1,10 @@ +Title: Documentation for dashboards is missing +Component: doku +Benefit: 3 +State: open +Cost: 3 +Date: 2011-10-14 12:30:36 +Class: todo + +A common question will be how to customize the dashboard. Create basic docs +for the dashboard format and how to create custom dashlets and dashboards

12 years, 8 months

Check_MK Git: check_mk: Reserved 10 bug IDS

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: b4ec7603e1dc51e626229cfbe05174f0838d2fab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4ec7603e1dc51… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 14 12:20:51 2011 +0200 Reserved 10 bug IDS --- .bugs/first_free | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.bugs/first_free b/.bugs/first_free index 617de7e..1bb7ac5 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -411 +421

12 years, 8 months

Check_MK Git: check_mk: FIX: fixed sorting of multiple joined columns

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 324079221210c64477836092e8904761775e828c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=324079221210c6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 14 11:17:43 2011 +0200 FIX: fixed sorting of multiple joined columns --- ChangeLog | 1 + web/htdocs/views.py | 39 ++++++++++++++++++++++++--------------- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 54b872f..e9c8057 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ * FIX: fix URL-too-long in permissions page * FIX: fix permission computation * FIX: fixed sorting of service perfdata columns + * FIX: fixed sorting of multiple joined columns in some cases * Cleanup permissions page optically, add comments for views and snapins * Added some missing i18n strings in general HTML functions * Added display_option "w" to disable limit messages and livestatus errors in views diff --git a/web/htdocs/views.py b/web/htdocs/views.py index a59a8fa..cf8af93 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1752,29 +1752,38 @@ def sort_data(data, sorters): if len(sorters) == 0: return - # Join the data in case of sorting with joined data - # FIXME: Problem: What to do in case of several joined - # columns of different services which use the same cols? - for row in data: - for s in sorters: - if len(s) > 2: - row.update(row.get("JOIN", {}).get(s[2], {})) - - if len(sorters) == 1: - data.sort(sorters[0][0]["cmp"], None, sorters[0][1]) - return + # Handle case where join columns are not present for all rows + def save_compare(compfunc, row1, row2): + if row1 == None and row2 == None: + return 0 + elif row1 == None: + return -1 + elif row2 == None: + return 1 + else: + return compfunc(row1, row2) - sort_cmps = [(s[0]["cmp"], (s[1] and -1 or 1)) for s in sorters] + sort_cmps = [] + for s in sorters: + cmpfunc = s[0]["cmp"] + negate = s[1] and -1 or 1 + if len(s) > 2: + joinkey = s[2] # e.g. service description + else: + joinkey = None + sort_cmps.append((cmpfunc, negate, joinkey)) def multisort(e1, e2): - for func, neg in sort_cmps: - c = neg * func(e1, e2) + for func, neg, joinkey in sort_cmps: + if joinkey: # Sorter for join column, use JOIN info + c = neg * save_compare(func, e1["JOIN"].get(joinkey), e2["JOIN"].get(joinkey)) + else: + c = neg * func(e1, e2) if c != 0: return c return 0 # equal data.sort(multisort) - # Create a list of filters allowed for a certain data source. # Each filter is valid for a special info, e.g. "host" or # "service". or always (info is None in that case).

12 years, 8 months

Check_MK Git: check_mk: FIX: fixed sorting of multiple joined columns in some cases

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 324004bd25daff64f55127dfdf65efedfd78da1e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=324004bd25daff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 14 12:04:33 2011 +0200 FIX: fixed sorting of multiple joined columns in some cases --- web/htdocs/views.py | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index cf8af93..0d470e4 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2388,12 +2388,7 @@ def get_separated_sorters(view): return group_sort, user_sort, view_sort -def get_painter_join_index(view, painter): - for e in view["painters"]: - if e[0] == painter['name'] and len(e) >= 5: - return e[3] - -def sort_url(view, painter): +def sort_url(view, painter, join_index): """ The following sorters need to be handled in this order: @@ -2408,9 +2403,6 @@ def sort_url(view, painter): sorter = group_sort + user_sort + view_sort - # When painter is joined, then add the join index as 3rd attribute to tuple - join_index = get_painter_join_index(view, painter) - # Now apply the sorter of the current column: # - Negate/Disable when at first position # - Move to the first position when already in sorters @@ -2451,9 +2443,11 @@ def sort_url(view, painter): def paint_header(view, p): painter = p[0] + join_index = None if len(p) >= 4: # join column if len(p) >= 5 and p[4]: - t = p[4] + t = p[4] + join_index = p[3] else: t = p[3] else: @@ -2472,7 +2466,7 @@ def paint_header(view, p): and view.get('user_sortable', True) \ and get_sorter_name_of_painter(painter) is not None: params = [ - ('sort', sort_url(view, painter)), + ('sort', sort_url(view, painter, join_index)), ] if html.has_var('_body_class'): params.append(('_body_class', html.var('_body_class')))

12 years, 8 months

Check_MK Git: check_mk: New check bintec_info

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0b15164d2a0a8f7d080385851b2eea3f4b5c2c58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b15164d2a0a8f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 12 09:02:49 2011 +0200 New check bintec_info New check bintec_info to gather the software version and serial number of bintec routers --- ChangeLog | 2 ++ checkman/bintec_info | 16 ++++++++++++++++ checks/bintec_info | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index c8b53e9..54b872f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,8 @@ * FIX: mbg_lantime_state: Fixed output UOM to really be miliseconds * FIX: ntp: Handling large times in "poll" column correctly * New check dmi_sysinfo to gather basic hardware information + * New check bintec_info to gather the software version and serial number + of bintec routers Multisite: * FIX: fix rescheduling of host check diff --git a/checkman/bintec_info b/checkman/bintec_info new file mode 100644 index 0000000..afaa329 --- /dev/null +++ b/checkman/bintec_info @@ -0,0 +1,16 @@ +title: Retrieve informational SNMP data about bintec routers +agents: snmp +author: Lars Michelsen <lm(a)mathias-kettner.de +license: GPL +distribution: check_mk +description: + This check retrieves the {software version} and the {serial number} of bintec + routers using SNMP. + + Other needed information like location etc. can be fetched using the snmp_info + check. + + The check always reports an OK state. + +inventory: + One check per SNMP host will be created. diff --git a/checks/bintec_info b/checks/bintec_info new file mode 100644 index 0000000..2a21dc8 --- /dev/null +++ b/checks/bintec_info @@ -0,0 +1,47 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2010 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- +# ails. 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. + +def inventory_bintec_info(info): + if len(info[0]) >= 1: + return [ (None, None) ] + +def check_bintec_info(checktype, params, info): + if len(info[0]) < 2: + return (3, "UNKNOWN - No data retrieved") + sw_version, serial = info[0] + return (0, "Serial: %s, Software: %s" % (serial, sw_version)) + +check_info['bintec_info'] = (check_bintec_info, "Bintec Info", 0, inventory_bintec_info) +# 1.3.6.1.4.1.272.4.1.26.0 SW Version +# 1.3.6.1.4.1.272.4.1.31.0 S/N +snmp_info['bintec_info'] = ( ".1.3.6.1.4.1.272.4.1", [ + '26.0', # SW Version + '31.0', # S/N + ] ) + +# This check works on all SNMP hosts +snmp_scan_functions['bintec_info'] = lambda oid: oid(".1.3.6.1.2.1.1.2.0") == \ + ".1.3.6.1.4.1.272.4.200.83.88.67.66.0.0"

12 years, 8 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 48d2154db40337ae7c175532731a9ca69610d030 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48d2154db40337… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 13 18:00:48 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 8 months

Check_MK Git: check_mk: New check dmi_sysinfo to gather basic hardware information

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 90ffb0b658ec09bcddae638d62c25cf04ae929de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90ffb0b658ec09… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 12 08:59:14 2011 +0200 New check dmi_sysinfo to gather basic hardware information --- ChangeLog | 1 + agents/plugins/dmi_sysinfo | 6 +++++ checkman/dmi_sysinfo | 16 ++++++++++++++ checks/dmi_sysinfo | 50 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 73 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index a53518a..c8b53e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ not on clients * FIX: mbg_lantime_state: Fixed output UOM to really be miliseconds * FIX: ntp: Handling large times in "poll" column correctly + * New check dmi_sysinfo to gather basic hardware information Multisite: * FIX: fix rescheduling of host check diff --git a/agents/plugins/dmi_sysinfo b/agents/plugins/dmi_sysinfo new file mode 100644 index 0000000..d0ed1c8 --- /dev/null +++ b/agents/plugins/dmi_sysinfo @@ -0,0 +1,6 @@ +#/bin/sh + +if which dmidecode >/dev/null 2>&1; then + echo "<<<dmi_sysinfo>>>" + dmidecode -t 1 -q +fi diff --git a/checkman/dmi_sysinfo b/checkman/dmi_sysinfo new file mode 100644 index 0000000..b6edb6c --- /dev/null +++ b/checkman/dmi_sysinfo @@ -0,0 +1,16 @@ +title: Collects basic hardware infos using dmi +agents: linux +author: Lars Michelsen <lm(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check displays basic dmi information provided by hosts using dmidecode like + the manufacturer, product-name, version and serial number. + The check always reports OK. + + To be able to use this check the binary {dmidecode} needs to be installed on the + monitored host and the agent plugin {agents/plugins/dmi_sysinfo} needs to be + installed on the system to be monitored. + +inventory: + One service per host will be created when all requirements are met. diff --git a/checks/dmi_sysinfo b/checks/dmi_sysinfo new file mode 100644 index 0000000..936a215 --- /dev/null +++ b/checks/dmi_sysinfo @@ -0,0 +1,50 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2010 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- +# ails. 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. +# Target + +def inventory_dmi_sysinfo(checkname, info): + if len(info) > 0 and info[0] == ['System', 'Information']: + return [(None, None)] + +def check_dmi_sysinfo(item, param, info): + if len(info) == 0 or info[0] != ['System', 'Information']: + return (3, "UNKNOWN - Invalid information") + data = {} + for line in info: + line = " ".join(line) + if ":" in line: + key, value = line.split(":") + data[key.strip()] = value.strip() + + return (0, "Manufacturer: %s, Product-Name: %s, Version: %s, S/N: %s" % ( + data.get("Manufacturer", "Unknown"), + data.get("Product Name", "Unknown"), + data.get("Version", "Unknown"), + data.get("Serial Number", "Unknown"), + )) + + +check_info['dmi_sysinfo'] = (check_dmi_sysinfo, "DMI Sysinfo", 0, inventory_dmi_sysinfo)

12 years, 8 months

Check_MK Git: check_mk: FIX: ntp: Handling large times in "poll" column correctly

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 95a28b6e2ca44c7cb74ffb5d6bf32652a5c78416 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=95a28b6e2ca44c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 12 08:43:53 2011 +0200 FIX: ntp: Handling large times in "poll" column correctly --- ChangeLog | 1 + checks/ntp | 27 ++++++++++++++------------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 01db004..a53518a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ * cups_queues: Run agent part only on directly on CUPS servers, not on clients * FIX: mbg_lantime_state: Fixed output UOM to really be miliseconds + * FIX: ntp: Handling large times in "poll" column correctly Multisite: * FIX: fix rescheduling of host check diff --git a/checks/ntp b/checks/ntp index c11722d..3ae6df2 100644 --- a/checks/ntp +++ b/checks/ntp @@ -69,6 +69,18 @@ def inventory_ntp_summary(info): if len(info) > 0: return [(None, "ntp_default_levels")] +def ntp_fmt_time(t): + if t == '-': + return 0 + elif t[-1] == "m": + return int(t[:-1]) * 60 + elif t[-1] == "h": + return int(t[:-1]) * 60 * 60 + elif t[-1] == "d": + return int(t[:-1]) * 60 * 60 * 24 + else: + return int(t) + # Helper function that parses the information about one # peer and returns a tuple of # 0. Nagios state (0, 1, 2 or 3) @@ -83,19 +95,8 @@ def check_ntp_server_state(line, params): offset = float(offset) jitter = float(jitter) - # Parse time when search was last reached - if when == '-': - when = 0 - elif when[-1] == "m": - when = int(when[:-1]) * 60 - elif when[-1] == "h": - when = int(when[:-1]) * 60 * 60 - elif when[-1] == "d": - when = int(when[:-1]) * 60 * 60 * 24 - else: - when = int(when) - - poll = int(poll) + when = ntp_fmt_time(when) + poll = ntp_fmt_time(poll) stratum = int(stratum) state = ntp_state_codes.get(statecode, "unknown") infotext = "%s - stratum %d, offset %.2f ms, jitter %.2f ms" % (state, stratum, offset, jitter)

12 years, 8 months

Check_MK Git: check_mk: Dashboard: hide dashlets that have no space

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c602d7201760dfe900e0fd7fc1ceca6e4110a475 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c602d7201760df… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 12 16:05:26 2011 +0200 Dashboard: hide dashlets that have no space --- web/htdocs/dashboard.py | 64 +++++++++++++++++++++++------------------ web/htdocs/js/dashboard.js | 68 +++++++++++++++++++++++++++---------------- 2 files changed, 79 insertions(+), 53 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index ab31ee4..a2cb5a8 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -293,15 +293,22 @@ def ajax_resize(): bottom = abs_position[1] top = bottom - used_size[1] - # Allocate used squares in matrix - for x in range(left, right): - for y in range(top, bottom): - used_matrix[(x,y)] = True - - # Helper variable for how to grow, both x and y in [-1, 0, 1] - grow_by = rel_position.compute_grow_by(size) + # Allocate used squares in matrix. If not all squares we need are free, + # then the dashboard is too small for all dashlets (as it seems). + # TEST: Dashlet auf 0/0 setzen, wenn kein Platz dafür da ist. + try: + for x in range(left, right): + for y in range(top, bottom): + if (x,y) in used_matrix: + raise Exception() + used_matrix[(x,y)] = True + # Helper variable for how to grow, both x and y in [-1, 0, 1] + grow_by = rel_position.compute_grow_by(size) + + positions.append((nr, True, left, top, right, bottom, grow_by)) + except: + positions.append((nr, False, left, top, right, bottom, (0,0))) - positions.append((nr, left, top, right, bottom, grow_by)) # now resize all elastic dashlets to the max, but only # by one raster at a time, in order to be fair @@ -341,29 +348,29 @@ def ajax_resize(): while at_least_one_expanded: at_least_one_expanded = False new_positions = [] - for (nr, left, top, right, bottom, grow_by) in positions: - # html.write(repr((nr, left, top, right, bottom, grow_by))) - # try to grow in X direction by one - if grow_by[0] > 0 and right < rastersize[0] and try_allocate(right, top, right+1, bottom): - at_least_one_expanded = True - right += 1 - elif grow_by[0] < 0 and left > 0 and try_allocate(left-1, top, left, bottom): - at_least_one_expanded = True - left -= 1 - - # try to grow in Y direction by one - if grow_by[1] > 0 and bottom < rastersize[1] and try_allocate(left, bottom, right, bottom+1): - at_least_one_expanded = True - bottom += 1 - elif grow_by[1] < 0 and top > 0 and try_allocate(left, top-1, right, top): - at_least_one_expanded = True - top -= 1 - - new_positions.append((nr, left, top, right, bottom, grow_by)) + for (nr, visible, left, top, right, bottom, grow_by) in positions: + if visible: + # html.write(repr((nr, left, top, right, bottom, grow_by))) + # try to grow in X direction by one + if grow_by[0] > 0 and right < rastersize[0] and try_allocate(right, top, right+1, bottom): + at_least_one_expanded = True + right += 1 + elif grow_by[0] < 0 and left > 0 and try_allocate(left-1, top, left, bottom): + at_least_one_expanded = True + left -= 1 + + # try to grow in Y direction by one + if grow_by[1] > 0 and bottom < rastersize[1] and try_allocate(left, bottom, right, bottom+1): + at_least_one_expanded = True + bottom += 1 + elif grow_by[1] < 0 and top > 0 and try_allocate(left, top-1, right, top): + at_least_one_expanded = True + top -= 1 + new_positions.append((nr, visible, left, top, right, bottom, grow_by)) positions = new_positions resize_info = [] - for nr, left, top, right, bottom, grow_by in positions: + for nr, visible, left, top, right, bottom, grow_by in positions: # html.write(repr((nr, left, top, right, bottom, grow_by))) # html.write("<br>") title = board["dashlets"][nr].get("title") @@ -372,6 +379,7 @@ def ajax_resize(): else: th = 0 resize_info.append([nr, + visible and 1 or 0, left * raster[0], top * raster[1] + th, (right - left) * raster[0], diff --git a/web/htdocs/js/dashboard.js b/web/htdocs/js/dashboard.js index b456b38..462234c 100644 --- a/web/htdocs/js/dashboard.js +++ b/web/htdocs/js/dashboard.js @@ -29,50 +29,68 @@ function resize_dashlets(id, code) var oDash = null; for (var i in resize_info) { var dashlet = resize_info[i]; + var d_number = dashlet[0]; + var d_visible = dashlet[1]; + var d_left = dashlet[2]; + var d_top = dashlet[3]; + var d_width = dashlet[4]; + var d_height = dashlet[5]; + + var disstyle = "block"; + if (!d_visible) { + disstyle = "none"; + } // check if dashlet has title and resize its width - oDash = document.getElementById("dashlet_title_" + dashlet[0]); + oDash = document.getElementById("dashlet_title_" + d_number); if (oDash) { - oDash.style.width = dashlet[3] + "px"; + oDash.style.width = d_width + "px"; oDash.style.top = "-" + title_height + "px"; oDash.style.height = title_height + "px"; + oDash.style.display = disstyle; } // resize outer div - oDash = document.getElementById("dashlet_" + dashlet[0]); + oDash = document.getElementById("dashlet_" + d_number); if(oDash) { oDash.style.position = 'absolute'; - oDash.style.display = 'block'; - oDash.style.left = dashlet[1] + "px"; - oDash.style.top = dashlet[2] + "px"; - oDash.style.width = dashlet[3] + "px"; - oDash.style.height = dashlet[4] + "px"; + oDash.style.display = disstyle; + oDash.style.left = d_left + "px"; + oDash.style.top = d_top + "px"; + oDash.style.width = d_width + "px"; + oDash.style.height = d_height + "px"; } // resize shadow images - oDash = document.getElementById("dashadow_w_" + dashlet[0]); - if(oDash && dashlet[4] - 32 > 0) - oDash.style.height = (dashlet[4] - 32) + "px"; - oDash = document.getElementById("dashadow_e_" + dashlet[0]); - if (oDash && dashlet[4] - 32 > 0) - oDash.style.height = (dashlet[4] - 32) + "px"; - oDash = document.getElementById("dashadow_n_" + dashlet[0]); - if (oDash && dashlet[3] - 32 > 0) - oDash.style.width = (dashlet[3] - 32) + "px"; - oDash = document.getElementById("dashadow_s_" + dashlet[0]); - if (oDash && dashlet[3] - 32 > 0) - oDash.style.width = (dashlet[3] - 32) + "px"; + oDash = document.getElementById("dashadow_w_" + d_number); + if (oDash) oDash.style.display = disstyle; + if (oDash && d_height - 32 > 0) + oDash.style.height = (d_height - 32) + "px"; + oDash = document.getElementById("dashadow_e_" + d_number); + if (oDash) oDash.style.display = disstyle; + if (oDash && d_height - 32 > 0) + oDash.style.height = (d_height - 32) + "px"; + oDash = document.getElementById("dashadow_n_" + d_number); + if (oDash) oDash.style.display = disstyle; + if (oDash && d_width - 32 > 0) + oDash.style.width = (d_width - 32) + "px"; + oDash = document.getElementById("dashadow_s_" + d_number); + if (oDash) oDash.style.display = disstyle; + if (oDash && d_width - 32 > 0) + oDash.style.width = (d_width - 32) + "px"; + // resize content div - oDash = document.getElementById("dashlet_inner_" + dashlet[0]); + oDash = document.getElementById("dashlet_inner_" + d_number); if(oDash) { + oDash.style.display = disstyle; oDash.style.position = 'absolute'; oDash.style.left = dashlet_padding + "px"; oDash.style.top = dashlet_padding + "px"; - if((dashlet[3] - 2*dashlet_padding) > 0) - oDash.style.width = (dashlet[3] - 2*dashlet_padding) + "px"; - if((dashlet[4] - 2*dashlet_padding) > 0) - oDash.style.height = (dashlet[4] - 2*dashlet_padding) + "px"; + if((d_width - 2*dashlet_padding) > 0) + oDash.style.width = (d_width - 2*dashlet_padding) + "px"; + if((d_height - 2*dashlet_padding) > 0) + oDash.style.height = (d_height - 2*dashlet_padding) + "px"; } } oDash = null;

12 years, 8 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2011