Checkmk git commits November 2014

checkmk-commits@lists.checkmk.com

6 participants
232 discussions

Check_MK Git: check_mk: #1518 raritan_pdu_inlet, raritan_pdu_inlet_summary : Modified existing check to give one item per phase and support setting levels.

by Konstantin Büttner

Module: check_mk Branch: master Commit: 207cb89c7802b4dbbdcfb7b9f024915aa8b89dc5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=207cb89c7802b4… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Nov 28 17:04:09 2014 +0100 #1518 raritan_pdu_inlet, raritan_pdu_inlet_summary: Modified existing check to give one item per phase and support setting levels. raritan_pdu_inlet used to create one item per sensor. Now, only one item per phase is created. A Perf-O-Meter displaying the power has been added, as well as a WATO rule to configure warning and critical levels. raritan_pdu_inlet_summary works very similarily, but provides summary information concerning all phases. --- .werks/1518 | 13 ++++++ ChangeLog | 2 + checkman/raritan_pdu_inlet | 25 ++++++----- checkman/raritan_pdu_inlet_summary | 30 +++++++++++++ checks/elphase.include | 78 +++++++++++++++++++++++++++++++++- checks/raritan_pdu_inlet | 1 + checks/raritan_pdu_inlet.include | 6 +-- checks/raritan_pdu_inlet_summary | 1 + web/plugins/perfometer/check_mk.py | 9 ++++ web/plugins/wato/check_parameters.py | 48 ++++++++++++++++++++- 10 files changed, 197 insertions(+), 16 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=207cb89c78…

9 years, 6 months

Check_MK Git: check_mk: New ValuSpec for absolut directory names

by Mathias Kettner

Module: check_mk Branch: master Commit: f7d5d8f7fab52d09cc6075e5d8c190c7eb3d0487 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7d5d8f7fab52d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 28 15:06:56 2014 +0100 New ValuSpec for absolut directory names --- web/htdocs/valuespec.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 513687c..24a7c41 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -569,6 +569,12 @@ class Hostname(TextAscii): self._regex = re.compile('^[-0-9a-zA-Z_.]+$') self._regex_error = _("Please enter a valid hostname or IPv4 address.") +class AbsoluteDirname(TextAscii): + def __init__(self, **kwargs): + TextAscii.__init__(self, **kwargs) + self._regex = re.compile('^(/|(/[^/]+)+)$') + self._regex_error = _("Please enter a valid absolut pathname with / as a path separator.") + # Valuespec for a HTTP Url (not HTTPS), that # automatically adds http:// to the value @@ -653,6 +659,7 @@ class TextAreaUnicode(TextUnicode): # A variant of TextAscii() that validates a path to a filename that # lies in an existing directory. +# TODO: Rename the valuespec here to ExistingFilename or somehting similar class Filename(TextAscii): def __init__(self, **kwargs): TextAscii.__init__(self, **kwargs)

9 years, 6 months

Check_MK Git: check_mk: Now really fixed refreshing of pnp graph dashlets

by Lars Michelsen

Module: check_mk Branch: master Commit: 0fc58418f7f4cff8e62821a12ebbea2e0f7e3534 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fc58418f7f4cf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 28 10:54:27 2014 +0100 Now really fixed refreshing of pnp graph dashlets --- web/htdocs/dashboard.py | 13 +++++++++---- web/htdocs/js/dashboard.js | 7 ++++++- web/plugins/dashboard/dashlets.py | 8 ++++++-- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index aaf083f..d01f3ef 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -379,8 +379,13 @@ def render_dashboard(name): url = dashlet.get("url", "dashboard_dashlet.py?name="+name+"&id="+ str(nr)) refresh = dashlet.get("refresh", dashlet_type.get("refresh")) if refresh: - # FIXME: remove add_wato_folder_to_url - refresh_dashlets.append([nr, refresh, str(add_wato_folder_to_url(url, wato_folder))]) + if 'on_refresh' in dashlet_type: + action = 'function() {%s}' % dashlet_type['on_refresh'](nr, dashlet) + else: + # FIXME: remove add_wato_folder_to_url + action = '"%s"' % add_wato_folder_to_url(url, wato_folder) # url to dashboard_dashlet.py + refresh_dashlets.append('[%d, %d, %s]' % (nr, refresh, action)) + # Update the dashlets context with the dashboard global context when there are # useful information @@ -482,7 +487,7 @@ var title_height = %d; var dashlet_padding = Array%s; var dashlet_min_size = Array%s; var corner_overlap = %d; -var refresh_dashlets = %r; +var refresh_dashlets = [%s]; var on_resize_dashlets = {%s}; var dashboard_name = '%s'; var dashboard_mtime = %d; @@ -493,7 +498,7 @@ calculate_dashboard(); window.onresize = function () { calculate_dashboard(); } dashboard_scheduler(1); """ % (MAX, GROW, raster, header_height, screen_margin, title_height, dashlet_padding, dashlet_min_size, - corner_overlap, refresh_dashlets, ','.join(on_resize), name, board['mtime'], + corner_overlap, ','.join(refresh_dashlets), ','.join(on_resize), name, board['mtime'], html.makeuri([('edit', '1')]), repr(dashlets_js))) if mode == 'edit': diff --git a/web/htdocs/js/dashboard.js b/web/htdocs/js/dashboard.js index e7878b3..929c6b8 100644 --- a/web/htdocs/js/dashboard.js +++ b/web/htdocs/js/dashboard.js @@ -294,7 +294,12 @@ function dashboard_scheduler(initial) { if ((initial && document.getElementById("dashlet_inner_" + nr).innerHTML == '') || (refresh > 0 && timestamp % refresh == 0)) { - get_url(url + "&mtime=" + dashboard_mtime, dashboard_update_contents, "dashlet_inner_" + nr); + if (typeof(url) === 'string') { + get_url(url + "&mtime=" + dashboard_mtime, dashboard_update_contents, "dashlet_inner_" + nr); + } + else { + url(); // Execute "on_refresh" javascript function + } } } diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index db1e8e7..34685fb 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -336,9 +336,9 @@ def make_pnp_url(dashlet, what): else: base_url = html.site_status[site]["site"]["url_prefix"] base_url += "pnp4nagios/index.php/" - var_part = "?host=%s&srv=%s&source=%d&view=%s&theme=multisite&_t=%d" % \ + var_part = "?host=%s&srv=%s&source=%d&view=%s&theme=multisite" % \ (pnp_cleanup(dashlet['context']['host']), pnp_cleanup(service), - dashlet['source'], dashlet['timerange'], int(time.time())) + dashlet['source'], dashlet['timerange']) return base_url + what + var_part def dashlet_pnpgraph(nr, dashlet): @@ -378,6 +378,9 @@ dashlet_types["pnpgraph"] = { """, "on_resize" : lambda nr, dashlet: 'dashboard_render_pnpgraph(%d, \'%s\');' % (nr, make_pnp_url(dashlet, 'image')), + # execute this js handler instead of refreshing the dashlet by calling "render" again + "on_refresh" : lambda nr, dashlet: 'dashboard_render_pnpgraph(%d, \'%s\');' % + (nr, make_pnp_url(dashlet, 'image')), "script": """ var dashlet_offsets = {}; function dashboard_render_pnpgraph(nr, img_url) @@ -436,6 +439,7 @@ function load_graph_img(nr, img, img_url, c_w, c_h) img_url += '&graph_width='+(c_w - dashlet_offsets[nr][0]) +'&graph_height='+(c_h - dashlet_offsets[nr][1]); } + img_url += '&_t='+Math.floor(Date.parse(new Date()) / 1000); // prevent caching img.src = img_url; } """

9 years, 6 months

Check_MK Git: check_mk: #1539 FIX Fixed refreshing of PNP graphs in dashboards

by Lars Michelsen

Module: check_mk Branch: master Commit: f436721a492879bf20819d43fc8fc06921ffcd5b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f436721a492879… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 28 10:13:45 2014 +0100 #1539 FIX Fixed refreshing of PNP graphs in dashboards The PNP graphs contained in dashboards were not refreshed as intended. Now they are refreshed in the hard coded default interval of 60 seconds. This will be configurable soon. --- .werks/1539 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/dashboard.py | 4 ++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/1539 b/.werks/1539 new file mode 100644 index 0000000..c0c6f26 --- /dev/null +++ b/.werks/1539 @@ -0,0 +1,12 @@ +Title: Fixed refreshing of PNP graphs in dashboards +Level: 2 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1417165950 + +The PNP graphs contained in dashboards were not refreshed as intended. +Now they are refreshed in the hard coded default interval of 60 seconds. +This will be configurable soon. diff --git a/ChangeLog b/ChangeLog index 7a864d2..7378e93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -77,6 +77,7 @@ * 1553 FIX: Fix deleting (acknowleding) of logfiles in logwatch... * 1537 FIX: Added transformation code for user dashboards created between 2014-08 and 2014-10... * 1538 FIX: Only allow switching sites on/off when permitted to... + * 1539 FIX: Fixed refreshing of PNP graphs in dashboards... WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 00127f5..aaf083f 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -376,8 +376,8 @@ def render_dashboard(name): # dashlets using static content (such as an iframe) will not be # refreshed by us but need to do that themselves. if "url" in dashlet or ('render' in dashlet_type and dashlet_type.get('refresh')): - url = dashlet.get("url", "dashboard_dashlet.py?name="+name+"&id="+ str(nr)); - refresh = dashlet.get("refresh") + url = dashlet.get("url", "dashboard_dashlet.py?name="+name+"&id="+ str(nr)) + refresh = dashlet.get("refresh", dashlet_type.get("refresh")) if refresh: # FIXME: remove add_wato_folder_to_url refresh_dashlets.append([nr, refresh, str(add_wato_folder_to_url(url, wato_folder))])

9 years, 6 months

Check_MK Git: check_mk: #1538 FIX Only allow switching sites on/ off when permitted to

by Lars Michelsen

Module: check_mk Branch: master Commit: 2ed0a3438324e89bce210ea128db853eed198805 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ed0a3438324e8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 28 10:01:06 2014 +0100 #1538 FIX Only allow switching sites on/off when permitted to The permission check was missing in the action processing server component. --- .werks/1538 | 9 +++++++++ ChangeLog | 1 + web/htdocs/html_mod_python.py | 23 ++++++++++++----------- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/.werks/1538 b/.werks/1538 new file mode 100644 index 0000000..594fcd2 --- /dev/null +++ b/.werks/1538 @@ -0,0 +1,9 @@ +Title: Only allow switching sites on/off when permitted to +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1417165211 +Class: fix + +The permission check was missing in the action processing server component. diff --git a/ChangeLog b/ChangeLog index d1fd67a..7a864d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -76,6 +76,7 @@ * 1534 FIX: Fixed filtering views in distributed setup lead to empty views... * 1553 FIX: Fix deleting (acknowleding) of logfiles in logwatch... * 1537 FIX: Added transformation code for user dashboards created between 2014-08 and 2014-10... + * 1538 FIX: Only allow switching sites on/off when permitted to... WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index 94f594f..1d9dc24 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -233,17 +233,18 @@ def connect_to_livestatus(): # Also honor HTML-variables for switching off sites # right now. This is generally done by the variable # _site_switch=sitename1:on,sitename2:off,... - switch_var = html.var("_site_switch") - if switch_var: - for info in switch_var.split(","): - sitename, onoff = info.split(":") - d = config.user_siteconf.get(sitename, {}) - if onoff == "on": - d["disabled"] = False - else: - d["disabled"] = True - config.user_siteconf[sitename] = d - config.save_site_config() + if config.may("sidesnap.sitestatus"): + switch_var = html.var("_site_switch") + if switch_var: + for info in switch_var.split(","): + sitename, onoff = info.split(":") + d = config.user_siteconf.get(sitename, {}) + if onoff == "on": + d["disabled"] = False + else: + d["disabled"] = True + config.user_siteconf[sitename] = d + config.save_site_config() # Make lists of enabled and disabled sites enabled_sites = {}

9 years, 6 months

Check_MK Git: check_mk: raritan_pdu_inlet: intermediate step for code redesign

by Mathias Kettner

Module: check_mk Branch: master Commit: a5a522755982cf71d20569857afdb9e76d9ce95b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5a522755982cf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 28 09:49:21 2014 +0100 raritan_pdu_inlet: intermediate step for code redesign --- checks/{ups_outphase.include => elphase.include} | 18 +++- checks/raritan_pdu_inlet | 62 +++++++------- checks/raritan_pdu_inlet.include | 95 +++++++--------------- checks/raritan_pdu_inlet_summary | 53 +++++++----- checks/ups_socomec_outphase | 42 ++++------ 5 files changed, 123 insertions(+), 147 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a5a5227559…

9 years, 6 months

Check_MK Git: check_mk: Removed code gnaaaaah

by Lars Michelsen

Module: check_mk Branch: master Commit: 55a8581559275d5893faffc73fa13d886761e52c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55a8581559275d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 28 09:47:37 2014 +0100 Removed code gnaaaaah --- web/htdocs/dashboard.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 5fe7022..00127f5 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -875,8 +875,6 @@ def page_edit_dashlet(): except IndexError: raise MKGeneralException(_('The dashlet does not exist.')) - html.debug(dashlet) - ty = dashlet['type'] dashlet_type = dashlet_types[ty] single_infos = dashlet['single_infos']

9 years, 6 months

Check_MK Git: check_mk: Removed debug output in dashboard editor

by Mathias Kettner

Module: check_mk Branch: master Commit: dd36a672998b9373539ae693b421f981c31a30e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd36a672998b93… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 28 09:41:41 2014 +0100 Removed debug output in dashboard editor --- web/htdocs/dashboard.py | 2 -- web/htdocs/visuals.py | 10 +++------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 5fe7022..00127f5 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -875,8 +875,6 @@ def page_edit_dashlet(): except IndexError: raise MKGeneralException(_('The dashlet does not exist.')) - html.debug(dashlet) - ty = dashlet['type'] dashlet_type = dashlet_types[ty] single_infos = dashlet['single_infos'] diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index e83ebcd..0a81be9 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -854,13 +854,9 @@ class Filter: # Is used to populate a value, for example loaded from persistance, into # the HTML context where it can be used by e.g. the display() method. def set_value(self, value): - try: - val = {} - for varname in self.htmlvars: - html.set_var(varname, value.get(varname)) - except: - html.debug("%r, %s" % (self, self.name)) - raise + val = {} + for varname in self.htmlvars: + html.set_var(varname, value.get(varname)) def get_filter(name): return multisite_filters[name]

9 years, 6 months

Check_MK Git: check_mk: hwg_temp: changed default levels to 30/

by Mathias Kettner

35 degrees C Message-ID: <54774209.Qlt67UKN1DgdVDHo%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: df50ef10405126e35e054766e5897b976c666d2d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df50ef10405126… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 27 16:23:51 2014 +0100 hwg_temp: changed default levels to 30/35 degrees C --- checks/hwg_temp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/hwg_temp b/checks/hwg_temp index 7abeed6..87b0757 100644 --- a/checks/hwg_temp +++ b/checks/hwg_temp @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. -hwg_temp_defaultlevels = (23, 25) +hwg_temp_defaultlevels = (30, 35) def inventory_hwg_temp(info): return [ (line[0], "hwg_temp_defaultlevels")

9 years, 6 months

Check_MK Git: check_mk: #1537 FIX Added transformation code for user dashboards created between 2014-08 and 2014-10

by Lars Michelsen

Module: check_mk Branch: master Commit: 765f4c9334abe5c525daed76718efa3713b25388 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=765f4c9334abe5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 27 15:43:50 2014 +0100 #1537 FIX Added transformation code for user dashboards created between 2014-08 and 2014-10 Installations which were using early versions of the dashboard editor, which was first available our nightly builds from 2014-08 till 2014-10 and created dashoards with it, have now dashboards saved in a format, which can not be interpreted by the current dashboard code. For some time, we assumed that there were not many installations with such files, therefor we did not implement any migration code and asked the users to migrate by hand. But now we have a bit too many users which are having trouble here, so we decided to implement a migration routine for these dashboards. --- .werks/1537 | 16 ++++++++++++++++ ChangeLog | 1 + web/htdocs/dashboard.py | 25 +++++++++++++++++++++++++ web/htdocs/views.py | 7 ++----- web/htdocs/visuals.py | 13 +++++++++++++ 5 files changed, 57 insertions(+), 5 deletions(-) diff --git a/.werks/1537 b/.werks/1537 new file mode 100644 index 0000000..016d73a --- /dev/null +++ b/.werks/1537 @@ -0,0 +1,16 @@ +Title: Added transformation code for user dashboards created between 2014-08 and 2014-10 +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1417099138 +Class: fix + +Installations which were using early versions of the dashboard editor, which was first available +our nightly builds from 2014-08 till 2014-10 and created dashoards with it, have now dashboards +saved in a format, which can not be interpreted by the current dashboard code. + +For some time, we assumed that there were not many installations with such files, therefor we +did not implement any migration code and asked the users to migrate by hand. But now we have +a bit too many users which are having trouble here, so we decided to implement a migration +routine for these dashboards. diff --git a/ChangeLog b/ChangeLog index bc01d24..2ffb784 100644 --- a/ChangeLog +++ b/ChangeLog @@ -72,6 +72,7 @@ * 1529 FIX: Mobile-GUI: Fixed "all host problems" view not showing all problems... * 1533 FIX: Fixed sorting of hosts with same name in "services of host" view * 1534 FIX: Fixed filtering views in distributed setup lead to empty views... + * 1537 FIX: Added transformation code for user dashboards created between 2014-08 and 2014-10... WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 4967b13..5fe7022 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -92,8 +92,31 @@ def load_dashboards(): global dashboards, available_dashboards transform_builtin_dashboards() dashboards = visuals.load('dashboards', builtin_dashboards) + transform_dashboards(dashboards) available_dashboards = visuals.available('dashboards', dashboards) +# During implementation of the dashboard editor and recode of the visuals +# we had serveral different data structures, for example one where the +# views in user dashlets were stored with a context_type instead of the +# "single_info" key, which is the currently correct one. +# +# This code transforms views from user_dashboards.mk which have been +# migrated/created with daily snapshots from 2014-08 till beginning 2014-10. +# FIXME: Can be removed one day. Mark as incompatible change or similar. +def transform_dashboards(dashboards): + for (u, n), dashboard in dashboards.items(): + visuals.transform_old_visual(dashboard) + + # Also transform dashlets + for dashlet in dashboard['dashlets']: + visuals.transform_old_visual(dashlet) + + if dashlet['type'] == 'pnpgraph': + if 'service' not in dashlet['single_infos']: + dashlet['single_infos'].append('service') + if 'host' not in dashlet['single_infos']: + dashlet['single_infos'].append('host') + # be compatible to old definitions, where even internal dashlets were # referenced by url, e.g. dashboard['url'] = 'hoststats.py' # FIXME: can be removed one day. Mark as incompatible change or similar. @@ -852,6 +875,8 @@ def page_edit_dashlet(): except IndexError: raise MKGeneralException(_('The dashlet does not exist.')) + html.debug(dashlet) + ty = dashlet['type'] dashlet_type = dashlet_types[ty] single_infos = dashlet['single_infos'] diff --git a/web/htdocs/views.py b/web/htdocs/views.py index b6f0d13..fb601f9 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -91,6 +91,7 @@ def permitted_views(): return available_views # Convert views that are saved in the pre 1.2.6-style +# FIXME: Can be removed one day. Mark as incompatible change or similar. def transform_old_views(): for view in multisite_views.values(): @@ -103,11 +104,7 @@ def transform_old_views(): if 'context_type' in view: # This code transforms views from user_views.mk which have been migrated with # daily snapshots from 2014-08 till beginning 2014-10. - if view['context_type'] in [ 'host', 'service', 'hostgroup', 'servicegroup' ]: - view['single_infos'] = [view['context_type']] - else: - view['single_infos'] = [] # drop the context type and assume a "multiple view" - del view['context_type'] + visuals.transform_old_visual(view) elif 'single_infos' not in view: # This tries to map the datasource and additional settings of the diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index b4b1943..e83ebcd 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -1244,6 +1244,19 @@ def collect_context_links_of(visual_type_name, this_visual, active_filter_vars, return context_links +def transform_old_visual(visual): + if 'context_type' in visual: + if visual['context_type'] in [ 'host', 'service', 'hostgroup', 'servicegroup' ]: + visual['single_infos'] = [visual['context_type']] + else: + visual['single_infos'] = [] # drop the context type and assume a "multiple visual" + del visual['context_type'] + elif 'single_infos' not in visual: + visual['single_infos'] = [] + + visual.setdefault('context', {}) + + #. # .--Popup Add-----------------------------------------------------------. # | ____ _ _ _ |

9 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2014